Commit 93f6fb68 authored by 陈前's avatar 陈前

扫码

parent 9496056d
...@@ -57,7 +57,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity ...@@ -57,7 +57,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
mInventoryAddFragment.popThis(); mInventoryAddFragment.popThis();
return; return;
} }
if (mScanFragment.isAdded()) { if (mScanFragment!=null&&mScanFragment.isAdded()) {
mScanFragment.pop(); mScanFragment.pop();
return; return;
} }
...@@ -80,7 +80,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity ...@@ -80,7 +80,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
@Override @Override
public void addInventoryGoodsItem(List<Sssku> ssskuList) { public void addInventoryGoodsItem(List<Sssku> ssskuList) {
mInventoryAddFragment.addInventoryGoodsItem(ssskuList); mInventoryAddFragment.addInventoryGoodsItem(ssskuList);
if (mScanFragment.isAdded()) { if (mScanFragment!=null&&mScanFragment.isAdded()) {
mScanFragment.pop(); mScanFragment.pop();
} }
...@@ -89,7 +89,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity ...@@ -89,7 +89,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
@Override @Override
public void addInventoryGoodsItem(Sssku sssku) { public void addInventoryGoodsItem(Sssku sssku) {
mInventoryAddFragment.addInventoryGoodsItem(sssku); mInventoryAddFragment.addInventoryGoodsItem(sssku);
if (mScanFragment.isAdded()) { if (mScanFragment!=null&&mScanFragment.isAdded()) {
mScanFragment.pop(); mScanFragment.pop();
} }
} }
......
...@@ -74,7 +74,7 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter, ...@@ -74,7 +74,7 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter,
mViewBinding.lyTitle.edTitle.clearFocus(); mViewBinding.lyTitle.edTitle.clearFocus();
} }
if (mScanFragment.isAdded()) { if (mScanFragment!=null&&mScanFragment.isAdded()) {
mScanFragment.pop(); mScanFragment.pop();
return; return;
} }
...@@ -99,7 +99,7 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter, ...@@ -99,7 +99,7 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter,
@Override @Override
public void loadOssku(Pager<Ossku> osskuList, boolean isRefresh, String keyWord) { public void loadOssku(Pager<Ossku> osskuList, boolean isRefresh, String keyWord) {
if (mScanFragment.isAdded()) { if (mScanFragment!=null&&mScanFragment.isAdded()) {
mScanFragment.pop(); mScanFragment.pop();
} }
mOtherListFragment.setData(osskuList, isRefresh); mOtherListFragment.setData(osskuList, isRefresh);
......
...@@ -69,7 +69,7 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter, ...@@ -69,7 +69,7 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
mViewBinding.icTitle.tvTitle.setText(R.string.replenishment_meun); mViewBinding.icTitle.tvTitle.setText(R.string.replenishment_meun);
return; return;
} }
if (mScanFragment.isAdded()) { if (mScanFragment!=null&&mScanFragment.isAdded()) {
mScanFragment.pop(); mScanFragment.pop();
return; return;
} }
...@@ -154,7 +154,7 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter, ...@@ -154,7 +154,7 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
@Override @Override
public void popScan() { public void popScan() {
if (mScanFragment.isAdded()) { if (mScanFragment!=null&&mScanFragment.isAdded()) {
mScanFragment.pop(); mScanFragment.pop();
} }
} }
......
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