Commit c4e01401 authored by zhang_z's avatar zhang_z

提交修改;

parent 8c1fa464
...@@ -186,7 +186,6 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin ...@@ -186,7 +186,6 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_EDITOR); this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_EDITOR);
mViewBinding.tvEditorHint.setText("新增"); mViewBinding.tvEditorHint.setText("新增");
mViewBinding.tvEditorHint.setBackgroundResource(R.drawable.shape_red_r1); mViewBinding.tvEditorHint.setBackgroundResource(R.drawable.shape_red_r1);
mViewBinding.tvTitle.setText(R.string.sssku_add); mViewBinding.tvTitle.setText(R.string.sssku_add);
this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.UNKNOWN)); this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.UNKNOWN));
break; break;
......
...@@ -31,7 +31,6 @@ public class AddFragment extends BaseFragment<SsskuPresenter, FragmentSsskuAddBi ...@@ -31,7 +31,6 @@ public class AddFragment extends BaseFragment<SsskuPresenter, FragmentSsskuAddBi
mViewBinding.etBarcode.setOnEditorActionListener((textView, i, keyEvent) -> { mViewBinding.etBarcode.setOnEditorActionListener((textView, i, keyEvent) -> {
if ((i == EditorInfo.IME_ACTION_SEARCH || i == EditorInfo.IME_ACTION_UNSPECIFIED) && !StringUtils.isEmpty(textView.getText())) { if ((i == EditorInfo.IME_ACTION_SEARCH || i == EditorInfo.IME_ACTION_UNSPECIFIED) && !StringUtils.isEmpty(textView.getText())) {
KeyboardUtils.hideSoftInput(textView); KeyboardUtils.hideSoftInput(textView);
this.pop();
mPresenter.clickCheck(mViewBinding.etBarcode.getText().toString()); mPresenter.clickCheck(mViewBinding.etBarcode.getText().toString());
} }
return false; return false;
......
...@@ -527,7 +527,15 @@ public class EditorFragment extends BaseFragment<SsskuPresenter, FragmentSsskuEd ...@@ -527,7 +527,15 @@ public class EditorFragment extends BaseFragment<SsskuPresenter, FragmentSsskuEd
@Override @Override
public boolean onBackPressedSupport() { public boolean onBackPressedSupport() {
((SsskuActivity) getActivity()).backToDetailFragment(); switch (mEditorMode) {
case C.SKU_EDITOR_MODE.ADD:
case C.SKU_EDITOR_MODE.UNKNOWN:
((SsskuActivity) getActivity()).backToAddFragment();
break;
case C.SKU_EDITOR_MODE.UPDATE:
((SsskuActivity) getActivity()).backToDetailFragment();
break;
}
return super.onBackPressedSupport(); return super.onBackPressedSupport();
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment