Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleEditFragment.java

@@ -28,6 +28,7 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.dialog.PromptDialog;
 import com.xingdata.zzdpos.ui.manage.bale.BalePresenter;
 import com.xingdata.zzdpos.ui.manage.bale.adpter.EditFragmentImgShopAdapter;
+import com.xingdata.zzdpos.ui.scan.ScanFragment;
 import com.xingdata.zzdpos.util.ConvertUtil;
 import com.xingdata.zzdpos.util.InputFilters;
 import com.xingdata.zzdpos.util.OnClickListener;
@@ -155,6 +156,23 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
                                 }).show((BaseActivity) getActivity());
 
 
+                    }
+                    break;
+                    case R.id.btn_scan: {
+                        ScanFragment mScanFragment = new ScanFragment();
+                        mScanFragment.setOnScanCompletedListener(new ScanFragment
+                                .OnScanCompletedListener() {
+                            @Override
+                            public void OnScanCompleted(String barcode) {
+                                pop();
+                                mPresenter.mBaleSeachShopFragment.seachBarcode(barcode);
+                                start(mPresenter.mBaleSeachShopFragment);
+                            }
+                        });
+                        if (!mScanFragment.isAdded()) {
+                            start(mScanFragment);
+                        }
+
                     }
                     break;
                 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleIndexFragment.java

@@ -18,6 +18,7 @@ import com.xingdata.zzdpos.model.Ussku;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.manage.bale.BalePresenter;
 import com.xingdata.zzdpos.ui.manage.bale.adpter.BaleIndexAdapter;
+import com.xingdata.zzdpos.ui.scan.ScanFragment;
 import com.xingdata.zzdpos.util.OnClickListener;
 
 import java.util.ArrayList;
@@ -74,6 +75,28 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
                                                         ActivityUtils.finishActivity(getActivity());
                                                     }
                                                     break;
+                                                    case R.id.btn_scan: {
+                                                        ScanFragment mScanFragment = new
+                                                                ScanFragment();
+                                                        mScanFragment.setOnScanCompletedListener
+                                                                (new ScanFragment
+                                                                        .OnScanCompletedListener() {
+                                                                    @Override
+                                                                    public void OnScanCompleted
+                                                                            (String barcode) {
+                                                                        pop();
+                                                                        loadingDialog.show(
+                                                                                (BaseActivity)
+                                                                                getActivity());
+                                                                        mPresenter.usskuQuery
+                                                                                (barcode, loadingDialog);
+                                                                    }
+                                                                });
+                                                        if (!mScanFragment.isAdded()) {
+                                                            start(mScanFragment);
+                                                        }
+                                                    }
+                                                    break;
                                                     default: {
 
                                                     }

app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleSeachFragment.java

@@ -5,7 +5,6 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.utilcode.util.KeyboardUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
@@ -39,13 +38,8 @@ public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleS
                                                     }
                                                     break;
                                                     case R.id.btn_seach: {
-                                                        loadingDialog.show((BaseActivity)
-                                                                getActivity());
-                                                        mPresenter.usskuQuery(mViewBinding
-                                                                        .etKeyword.getText()
-                                                                        .toString(),
-                                                                loadingDialog);
-                                                        pop();
+                                                        seach(mViewBinding.etKeyword
+                                                                .getText().toString());
                                                     }
                                                     break;
                                                     default: {
@@ -61,14 +55,8 @@ public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleS
                                                              public boolean onEditorAction
                                                                      (TextView textView, int i,
                                                                       KeyEvent keyEvent) {
-                                                                 loadingDialog.show((BaseActivity)
-                                                                         getActivity());
-                                                                 mPresenter.usskuQuery(mViewBinding
-                                                                                 .etKeyword
-                                                                                 .getText()
-                                                                                 .toString(),
-                                                                         loadingDialog);
-                                                                 pop();
+                                                                 seach(mViewBinding.etKeyword
+                                                                         .getText().toString());
                                                                  return false;
                                                              }
                                                          }
@@ -77,4 +65,10 @@ public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleS
         Global.setFocus(mViewBinding.etKeyword, getActivity());
     }
 
