Commit 77206edf authored by 陈前's avatar 陈前

盤庫

parent b3db1aa5
...@@ -54,15 +54,18 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity ...@@ -54,15 +54,18 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
mViewBinding.icTitle.setOnClickListener(new OnClickListener() { mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override @Override
protected void myOnClickListener(View v) { protected void myOnClickListener(View v) {
if (mScanFragment != null && mScanFragment.isAdded()) {
mScanFragment.pop();
return;
} else {
if (mInventoryAddFragment != null && mInventoryAddFragment.isAdded()) { if (mInventoryAddFragment != null && mInventoryAddFragment.isAdded()) {
mInventoryAddFragment.popThis(); mInventoryAddFragment.popThis();
return; return;
} }
if (mScanFragment != null && mScanFragment.isAdded()) {
mScanFragment.pop();
return;
} }
finish(); finish();
} }
}); });
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_zhouyu" android:background="@color/gray_zhouyu"
......
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