+    public void seach(String str) {
+        loadingDialog.show((BaseActivity)
+                getActivity());
+        mPresenter.usskuQuery(str, loadingDialog);
+        pop();
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleSeachShopFragment.java

@@ -34,6 +34,7 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
 
     private boolean isAddData = false;
     private List<Sssku> nowData = new ArrayList<>();
+    public String barCode = null;
 
     @Override
     public int getLayoutId() {
@@ -61,7 +62,16 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
             getEmptyView("没有数据");
         }
         loadingDialog.show((BaseActivity) getActivity());
-        mPresenter.queryShopItem(mViewBinding.etKeyword.getText().toString(), true, loadingDialog);
+        if (barCode != null) {
+            mViewBinding.etKeyword.setText(barCode);
+            mPresenter.queryShopItem(barCode, true,
+                    loadingDialog);
+        } else {
+            mPresenter.queryShopItem(mViewBinding.etKeyword.getText().toString(), true,
+                    loadingDialog);
+        }
+
+
         mViewBinding.setOnClickListener(new OnClickListener() {
                                             @Override
                                             protected void myOnClickListener(View v) {
@@ -170,6 +180,9 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
         }
     }
 
+    public void seachBarcode(String barCode) {
+        this.barCode = barCode;
+    }
 
     /**
      * 获取空页面

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryActivity.java

@@ -5,9 +5,11 @@ import android.content.Intent;
 import android.view.MotionEvent;
 import android.view.View;
 
+import com.blankj.utilcode.constant.PermissionConstants;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.FragmentUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
+import com.blankj.utilcode.util.PermissionUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityInventoryBinding;
@@ -31,7 +33,8 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
         implements InventoryContract.View {
     private InventoryFragment mInventoryFragment = new InventoryFragment();
     private ManageDateFragment mManageDateFragment = new ManageDateFragment();
-    private InventoryAddFragment mInventoryAddFragment;
+    private InventoryAddFragment mInventoryAddFragment = new InventoryAddFragment();
+    ;
     LoadingDialog mLoadingDialog = new LoadingDialog();
     private ScanFragment mScanFragment;
 
@@ -57,7 +60,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
                     mInventoryAddFragment.popThis();
                     return;
                 }
-                if (mScanFragment!=null&&mScanFragment.isAdded()) {
+                if (mScanFragment != null && mScanFragment.isAdded()) {
                     mScanFragment.pop();
                     return;
                 }
@@ -69,7 +72,9 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
 
     @Override
     public void showDateFragment() {
-        start(mManageDateFragment);
+
+        FragmentUtils.add(getSupportFragmentManager(), mManageDateFragment, R.id.f_bottom, false, true);
+
     }
 
     @Override
@@ -80,7 +85,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
     @Override
     public void addInventoryGoodsItem(List<Sssku> ssskuList) {
         mInventoryAddFragment.addInventoryGoodsItem(ssskuList);
-        if (mScanFragment!=null&&mScanFragment.isAdded()) {
+        if (mScanFragment != null && mScanFragment.isAdded()) {
             mScanFragment.pop();
         }
 
@@ -89,7 +94,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
     @Override
     public void addInventoryGoodsItem(Sssku sssku) {
         mInventoryAddFragment.addInventoryGoodsItem(sssku);
-        if (mScanFragment!=null&&mScanFragment.isAdded()) {
+        if (mScanFragment != null && mScanFragment.isAdded()) {
             mScanFragment.pop();
         }
     }
@@ -135,12 +140,13 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
 
     @Override
     public void setInventoryCount(String s) {
+        changeTitle(null, true);
         mInventoryFragment.setCount(s);
     }
 
     @Override
     public void openInventoryAddFragment(Cs cs) {
-        mInventoryAddFragment = new InventoryAddFragment();
+
         mInventoryAddFragment.setCs(cs);
         changeTitle("商品盘点", true);
         start(mInventoryAddFragment);
@@ -165,6 +171,14 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
 
     @Override
     public void changeTitle(String s, boolean b) {
+        if (s == null) {
+            if (b) {
+                mViewBinding.icTitle.getRoot().setVisibility(View.VISIBLE);
+            } else {
+                mViewBinding.icTitle.getRoot().setVisibility(View.GONE);
+            }
+            return;
+        }
         mViewBinding.icTitle.tvTitle.setText(s);
         if (b) {
             mViewBinding.icTitle.ivRight.setImageResource(R.mipmap.but_sweep_yard);
@@ -176,19 +190,30 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
             @Override
             protected void myOnClickListener(View v) {
                 if (b) {
-                    if (mScanFragment == null) {
-                        mScanFragment = new ScanFragment();
-                        mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
-                            @Override
-                            public void OnScanCompleted(String barcode) {
-                                mPresenter.getProductByBarcode(barcode);
+                    PermissionUtils.permission(PermissionConstants.CAMERA).callback(new PermissionUtils.FullCallback() {
+                        @Override
+                        public void onGranted(List<String> permissionsGranted) {
+                            if (mScanFragment == null) {
+                                mScanFragment = new ScanFragment();
+                                mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
+                                    @Override
+                                    public void OnScanCompleted(String barcode) {
+                                        mPresenter.getProductByBarcode(barcode);
+                                    }
+                                });
                             }
-                        });
-                    }
+                            if (!mScanFragment.isAdded()) {
+                                start(mScanFragment);
+                            }
+                        }
+
+                        @Override
+                        public void onDenied(List<String> permissionsDeniedForever, List<String>
+                                permissionsDenied) {
+                        }
+                    })
+                            .request();
 
-                    if (!mScanFragment.isAdded()) {
-                        start(mScanFragment);
-                    }
 
                 } else {
                     mPresenter.clickDate();
@@ -196,6 +221,8 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
 
             }
         });
+
+
     }
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/manage/manageMenu/ManageDateFragment.java

@@ -31,6 +31,7 @@ public class ManageDateFragment extends BaseFragment<InventoryPresenter, Fragmen
 
     @Override
     public void initView() {
+        mPresenter.changeTitle(null, false);
         initListener();
         textSize = mViewBinding.editStart.getTextSize();
 
@@ -71,6 +72,7 @@ public class ManageDateFragment extends BaseFragment<InventoryPresenter, Fragmen
         mViewBinding.tvCancel.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
+                mPresenter.changeTitle(null, true);
                 pop();
             }
         });
@@ -131,4 +133,10 @@ public class ManageDateFragment extends BaseFragment<InventoryPresenter, Fragmen
         };
     }
 
+
+    @Override
+    public boolean onBackPressedSupport() {
+        mPresenter.changeTitle(null, true);
+        return super.onBackPressedSupport();
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/OtherSelectActivity.java

@@ -9,8 +9,10 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.blankj.utilcode.constant.PermissionConstants;
 import com.blankj.utilcode.util.FragmentUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
+import com.blankj.utilcode.util.PermissionUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
@@ -24,6 +26,8 @@ import com.xingdata.zzdpos.ui.scan.ScanFragment;
 import com.xingdata.zzdpos.util.Global;
 import com.xingdata.zzdpos.util.OnClickListener;
 
+import java.util.List;
+
 
 public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter,
         ActivityOtherSelectBinding> implements OtherSelectContract.View {
@@ -50,20 +54,35 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter,
         mViewBinding.lyTitle.ivRight.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
-                if (mScanFragment == null) {
-                    mScanFragment = new ScanFragment();
-                    mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
-                        @Override
-                        public void OnScanCompleted(String barcode) {
-                            mOtherListFragment.search(barcode);
-                        }
-                    });
-                }
 
-                if (!mScanFragment.isAdded()) {
-                    FragmentUtils.add(getSupportFragmentManager(), mScanFragment, mViewBinding
-                            .fragmentContainer.getId(), false, true);
-                }
+                PermissionUtils.permission
+                        (PermissionConstants.CAMERA)
+                        .callback(new PermissionUtils.FullCallback() {
+                            @Override
+                            public void onGranted(List<String> permissionsGranted) {
+                                if (mScanFragment == null) {
+                                    mScanFragment = new ScanFragment();
+                                    mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
+                                        @Override
+                                        public void OnScanCompleted(String barcode) {
+                                            mOtherListFragment.search(barcode);
+                                        }
+                                    });
+                                }
+
+                                if (!mScanFragment.isAdded()) {
+                                    FragmentUtils.add(getSupportFragmentManager(), mScanFragment, mViewBinding
+                                            .fragmentContainer.getId(), false, true);
+                                }
+                            }
+
+                            @Override
+                            public void onDenied(List<String> permissionsDeniedForever, List<String>
+                                    permissionsDenied) {
+                            }
+                        })
+                        .request();
+
 
             }
         });
@@ -74,7 +93,7 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter,
                     mViewBinding.lyTitle.edTitle.clearFocus();
 
                 }
-                if (mScanFragment!=null&&mScanFragment.isAdded()) {
+                if (mScanFragment != null && mScanFragment.isAdded()) {
                     mScanFragment.pop();
                     return;
                 }
@@ -99,7 +118,7 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter,
 
     @Override
     public void loadOssku(Pager<Ossku> osskuList, boolean isRefresh, String keyWord) {
-        if (mScanFragment!=null&&mScanFragment.isAdded()) {
+        if (mScanFragment != null && mScanFragment.isAdded()) {
             mScanFragment.pop();
         }
         mOtherListFragment.setData(osskuList, isRefresh);

app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/fragment/OtherListFragment.java

@@ -116,6 +116,7 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
     }
     private View getEmptyView(int resHint) {
         View view = getLayoutInflater().inflate(R.layout.view_empty, null);
+        view.setBackgroundResource(R.color.gray_zhouyu);
         ((TextView) view.findViewById(R.id.tv_empty)).setText(resHint);
         return view;
     }

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/ReplenishmentActivity.java

@@ -4,8 +4,10 @@ package com.xingdata.zzdpos.ui.manage.replenishment;
 import android.view.MotionEvent;
 import android.view.View;
 
+import com.blankj.utilcode.constant.PermissionConstants;
 import com.blankj.utilcode.util.FragmentUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
+import com.blankj.utilcode.util.PermissionUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityReplenishmentBinding;
@@ -44,19 +46,36 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
         mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
-                if (mScanFragment == null) {
-                    mScanFragment = new ScanFragment();
-                    mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
-                        @Override
-                        public void OnScanCompleted(String barcode) {
-                            mReplenishmentDetailFragment.scrollToItem(barcode);
-                        }
-                    });
-                }
 
-                if (!mScanFragment.isAdded()) {
-                    start(mScanFragment);
-                }
+                PermissionUtils.permission
+                        (PermissionConstants.CAMERA)
+                        .callback(new PermissionUtils.FullCallback() {
+                            @Override
+                            public void onGranted(List<String> permissionsGranted) {
+
+                                if (mScanFragment == null) {
+                                    mScanFragment = new ScanFragment();
+                                    mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
+                                        @Override
+                                        public void OnScanCompleted(String barcode) {
+                                            mReplenishmentDetailFragment.scrollToItem(barcode);
+                                        }
+                                    });
+                                }
+
+                                if (!mScanFragment.isAdded()) {
+                                    start(mScanFragment);
+                                }
+
+                            }
+
+                            @Override
+                            public void onDenied(List<String> permissionsDeniedForever, List<String>
+                                    permissionsDenied) {
+                            }
+                        })
+                        .request();
+
 
             }
         });
@@ -69,7 +88,7 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
                     mViewBinding.icTitle.tvTitle.setText(R.string.replenishment_meun);
                     return;
                 }
-                if (mScanFragment!=null&&mScanFragment.isAdded()) {
+                if (mScanFragment != null && mScanFragment.isAdded()) {
                     mScanFragment.pop();
                     return;
                 }
@@ -154,7 +173,7 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
 
     @Override
     public void popScan() {
-        if (mScanFragment!=null&&mScanFragment.isAdded()) {
+        if (mScanFragment != null && mScanFragment.isAdded()) {
             mScanFragment.pop();
         }
     }

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/adpter/ReplenishmentDetailAdapter.java

@@ -37,7 +37,7 @@ public class ReplenishmentDetailAdapter extends BaseAdapter<Sssku, ItemReplenish
         mViewBinding.tvGoodsCode.setText(item.getSpuBarcode() + "");
         mViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
         mViewBinding.tvGoodsPrice.setText(ConvertUtil.fenToYuan(item.getSkuCost(), false));
-        mViewBinding.tvStock.setText(item.getSkuStock() + "");
+        mViewBinding.tvStock.setText(item.getSkuStock() + item.getSpuUnitName());
         if (item.getSkuCnt() != null) {
             mViewBinding.etCount.setText(item.getSkuCnt() + "");
         } else {

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentDetailFragment.java

@@ -57,14 +57,26 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
 
         mViewBinding.edTitle.setHint(R.string.inventory_add_et_hint);
         mViewBinding.edTitle.setText("");
+
+        initRecycycler();
+        initOnClickListener();
+
+
+        new android.os.Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+         mViewBinding.recyclerView.scrollToPosition(0);
+            }
+        }, 1);
+    }
+
+    private void initOnClickListener() {
         Drawable drawableTop = getResources().getDrawable(R.mipmap.but_unfurled);
         Drawable drawableBottom = getResources().getDrawable(R.mipmap.but_up);
         drawableTop.setBounds(0, 0, (int) mViewBinding.tvShopTitle.getTextSize() - 10, (int) mViewBinding.tvShopTitle.getTextSize() - 10);
         drawableBottom.setBounds(0, 0, (int) mViewBinding.tvShopTitle.getTextSize() - 10, (int) mViewBinding.tvShopTitle.getTextSize() - 10);
         mViewBinding.tvShopTitle.setCompoundDrawables(null, null, drawableTop, null);
         mViewBinding.tvSupplierTitle.setCompoundDrawables(null, null, drawableTop, null);
-        initRecycycler();
-
         mViewBinding.tvShopTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
@@ -151,6 +163,7 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
         }
         mReplenishmentDetailAdapter.setEmptyView(getEmptyView());
         mViewBinding.recyclerView.setAdapter(mReplenishmentDetailAdapter);
+
         mReplenishmentDetailAdapter.setOnItemLongClickListener((adapter, view, position) -> {
             PromptDialog delDialog = new PromptDialog();
             delDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "是否删除").setClick(new View.OnClickListener() {

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentFragment.java

@@ -5,8 +5,10 @@ import android.databinding.DataBindingUtil;
 import android.graphics.Typeface;
 import android.support.design.widget.TabLayout;
 import android.text.InputType;
+import android.view.KeyEvent;
 import android.view.View;
 
+import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 
 
@@ -68,27 +70,32 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
 
         mViewBinding.edTitle.setHint("请输入供货商名称");
         mViewBinding.edTitle.setInputType(InputType.TYPE_CLASS_TEXT);
+        mViewBinding.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
+                if (i == EditorInfo.IME_ACTION_SEARCH) {
+                    if (mViewBinding.edTitle.getText().toString().trim().length() == 0) {
+                        ToastUtils.showShort("请输入供货商名称");
+                        return true;
+                    }
+                    switch (mViewBinding.tab.getSelectedTabPosition()) {
+                        case 0:
+                            mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(0));
+                            break;
+                        case 1:
+                            mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(1));
+                            break;
+                        case 2:
+                            mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(2));
+                            break;
+                    }
+                }
+                return true;
 
-        mViewBinding.edTitle.setOnClickListener(view -> {
-            if (mViewBinding.edTitle.getText().toString().trim().length() == 0) {
-                ToastUtils.showShort("请输入供货商名称");
-                return;
-            }
-            switch (mViewBinding.tab.getSelectedTabPosition()) {
-                case 0:
-                    mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(0));
-                    break;
-                case 1:
-                    mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(1));
-                    break;
-                case 2:
-                    mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(2));
-                    break;
             }
-
-
         });
 
+
     }
 
 

app/src/main/res/layout/dialog_integral_get_setting.xml

@@ -464,7 +464,7 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_centerHorizontal="true"
-                            android:layout_weight="1.6"
+                            android:layout_weight="1.5"
                             android:drawableRight="@mipmap/createstore_drop_down"
                             android:ellipsize="end"
                             android:gravity="center"
@@ -482,7 +482,7 @@
                             android:layout_height="wrap_content"
                             android:layout_centerHorizontal="true"
                             android:layout_marginLeft="@dimen/all_padding"
-                            android:layout_weight="1.6"
+                            android:layout_weight="1.5"
                             android:drawableRight="@mipmap/createstore_drop_down"
                             android:ellipsize="end"
                             android:gravity="center"
@@ -500,8 +500,8 @@
                             android:layout_height="wrap_content"
                             android:layout_centerHorizontal="true"
                             android:layout_marginLeft="@dimen/all_padding"
-                            android:layout_marginRight="@dimen/all_bounced_padding"
-                            android:layout_weight="1.8"
+                            android:layout_marginRight="@dimen/all_padding"
+                            android:layout_weight="1.5"
                             android:drawableRight="@mipmap/createstore_drop_down"
                             android:ellipsize="end"
                             android:ems="10"

app/src/main/res/layout/fragment_bale_edit.xml

@@ -74,6 +74,7 @@
                     android:background="@color/transparent"
                     android:contentDescription="@string/store_scan"
                     android:foreground="?android:attr/actionBarItemBackground"
+                    android:onClick="@{OnClickListener}"
                     android:src="@mipmap/but_sweep_yard"/>
 
             </LinearLayout>
@@ -91,10 +92,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_marginBottom="@dimen/all_spacing"
-            android:background="@color/white"
+            android:background="@drawable/up_down_line_white"
             android:gravity="center"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:paddingBottom="@dimen/all_spacing">
 
             <Button
                 android:id="@+id/btn_cancel"

app/src/main/res/layout/fragment_bale_index.xml

@@ -74,6 +74,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@color/transparent"
+                    android:onClick="@{OnClickListener}"
                     android:contentDescription="@string/store_scan"
                     android:foreground="?android:attr/actionBarItemBackground"
                     android:src="@mipmap/but_sweep_yard"/>
@@ -126,7 +127,7 @@
             android:id="@+id/btn_add"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="@drawable/up_down_line_gray"
+            android:background="@drawable/up_down_line_white"
             android:gravity="center"
             android:onClick="@{OnClickListener}"
             android:orientation="horizontal"

app/src/main/res/layout/fragment_other_list.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white_caocao"
@@ -22,22 +22,25 @@
             android:layout_marginTop="@dimen/padding_small"
             android:drawablePadding="@dimen/all_padding"
             android:hint="@string/other_select_edit_hint"
-            android:textColor="@color/black_likui"
-            android:inputType="text"
             android:imeOptions="actionSearch"
+            android:inputType="text"
+            android:textColor="@color/black_likui"
             android:textSize="@dimen/all_text_size_low"
 
             />
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/view_line_L050"
             android:layout_below="@id/ed_title"
             android:background="@color/gray_huanggai" />
+
         <android.support.v4.widget.SwipeRefreshLayout
             android:id="@+id/srl_product"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-           >
+            android:layout_below="@id/ed_title"
+            android:layout_marginTop="-1dp">
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/recycler_other_selcet"
@@ -46,7 +49,14 @@
 
             </android.support.v7.widget.RecyclerView>
         </android.support.v4.widget.SwipeRefreshLayout>
-    </LinearLayout>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:layout_below="@id/ed_title"
+            android:background="@color/gray_huanggai" />
+    </RelativeLayout>
 
 
 </layout>
\ No newline at end of file

app/src/main/res/layout/fragment_replenishement.xml

@@ -24,7 +24,7 @@
             android:layout_marginTop="@dimen/padding_small"
             android:drawablePadding="@dimen/all_padding"
             android:hint="@string/statistics_order_edit_hint"
-            android:inputType="number"
+            android:imeOptions="actionSearch"
             android:textColor="@color/black_likui"
             android:textSize="@dimen/all_text_size_low"
 

app/src/main/res/layout/fragment_replenishement_detail.xml

@@ -82,7 +82,7 @@
                 android:paddingTop="@dimen/all_padding"
                 android:text="供货方"
                 android:textColor="@color/black"
-                android:textSize="@dimen/all_text_size"
+                android:textSize="@dimen/all_text_size_low"
                 android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
@@ -209,7 +209,7 @@
                 android:paddingTop="@dimen/all_padding"
                 android:text="定货方"
                 android:textColor="@color/black"
-                android:textSize="@dimen/all_text_size"
+                android:textSize="@dimen/all_text_size_low"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/ll_supplier" />
 
@@ -221,16 +221,12 @@
                 android:drawableStart="@mipmap/icon_stores"
                 android:text="@{shopName}"
                 android:textColor="@color/black"
-                android:textSize="@dimen/all_text_size"
+                android:textSize="@dimen/all_text_size_low"
                 app:layout_constraintBottom_toBottomOf="@id/tv_shop_title"
                 app:layout_constraintEnd_toEndOf="@id/tv_shop_title"
                 app:layout_constraintTop_toTopOf="@id/tv_shop_title" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/all_slight_line_width"
-                android:background="@color/gray_kongming"
-                app:layout_constraintTop_toTopOf="@id/tv_shop_title" />
+
 
             <View
                 android:id="@+id/view_line_left_2"
@@ -507,11 +503,7 @@
             android:textColor="@color/black_likui"
             android:textSize="@dimen/all_text_size_low" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L050"
-            android:layout_above="@id/ed_title"
-            android:background="@color/gray_huanggai" />
+
 
         <View
             android:layout_width="match_parent"

app/src/main/res/layout/item_other_select.xml

@@ -27,7 +27,7 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/singleline_white_gray"
+        android:background="@color/white_caocao"
         android:paddingBottom="@dimen/all_padding">
 
         <com.facebook.drawee.view.SimpleDraweeView

app/src/main/res/layout/item_replenishment_detail.xml

@@ -49,6 +49,7 @@
             style="@style/other_select_smallstyle"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
+            android:padding="0dp"
             android:text="12783163981789"
             app:layout_constraintBottom_toBottomOf="@id/tv_goods_code_hint"
             app:layout_constraintStart_toEndOf="@id/tv_goods_code_hint"
@@ -64,6 +65,7 @@
             android:padding="@dimen/dp_4"
             android:text="规格"
             android:textSize="@dimen/all_text_size_small"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@id/tv_goods_code"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tv_goods_code" />
@@ -85,7 +87,7 @@
             android:id="@+id/tv_rmb"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-
+            android:padding="0dp"
             android:text="@string/money_rmb"
             android:textColor="@color/store_product_price"
             android:textSize="@dimen/all_text_size_small"
@@ -169,6 +171,7 @@
             style="@style/other_select_smallstyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:padding="0dp"
             android:text="0个"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="@id/tv_stock_hint"

app/src/main/res/layout/view_inventory_detail.xml

@@ -69,29 +69,22 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/all_padding"
                         android:text="@{date}"
                         android:textSize="@dimen/all_text_size_small" />
                 </LinearLayout>
 
-                <View
-                    android:id="@+id/view_line_left"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/view_line_L1"
-                    android:layout_marginTop="@dimen/all_margin"
-                    android:background="@color/lyt_main_bg"
-                    android:elevation="@dimen/view_line_L050"
-                    app:layout_constraintTop_toBottomOf="@id/img_user" />
 
                 <LinearLayout
                     android:id="@+id/ll_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/view_line_height"
-                    android:background="@color/lyt_main_bg"
+                    android:layout_marginTop="@dimen/all_bounced_padding"
+                    android:background="@drawable/singleline_zhouyu_huanggai"
                     android:elevation="@dimen/view_line_L050"
                     android:orientation="horizontal"
                     android:weightSum="5"
-                    app:layout_constraintTop_toBottomOf="@id/view_line_left">
+                    app:layout_constraintTop_toBottomOf="@id/img_user">
 
                     <TextView
                         android:layout_width="0dp"
@@ -151,8 +144,9 @@
                     android:id="@+id/ll_result"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
+                    android:gravity="center_vertical|end"
                     android:orientation="horizontal"
+                    android:padding="@dimen/all_bounced_padding"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_weight="1"
@@ -162,7 +156,6 @@
                         android:id="@+id/tv_result_hint"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/all_margin"
                         android:text="盘点结果:"
                         android:textColor="@color/black"
                         android:textSize="@dimen/small_text_size"
@@ -173,6 +166,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/all_padding"
                         android:background="@drawable/yellow_radius_bg"
                         android:gravity="center"
                         android:paddingBottom="@dimen/dp_4"
@@ -189,8 +183,9 @@
                     android:id="@+id/ll_num"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
+                    android:gravity="center_vertical|start"
                     android:orientation="horizontal"
+                    android:padding="@dimen/all_bounced_padding"
                     app:layout_constraintBottom_toBottomOf="@id/ll_result"
                     app:layout_constraintEnd_toStartOf="@id/ll_result"
                     app:layout_constraintHorizontal_weight="1"
@@ -200,7 +195,6 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/all_margin"
                         android:text="盘点件数:"
                         android:textColor="@color/black"
                         android:textSize="@dimen/small_text_size"
@@ -212,6 +206,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/all_padding"
                         android:padding="@dimen/dp_4"
                         android:text="@{sumNum}"
                         android:textColor="@color/black"