Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java

@@ -102,9 +102,11 @@ public final class ApiFactory {
          */
 
         public static Observable<Object> rigister(String operMobile, String loginPwd, String
-                merName, String shopName, int cityCountyId, String cityAddress, String sn, String
+                merName, String operName, String shopName, int cityCountyId, String cityAddress,
+                                                  String sn, String
                                                           modelNo, String smsCode) {
-            return Api.getInstance().service.register(operMobile, loginPwd, merName, shopName, 0,
+            return Api.getInstance().service.register(operMobile, loginPwd, merName, operName,
+                    shopName, 0,
                     cityCountyId, cityAddress, sn, modelNo, smsCode).onErrorReturn(new
                     ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers
@@ -269,9 +271,11 @@ public final class ApiFactory {
          * @param pageSize
          * @return
          */
-        public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList(String orderStatus, int pageNulmber, int
+        public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList
+        (String orderStatus, int pageNulmber, int
                 pageSize, long startDate, long endDate) {
-            return Api.getInstance().service.getSaleOrder(orderStatus, pageNulmber, pageSize, startDate,
+            return Api.getInstance().service.getSaleOrder(orderStatus, pageNulmber, pageSize,
+                    startDate,
                     endDate).onErrorReturn(new
                     ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread());
@@ -590,7 +594,8 @@ public final class ApiFactory {
                     .retryWhen(new RetryHelper(3));
         }
 
-        public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> querySaleorderByVipId(Long vipId, int pageNumber, int pageSize) {
+        public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>>
+        querySaleorderByVipId(Long vipId, int pageNumber, int pageSize) {
             return Api.getInstance().service.querySaleorderByVipId(vipId, pageNumber, pageSize)
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
@@ -614,15 +619,20 @@ public final class ApiFactory {
         }
 
 
-        public static Observable<Pager<com.xingdata.zzdpos.model.Ticket>> query(int num, int size, int usedFlag) {
+        public static Observable<Pager<com.xingdata.zzdpos.model.Ticket>> query(int num, int
+                size, int usedFlag) {
             return Api.getInstance().service.queryTicket(num, size, usedFlag, "ticketIsList").
-                    onErrorReturn(new ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
+                    onErrorReturn(new ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn
+                    (Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread());
         }
 
-        public static Observable<Pager<com.xingdata.zzdpos.model.Ticket>> query(int num, int size, int usedFlag, long startDate, long endDate) {
-            return Api.getInstance().service.queryTicket(num, size, usedFlag, "ticketIsList", startDate, endDate).
-                    onErrorReturn(new ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
+        public static Observable<Pager<com.xingdata.zzdpos.model.Ticket>> query(int num, int
+                size, int usedFlag, long startDate, long endDate) {
+            return Api.getInstance().service.queryTicket(num, size, usedFlag, "ticketIsList",
+                    startDate, endDate).
+                    onErrorReturn(new ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn
+                    (Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread());
         }
 
@@ -647,8 +657,10 @@ public final class ApiFactory {
                     .observeOn(AndroidSchedulers.mainThread());
         }
 
-        public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(int pageNum, String keyword, Long skuGrpId) {
-            return Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE, skuGrpId, keyword)
+        public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(int pageNum,
+                                                                                    String keyword, Long skuGrpId) {
+            return Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE, skuGrpId,
+                    keyword)
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
                     .subscribeOn(Schedulers.io())
@@ -666,7 +678,9 @@ public final class ApiFactory {
                     .retryWhen(new RetryHelper(3));
         }
 
-        public static Observable<com.xingdata.zzdpos.model.Sssku> update(com.xingdata.zzdpos.model.Sssku sssku) {
+        public static Observable<com.xingdata.zzdpos.model.Sssku> update(com.xingdata.zzdpos
+                                                                                 .model.Sssku
+                                                                                 sssku) {
             return Api.getInstance().service.updateSssku(sssku)
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
@@ -675,7 +689,9 @@ public final class ApiFactory {
                     .retryWhen(new RetryHelper(3));
         }
 
-        public static Observable<com.xingdata.zzdpos.model.Sssku> addSssku(com.xingdata.zzdpos.model.Sssku sssku) {
+        public static Observable<com.xingdata.zzdpos.model.Sssku> addSssku(com.xingdata.zzdpos
+                                                                                   .model.Sssku
+                                                                                   sssku) {
             return Api.getInstance().service.addSssku(sssku)
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
@@ -800,7 +816,8 @@ public final class ApiFactory {
         /**
          * 查询充值记录
          */
-        public static Observable<Pager<VipRechargeOrder>> queryRecharge(int pageNum, int pageSize, long startDate,
+        public static Observable<Pager<VipRechargeOrder>> queryRecharge(int pageNum, int
+                pageSize, long startDate,
                                                                         long endDate) {
             return Api.getInstance().service.queryRecharge(pageNum, pageSize, startDate, endDate)
                     .onErrorReturn(new ErrorFilter<>())
@@ -823,7 +840,8 @@ public final class ApiFactory {
         /**
          * 查询充值记录
          */
-        public static Observable<Pager<VipRechargeOrder>> queryRecharge(long vipId, int pageNum, int pageSize) {
+        public static Observable<Pager<VipRechargeOrder>> queryRecharge(long vipId, int pageNum,
+                                                                        int pageSize) {
             return Api.getInstance().service.queryRecharge(vipId, pageNum, pageSize)
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
@@ -1067,7 +1085,8 @@ public final class ApiFactory {
     }
 
     public static class Ms {
-        public static Observable<Pager<com.xingdata.zzdpos.model.Ms>> query(int pageNum, int pageSize, String keyword) {
+        public static Observable<Pager<com.xingdata.zzdpos.model.Ms>> query(int pageNum, int
+                pageSize, String keyword) {
             return Api.getInstance().service.queryMs(pageNum, pageSize, keyword)
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
@@ -1090,7 +1109,8 @@ public final class ApiFactory {
                     .retryWhen(new RetryHelper(3));
         }
 
-        public static Observable<com.xingdata.zzdpos.model.Ms> update(com.xingdata.zzdpos.model.Ms ms) {
+        public static Observable<com.xingdata.zzdpos.model.Ms> update(com.xingdata.zzdpos.model
+                                                                              .Ms ms) {
             return Api.getInstance().service.updateMs(ms)
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
@@ -1100,7 +1120,8 @@ public final class ApiFactory {
         }
 
 
-        public static Observable<com.xingdata.zzdpos.model.Ms> add(com.xingdata.zzdpos.model.Ms ms) {
+        public static Observable<com.xingdata.zzdpos.model.Ms> add(com.xingdata.zzdpos.model.Ms
+                                                                           ms) {
             return Api.getInstance().service.addMs(ms)
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
@@ -1111,7 +1132,10 @@ public final class ApiFactory {
     }
 
     public static class Level {
-        public static Observable<com.xingdata.zzdpos.model.Level> addVipLevel(com.xingdata.zzdpos.model.Level level) {
+        public static Observable<com.xingdata.zzdpos.model.Level> addVipLevel(com.xingdata.zzdpos
+                                                                                      .model
+                                                                                      .Level
+                                                                                      level) {
             return Api.getInstance().service.addVipLevel(level)
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
@@ -1120,7 +1144,11 @@ public final class ApiFactory {
                     .retryWhen(new RetryHelper(3));
         }
 
-        public static Observable<com.xingdata.zzdpos.model.Level> updateVipLevel(com.xingdata.zzdpos.model.Level level) {
+        public static Observable<com.xingdata.zzdpos.model.Level> updateVipLevel(com.xingdata
+                                                                                         .zzdpos
+                                                                                         .model
+                                                                                         .Level
+                                                                                         level) {
             return Api.getInstance().service.updateVipLevel(level)
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())

app/src/main/java/com/xingdata/zzdpos/api/ApiService.java

@@ -85,7 +85,8 @@ interface ApiService {
      */
     @POST(C.URL.LOGIN.register)
     Observable<HttpMessage<Object>> register(@Query("operMobile") String operMobile, @Query
-            ("loginPwd") String loginPwd, @Query("merName") String merName, @Query("shopName")
+            ("loginPwd") String loginPwd, @Query("merName") String merName, @Query("operName")
+            String operName, @Query("shopName")
                                                      String shopName, @Query("mccId") int mccId,
                                              @Query("cityCountyId") int
                                                      cityCountyId, @Query("cityAddress") String
@@ -192,15 +193,19 @@ interface ApiService {
     Observable<HttpMessage<Sta>> querySta();
 
     @POST(C.URL.RCTRACE.query)
-    Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int pageNum, @Query
+    Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int
+                                                                           pageNum, @Query
             ("pageSize") int pageSize);
 
     @POST(C.URL.RCTRACE.query)
-    Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("vipId") long vipId, @Query("pageNumber") int pageNum, @Query
+    Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("vipId") long vipId,
+                                                                   @Query("pageNumber") int
+                                                                           pageNum, @Query
             ("pageSize") int pageSize);
 
     @POST(C.URL.RCTRACE.query)
-    Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int pageNum, @Query
+    Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int
+                                                                           pageNum, @Query
             ("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long
                                                                            endDate);
 
@@ -228,11 +233,13 @@ interface ApiService {
 
     @POST(C.URL.TICKET.query)
     Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("pageNumber") int pageNum, @Query
-            ("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList") String ticketIsList);
+            ("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList")
+            String ticketIsList);
 
     @POST(C.URL.TICKET.query)
     Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("pageNumber") int pageNum, @Query
-            ("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList") String ticketIsList, @Query("startDate") long startDate, @Query("endDate") long
+            ("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList")
+            String ticketIsList, @Query("startDate") long startDate, @Query("endDate") long
                                                                endDate);
 
     @POST(C.URL.TICKET.ticketBatchSend)
@@ -248,7 +255,8 @@ interface ApiService {
     Observable<HttpMessage<Saleorder>> addOrderPayMis(@Body Saleorder.Pay saleorderPay);
 
     @POST(C.URL.SALEORDER.querySaleorderByVipId)
-    Observable<HttpMessage<Pager<Saleorder>>> querySaleorderByVipId(@Query("vipId") Long vipId, @Query
+    Observable<HttpMessage<Pager<Saleorder>>> querySaleorderByVipId(@Query("vipId") Long vipId,
+                                                                    @Query
             ("pageNumber") int pageNum, @Query("pageSize") int pageSize);
 
 
@@ -313,6 +321,7 @@ interface ApiService {
 
     @POST(C.URL.TRULE.truleQuery)
     Observable<HttpMessage<Pager<Trule>>> truleQuery(@Query("startDate") String data);
+
     @POST(C.URL.TRULE.truleQuery)
     Observable<HttpMessage<Pager<Trule>>> truleQueryByVipId(@Query("vipId") long vipId);
 

app/src/main/java/com/xingdata/zzdpos/model/VipRechargeOrder.java

@@ -33,6 +33,7 @@ public class VipRechargeOrder  extends SectionEntity<MediaStore.Video> implement
     public VipRechargeOrder(MediaStore.Video video) {
         super(video);
     }
+
     public VipRechargeOrder() {
         super(false, "");
     }
@@ -163,6 +164,9 @@ public class VipRechargeOrder  extends SectionEntity<MediaStore.Video> implement
 
     @Override
     public String getUserName() {
+        if (vipMobile == null || vipMobile.length() < 4) {
+            return vipName;
+        }
         return vipName + "(" + vipMobile.substring(vipMobile.length() - 4) + ")";
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/login/LoginContract.java

@@ -190,7 +190,7 @@ public interface LoginContract {
          * 创建门店操作
          */
         abstract void createStore(String operMobile, String loginPwd, String
-                merName, String shopName, int cityCountyId, String cityAddress, int startWay,
+                merName,String operName, String shopName, int cityCountyId, String cityAddress, int startWay,
                                   LoadingDialog loadingDialog);
         /*********************************************************************************************************************************
          绑定款台界面逻辑接口定义**********************************************************************************************************

app/src/main/java/com/xingdata/zzdpos/ui/login/LoginPresenter.java

@@ -10,23 +10,6 @@ import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.SPUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.google.gson.Gson;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.Schedulers;
-import io.realm.Realm;
-import io.realm.RealmResults;
-
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.api.ApiException;
 import com.xingdata.zzdpos.api.ApiFactory;
@@ -42,13 +25,28 @@ import com.xingdata.zzdpos.ui.login.fragment.SignInFragment;
 import com.xingdata.zzdpos.ui.login.fragment.SmsCodeFragment;
 import com.xingdata.zzdpos.ui.login.fragment.bean.LoginBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean;
-import com.xingdata.zzdpos.ui.login.fragment.bean.Shops;
 import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.UserStoreInfo;
 import com.xingdata.zzdpos.util.PhoneFormatCheckUtils;
 import com.xingdata.zzdpos.util.SystemUtil;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+
+import io.reactivex.Observable;
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Consumer;
+import io.reactivex.schedulers.Schedulers;
+import io.realm.Realm;
+import io.realm.RealmResults;
+
 public class LoginPresenter extends LoginContract.Presenter {
     /**
      * 登录成功静态对象
@@ -85,7 +83,6 @@ public class LoginPresenter extends LoginContract.Presenter {
     }
 
 
-
     @Override
     public void createStoreFragmentinit(Context context, LoadingDialog loadingDialog) {
         //加载城市数据列表，加载门店类型列表
@@ -196,7 +193,8 @@ public class LoginPresenter extends LoginContract.Presenter {
 
 
     @Override
-    public void createStore(String operMobile, String loginPwd, String merName, String shopName,
+    public void createStore(String operMobile, String loginPwd, String merName, String operName,
+                            String shopName,
                             int cityCountyId, String cityAddress, int startWay, LoadingDialog
                                     loadingDialog) {
         if (PhoneFormatCheckUtils.isPhoneLegal(operMobile)) {
@@ -204,7 +202,8 @@ public class LoginPresenter extends LoginContract.Presenter {
                 case 1: {
                     ApiFactory.Test.rigister(operMobile, EncryptUtils
                                     .encryptMD5ToString(loginPwd),
-                            merName, shopName, cityCountyId, cityAddress, SystemUtil.getDeviceSN(),
+                            merName, operName, shopName, cityCountyId, cityAddress, SystemUtil
+                                    .getDeviceSN(),
                             SystemUtil.getDeviceModel(), getLoginBean().getSmsCode()).subscribe(
                             register -> {
                                 logAndToast("注册成功");

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/ChoiceStoreFragment.java

@@ -89,6 +89,7 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter,
         }
 
         mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getMerchant().getMerName());
+        list.clear();
         for (int i = 0; i < LoginPresenter.userStoreInfo.getShops().size(); i++) {
             list.add(LoginPresenter.userStoreInfo.getShops().get(i));
         }

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/CreateStoreFragment.java

@@ -31,7 +31,6 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
     private ArrayList<ArrayList<ArrayList<String>>> listAddressItem3 = new ArrayList<>();
 
 
-
     private ArrayList<StoreTypeJsonBean> listTypeItem1 = new ArrayList<>();
     private ArrayList<ArrayList<String>> listTypeItem2 = new ArrayList<>();
     LoadingDialog mLoadingDialog = new LoadingDialog();
@@ -58,13 +57,19 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
             }
         });
         if (startway == 1) {
+            mViewBinding.etMerchantsname.setVisibility(View.VISIBLE);
             mViewBinding.etNickname.setVisibility(View.VISIBLE);
             mViewBinding.tvNickname.setVisibility(View.GONE);
+            mViewBinding.tvMerchantsname.setVisibility(View.GONE);
         } else {
             mViewBinding.etNickname.setVisibility(View.GONE);
+            mViewBinding.etMerchantsname.setVisibility(View.GONE);
             mViewBinding.tvNickname.setVisibility(View.VISIBLE);
-            mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getMerchant().getMerName
+            mViewBinding.tvMerchantsname.setVisibility(View.VISIBLE);
+            mViewBinding.tvMerchantsname.setText(LoginPresenter.userStoreInfo.getMerchant()
+                    .getMerName
                     ());
+            mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getOperName());
         }
         mLoadingDialog.show((BaseActivity) getActivity());
         mPresenter.createStoreFragmentinit(getActivity(), mLoadingDialog);
@@ -97,7 +102,8 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
                     if (isAllNull()) {
                         mLoadingDialog.show((BaseActivity) getActivity());
                         mPresenter.createStore(mPresenter.getLoginBean().getPhone_No(), mPresenter
-                                        .getLoginBean().getPwd(), mViewBinding.etNickname.getText()
+                                        .getLoginBean().getPwd(), mViewBinding.etMerchantsname
+                                        .getText().toString(), mViewBinding.etNickname.getText()
                                         .toString(), mViewBinding.etStorename.getText().toString(),
                                 addressId, mViewBinding.tvStoredetailedaddress.getText().toString
                                         (), startway, mLoadingDialog);
@@ -238,9 +244,9 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
             //登录后新建门店
             _isbl = mViewBinding.tvNickname.getText().toString().isEmpty();
         }
-        return !(_isbl || mViewBinding
-                .etStorename.getText().toString().isEmpty() || mViewBinding.tvStoredetailedaddress
-                .getText().toString().isEmpty() || addressId == -1);
+        return !(_isbl || mViewBinding.tvMerchantsname.getText().toString().isEmpty() ||
+                mViewBinding.etStorename.getText().toString().isEmpty() || mViewBinding
+                .tvStoredetailedaddress.getText().toString().isEmpty() || addressId == -1);
     }
 
 }

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SmsCodeFragment.java

@@ -116,6 +116,9 @@ public class SmsCodeFragment extends BaseFragment<LoginPresenter,
                 }
             }
         });
+        mViewBinding.etPhone.setFocusable(true);
+        mViewBinding.etPhone.setFocusableInTouchMode(true);
+        mViewBinding.etPhone.requestFocus();
     }
 
     public void sendSmsSucc() {

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/bean/UserStoreInfo.java

@@ -10,6 +10,15 @@ import java.util.List;
 public class UserStoreInfo {
     private List<Shops> shops = new ArrayList<>();
     private Merchant merchant = new Merchant();
+    private String operName;
+
+    public String getOperName() {
+        return operName;
+    }
+
+    public void setOperName(String operName) {
+        this.operName = operName;
+    }
 
     public void setShops(List<Shops> shops) {
         this.shops = shops;

app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/MyselfFragment.java

@@ -20,6 +20,7 @@ import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 
 import com.xingdata.zzdpos.ui.main.adapter.MySelfRecyclerAdapter;
+import com.xingdata.zzdpos.util.RecyclerViewUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,7 +39,7 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
     public void initView() {
         mViewBinding.setOpername(LoginPresenter.loginReturnBean.getOperName());
 //        mViewBinding.setPhone(LoginPresenter.loginReturnBean.getOperMobile()+"");
-        mViewBinding.setAddress(LoginPresenter.loginReturnBean.getCityProvName()+LoginPresenter.loginReturnBean.getCityCountyName()+LoginPresenter.loginReturnBean.getCityAddress());
+        mViewBinding.setAddress(LoginPresenter.loginReturnBean.getCityProvName() + LoginPresenter.loginReturnBean.getCityCountyName() + LoginPresenter.loginReturnBean.getCityAddress());
         mViewBinding.fragmentMyselfRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
         integers = new ArrayList<>();
         integers.add(107);
@@ -47,8 +48,8 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
         integers.add(110);
         integers.add(111);
         mMySelfRecyclerAdapter = new MySelfRecyclerAdapter(getActivity(), integers);
+        mViewBinding.fragmentMyselfRecycler.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 1, getResources().getColor(R.color.gray_kongming)));
         mMySelfRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentMyselfRecycler);
-//        mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyItemDecoration(getActivity(), 2, R.color.black_zhangfei));
         mMySelfRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {

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

@@ -84,8 +84,8 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
         mViewBinding.rvShopItemList.addItemDecoration(new DividerItemDecoration(getActivity(),
                 DividerItemDecoration.VERTICAL));
         mViewBinding.rvShopItemList.setAdapter(queryShopAdapter);
-        queryShopAdapter.setOnItemClickListener((adapter, view, position) -> clickProduct
-                (queryShopAdapter.getData().get(position)));
+//        queryShopAdapter.setOnItemClickListener((adapter, view, position) -> clickProduct
+//                (queryShopAdapter.getData().get(position)));
 
         editFragmentImgShopAdapter = new EditFragmentImgShopAdapter(R.layout
                 .item_bale_editfragment_img, listData);
@@ -219,6 +219,7 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
             super.convert(helper, item);
 
             ItemBaleEditBinding mItemViewBinding = (ItemBaleEditBinding) helper.mViewBinding;
+            mItemViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
             if (item.isEdit()) {
                 mItemViewBinding.llUpDown.setVisibility(View.GONE);
                 mItemViewBinding.llEdit.setVisibility(View.VISIBLE);

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

@@ -104,6 +104,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
     private void initRecycler() {
         mViewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mInventoryGoodsAdapter = new InventoryGoodsAdapter(topCsList);
+        mInventoryGoodsAdapter.setEmptyView(getEmptyView());
         mInventoryGoodsAdapter.setOnItemLongClickListener((adapter, view, position) -> {
             PromptDialog delDialog = new PromptDialog();
             delDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "是否删除").setClick(new View.OnClickListener() {
@@ -226,4 +227,12 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
 //        mViewBinding.etKeyword.setText("");
 //        KeyboardUtils.hideSoftInput(getActivity());
     }
+
+
+    private View getEmptyView() {
+        View view = getLayoutInflater().inflate(R.layout.view_empty, null);
+        TextView textView = view.findViewById(R.id.tv_empty);
+        textView.setText(R.string.inventory_add_empty_hint);
+        return view;
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuActivity.java

@@ -17,6 +17,7 @@ import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapt
 import com.xingdata.zzdpos.ui.marketing.ms.MsActivity;
 import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
 import com.xingdata.zzdpos.util.OnClickListener;
+import com.xingdata.zzdpos.util.RecyclerViewUtil;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsOrderGroupAdapter.java

@@ -42,7 +42,7 @@ public class StatisticsOrderGroupAdapter extends BaseSectionQuickAdapter<Saleord
             helper.setText(R.id.tv_left_top, item.getOrderNo());
         }
         if (item.getOrderPayAmt() > 0) {
-            helper.setText(R.id.tv_right_top, "+" + item.getPayAmt());
+            helper.setText(R.id.tv_right_top, "+" + ConvertUtil.fenToYuan(item.getOrderPayAmt(), false));
         } else {
             helper.setText(R.id.tv_right_top, item.getPayAmt());
 
@@ -74,6 +74,8 @@ public class StatisticsOrderGroupAdapter extends BaseSectionQuickAdapter<Saleord
                 ((ImageView) helper.getView(R.id.img_left)).setImageResource(R.mipmap.pay_credit);
 
                 break;
+            default:
+                ((ImageView) helper.getView(R.id.img_left)).setImageResource(R.mipmap.img_head);
         }
 
 

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderMainFragment.java

@@ -137,5 +137,4 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
     }
 
 
-
 }

app/src/main/java/com/xingdata/zzdpos/util/ConvertUtil.java

@@ -24,8 +24,9 @@ public class ConvertUtil {
      * @return 元
      */
     public static String fenToYuan(Long fen) {
-        if (fen == null) return "0.00";
-        return String.valueOf((double) fen / 100);
+        if (fen == null || fen == 0) return "0.00";
+        java.text.DecimalFormat df = new java.text.DecimalFormat("#.00");
+        return String.valueOf(df.format((double) fen / 100));
     }
 
 

app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java

@@ -55,7 +55,7 @@ public final class SystemUtil {
             }
         }
 //        return deviceSN;
-        return "548496";
+        return "548496116";
     }
 
 

app/src/main/java/com/xingdata/zzdpos/view/PopupWindowDownList.java

@@ -298,6 +298,7 @@ class DownlistAdapter extends BaseAdapter {
                     }
                     break;
                 }
+                _temp = oper.getOperName();
                 String entity = _temp + " " + oper.getOperMobile();
                 holder.item_tv.setText(entity);
                 break;

app/src/main/res/drawable/red_lvzhi_border_allradius.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <corners android:radius="@dimen/all_radius" />
+
+    <solid android:color="@color/red_lvzhi" />
+
+</shape>
\ No newline at end of file

app/src/main/res/drawable/selector_guanyu_lvzhi_button_background.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/red_lvzhi_border_allradius" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_gray_round_rectangle_stroke" android:state_enabled="false" />
+    <item android:drawable="@drawable/red_border_allradius" />
+
+</selector>
\ No newline at end of file

app/src/main/res/drawable/shape_gray_r1.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <corners android:radius="@dimen/all_shape_radius" />
-    <solid android:color="@color/gray_zhouyu" />
+    <corners android:radius="10000dp" />
+    <solid android:color="@color/gray_kongming" />
 
 </shape>
\ No newline at end of file

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

@@ -8,8 +8,7 @@
             type="com.xingdata.zzdpos.util.OnClickListener"></variable>
     </data>
 
-    <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"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
@@ -19,16 +18,16 @@
         <include
             android:id="@+id/ic_title"
             layout="@layout/title"
-            app:layout_constraintBottom_toTopOf="@+id/rv_menu"/>
+            app:layout_constraintBottom_toTopOf="@+id/rv_menu" />
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/rv_menu"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:background="@color/gray_zhouyu"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            android:background="@color/gray_zhouyu"
-            app:layout_constraintTop_toBottomOf="@+id/ic_title"></android.support.v7.widget.RecyclerView>
+            app:layout_constraintTop_toBottomOf="@+id/ic_title" />
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -13,7 +13,10 @@
             style="@style/dialog_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:background="@color/gray_kongming" />
         <ViewStub
             android:id="@+id/vs_center"
             android:layout_width="match_parent"
@@ -32,37 +35,33 @@
             android:background="@color/white_caocao"
             android:orientation="horizontal">
 
-            <Button
+            <TextView
                 android:id="@+id/btn_cancel"
                 style="@style/button_passive"
                 android:layout_width="@dimen/button1_width"
                 android:layout_height="@dimen/button1_height"
-                android:layout_margin="@dimen/all_padding"
-                android:gravity="center"
-                android:stateListAnimator="@null"
+                android:layout_marginBottom="@dimen/all_padding"
+                android:layout_marginTop="@dimen/all_padding"
                 android:text="@string/all_cancel"
                 android:textSize="@dimen/all_text_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toLeftOf="@id/btn_confirm"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:targetApi="lollipop" />
+                app:layout_constraintTop_toTopOf="parent" />
 
-            <Button
+            <TextView
                 android:id="@+id/btn_confirm"
                 style="@style/button_positive"
                 android:layout_width="@dimen/button1_width"
                 android:layout_height="@dimen/button1_height"
-                android:layout_margin="@dimen/all_padding"
-                android:gravity="center"
-                android:stateListAnimator="@null"
+                android:layout_marginBottom="@dimen/all_padding"
+                android:layout_marginTop="@dimen/all_padding"
                 android:text="@string/all_confirm"
                 android:textSize="@dimen/all_text_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toRightOf="@id/btn_cancel"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:targetApi="lollipop" />
+                app:layout_constraintTop_toTopOf="parent" />
 
         </android.support.constraint.ConstraintLayout>
 

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

@@ -25,6 +25,48 @@
             android:layout_marginTop="@dimen/all_padding"
             android:orientation="vertical">
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/et_padding"
+                    android:text="@string/login_createstorefragment_tv_merchantsname"
+                    android:textColor="@color/black_baozheng"
+                    android:textSize="@dimen/text_three_title"
+                    android:textStyle="bold"/>
+
+                <TextView
+                    android:id="@+id/tv_merchantsname"
+                    android:layout_width="@dimen/et_width"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left"
+                    android:ems="10"
+                    android:gravity="center_vertical"
+                    android:hint="@string/login_createstorefragment_et_nickname_hint"
+                    android:lines="1"
+                    android:maxLength="11"
+                    android:padding="@dimen/et_padding"
+                    android:singleLine="true"
+                    android:textColor="@color/black_baozheng"
+                    android:textColorHint="@color/hint"
+                    android:textSize="@dimen/et_textsize"
+                    android:visibility="gone"/>
+
+                <com.xingdata.zzdpos.view.ContainsEmojiEditText
+                    android:id="@+id/et_merchantsname"
+                    style="@style/editText_new"
+                    android:ems="10"
+                    android:hint="@string/login_createstorefragment_et_merchantsname_hint"
+                    android:lines="1"
+                    android:maxLength="11"
+                    android:singleLine="true"/>
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -197,7 +239,7 @@
                 android:onClick="@{onClickListener}"
                 android:text="@string/login_createstorefragment_btn_last"
                 android:textColor="@color/white"
-                android:textSize="@dimen/et_textsize" />
+                android:textSize="@dimen/et_textsize"/>
 
             <Button
                 android:id="@+id/btn_next"

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

@@ -58,8 +58,8 @@
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/singleline_white_gray">
+                android:layout_height="match_parent"
+                android:background="@color/gray_zhouyu">
 
             </android.support.v7.widget.RecyclerView>
         </LinearLayout>

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

@@ -123,14 +123,25 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/fragment_myself_recycler"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/all_padding"
             android:layout_marginTop="@dimen/all_padding"
             android:background="@color/gray_zhouyu"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/guideline" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_kongming"
+            app:layout_constraintBottom_toBottomOf="@id/fragment_myself_recycler" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_kongming"
+            app:layout_constraintTop_toTopOf="@id/fragment_myself_recycler" />
+
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -40,7 +40,7 @@
                     android:id="@+id/et_phone"
                     style="@style/editText_new"
                     android:digits="1234567890"
-                    android:drawableLeft="@mipmap/login_pwd01"
+                    android:drawableLeft="@mipmap/login_username1"
                     android:ems="10"
                     android:gravity="center_vertical"
                     android:hint="@string/login_et_phone_hint"

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

@@ -159,17 +159,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/guideline" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming"
-            app:layout_constraintTop_toTopOf="@id/fragment_casher_recycler" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming"
-            app:layout_constraintBottom_toBottomOf="@id/fragment_casher_recycler" />
 
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -11,10 +11,9 @@
     <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
                                                  xmlns:card_view="http://schemas.android.com/apk/res-auto"
                                                  android:layout_width="match_parent"
-                                                 android:layout_height="180dp"
+                                                 android:layout_height="150dp"
                                                  android:background="@color/white"
-                                                 android:foreground="?android:attr/selectableItemBackground"
-                                                 android:padding="@dimen/all_margin">
+                                                 android:foreground="?android:attr/selectableItemBackground">
 
         <!--<com.xingdata.zzdhd.ui.manager.bale.view.NineGridImageView-->
         <!--android:id="@+id/iv_pic"-->
@@ -31,14 +30,14 @@
 
         <com.xingdata.zzdpos.ui.manage.bale.view.TribeAvatar
             android:id="@+id/iv_pic"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
             android:layout_margin="@dimen/all_margin"
             android:background="@drawable/shape_black"
             android:padding="2dp"
-            card_view:layout_constraintBottom_toBottomOf="parent"
             card_view:layout_constraintHorizontal_weight="1"
             card_view:layout_constraintLeft_toLeftOf="parent"
+            card_view:layout_constraintBottom_toBottomOf="parent"
             card_view:layout_constraintRight_toLeftOf="@id/ll_shop_message"
             card_view:layout_constraintTop_toTopOf="parent">
 
@@ -50,6 +49,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:orientation="vertical"
+            android:gravity="center"
             android:padding="@dimen/all_padding"
             card_view:layout_constraintBottom_toBottomOf="parent"
             card_view:layout_constraintHorizontal_weight="1.5"

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

@@ -11,7 +11,7 @@
 
     <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
                                                  android:layout_width="match_parent"
-                                                 android:layout_height="180dp"
+                                                 android:layout_height="150dp"
                                                  android:layout_marginBottom="@dimen/all_padding"
                                                  android:foreground="?android:attr/selectableItemBackground"
                                                  android:padding="@dimen/all_margin">
@@ -109,6 +109,7 @@
                 android:layout_marginEnd="@dimen/all_margin"
                 android:layout_weight="1"
                 android:background="@color/white"
+                android:onClick="@{onClick}"
                 android:src="@mipmap/but_reduce"/>
 
 
@@ -138,6 +139,7 @@
                 android:layout_marginStart="@dimen/all_margin"
                 android:layout_weight="1"
                 android:background="@color/white"
+                android:onClick="@{onClick}"
                 android:src="@mipmap/but_add"
                 android:visibility="visible"
                 tools:layout_editor_absoluteX="666dp"
@@ -185,9 +187,9 @@
                 android:id="@+id/btn_edit_ok"
                 android:layout_width="55dp"
                 android:layout_height="27dp"
-                android:onClick="@{onClick}"
                 android:layout_marginStart="@dimen/all_margin"
                 android:background="@drawable/shape_black_solid_blue"
+                android:onClick="@{onClick}"
                 android:text="确定"
                 android:textColor="@color/white"
                 />
@@ -198,7 +200,7 @@
             style="@style/other_select_smallstyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/all_padding"
+            android:layout_marginTop="@dimen/all_margin"
             android:text="进价："
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="@id/tv_no_hint"

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

@@ -48,8 +48,8 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:gravity="left"
-                android:lines="2"
-                android:maxLines="2"
+                android:lines="1"
+                android:maxLines="1"
                 android:text="生日蛋糕组装礼盒带增补品啊是的那是代表开机速度卡角度看啦啦；等哈阿大大"
                 android:textColor="@color/black"
                 android:textSize="@dimen/all_text_size"

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

@@ -4,15 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
-
-
     </data>
 
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/white_caocao"
+        android:background="@drawable/singleline_white_gray"
         android:paddingBottom="@dimen/all_padding">
 
 

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

@@ -24,29 +24,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <View
-            android:layout_width="0dp"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming"
-            app:layout_constraintEnd_toEndOf="@id/item_tv"
-            app:layout_constraintStart_toStartOf="@id/item_tv"
-            app:layout_constraintTop_toTopOf="@id/item_tv" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming"
-            app:layout_constraintBottom_toBottomOf="@id/item_tv"
-            app:layout_constraintEnd_toEndOf="@id/item_tv"
-            app:layout_constraintStart_toStartOf="@id/item_tv" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="@dimen/all_padding"
-            android:background="@color/gray_zhouyu"
-            app:layout_constraintTop_toBottomOf="@id/item_tv"
-            app:layout_constraintEnd_toEndOf="@id/item_tv"
-            app:layout_constraintStart_toStartOf="@id/item_tv" />
 
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -28,7 +28,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/all_text_size_small"
             android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/all_text_size_small"
+            android:textSize="@dimen/all_text_size"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/img_left" />
@@ -47,7 +47,7 @@
             android:id="@+id/tv_left_top"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/padding_small"
+            android:layout_marginStart="@dimen/all_padding_left_right"
             android:text="1231231244124124"
             android:textColor="@color/black_baozheng"
             android:textSize="@dimen/all_text_size"
@@ -58,7 +58,7 @@
             android:id="@+id/tv_left_bottom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_padding"
+            android:layout_marginStart="@dimen/all_margin"
             android:text="11-15    15：23"
             android:textSize="@dimen/all_text_size_small_small"
             app:layout_constraintBottom_toBottomOf="@id/img_left"

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

@@ -15,36 +15,36 @@
         android:layout_height="?attr/actionBarSize"
         android:background="@color/white_caocao"
         android:focusable="true"
-        android:focusableInTouchMode="true"
-        >
+        android:focusableInTouchMode="true">
 
 
         <ImageButton
             android:id="@+id/iv_back"
-            android:layout_width="?attr/actionBarSize"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:background="@color/transparent"
             android:onClick="@{onClickListener}"
+            android:padding="@dimen/all_padding"
             android:src="@mipmap/go_back"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
 
-
         <EditText
             android:id="@+id/ed_title"
             style="@style/searchBarEditor"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="30dp"
+            android:drawablePadding="@dimen/all_padding"
             android:hint="@string/statistics_order_edit_hint"
             android:inputType="number"
             android:textColor="@color/black_likui"
-            android:textColorHint="@color/gray_kongming"
-            android:textSize="@dimen/all_text_size"
+            android:textSize="@dimen/all_text_size_low"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/iv_right"
-            app:layout_constraintStart_toEndOf="@id/iv_back"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintLeft_toRightOf="@id/iv_back"
+            app:layout_constraintRight_toLeftOf="@id/iv_right"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_goneMarginRight="@dimen/all_padding" />
 
@@ -62,11 +62,12 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_goneMarginRight="?attr/actionBarSize" />
 
-        <ImageButton
+        <ImageView
             android:id="@+id/iv_right"
-            android:layout_width="?attr/actionBarSize"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:background="@color/transparent"
+            android:padding="@dimen/all_padding"
             android:src="@mipmap/ic_dates"
             android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="parent"

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

@@ -25,9 +25,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="0dp"
+                android:background="@color/gray_kongming"
                 android:layout_weight="1"
                 android:imeOptions="actionSearch"
-                android:background="@color/listview_bg"
                 android:hint="请输入手机号或会员姓名" />
 
         </LinearLayout>

app/src/main/res/values/dimens.xml

@@ -7,7 +7,7 @@
     <dimen name="all_margin">18dp</dimen>
     <dimen name="all_margin_big_big">40dp</dimen>
     <dimen name="all_margin_big">28dp</dimen>
-    <dimen name="all_spacing">6dp</dimen>
+    <dimen name="all_spacing">8dp</dimen>
     <dimen name="all_sub_title_size">20sp</dimen>
     <dimen name="big_text_size">18sp</dimen>
     <dimen name="big_big_text_size">20sp</dimen>

app/src/main/res/values/strings.xml

@@ -221,6 +221,7 @@
     <string name="login_smscodefragment_et_one_input_password_hint">请输入密码</string>
     <string name="login_smscodefragment_et_two_input_password_hint">请再次输入密码</string>
     <!--创建门店界面-->
+    <string name="login_createstorefragment_tv_merchantsname">商户名</string>
     <string name="login_createstorefragment_tv_nickname">昵称</string>
     <string name="login_createstorefragment_tv_storename">门店名称</string>
     <string name="login_createstorefragment_tv_storetype">门店类型</string>
@@ -228,6 +229,7 @@
     <string name="login_createstorefragment_tv_storeaddressmessage">详细地址</string>
     <string name="login_createstorefragment_tv_storetype_hint">请选择门店类别（连锁/超市）</string>
     <string name="login_createstorefragment_tv_storeaddress_hint">请选择门店地址（省/市/县）</string>
+    <string name="login_createstorefragment_et_merchantsname_hint">请输入商户名</string>
     <string name="login_createstorefragment_et_nickname_hint">请输入昵称</string>
     <string name="login_createstorefragment_et_storename_hint">请输入门店名称</string>
     <string name="login_createstorefragment_et_storedetailedaddress_hint">请输入街道门牌号</string>
@@ -285,6 +287,7 @@
     <string name="inventory_add">开始盘库</string>
     <string name="inventory_order">共%s人次盘库记录</string>
     <string name="inventory_empty_hint">没有记录，请调整日期</string>
+    <string name="inventory_add_empty_hint">请输入商品条码搜索商品</string>
     <string name="inventory_add_title">商品盘点</string>
     <string name="inventory_add_et_hint">请输入商品条码</string>
     <string name="inventory_add_btn_cancel">删除</string>

app/src/main/res/values/styles.xml

@@ -283,15 +283,16 @@
         <item name="android:textSize">@dimen/small_text_size</item>
     </style>
 
-    <style name="button_positive" parent="android:ButtonBar">
-        <item name="android:background">@drawable/red_border_allradius</item>
+    <style name="button_positive">
+        <item name="android:background">@drawable/selector_guanyu_lvzhi_button_background</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:gravity">center</item>
+        <item name="android:textSize">@dimen/all_text_size</item>
         <item name="android:focusable">false</item>
         <item name="android:focusableInTouchMode">false</item>
     </style>
 
-    <style name="button_positive_noradius" parent="android:ButtonBar">
+    <style name="button_positive_noradius">
         <item name="android:background">@drawable/selector_gradient_red_button_background_noradius
         </item>
         <item name="android:textColor">@color/white</item>
@@ -335,9 +336,10 @@
         <item name="android:background">@drawable/xu_line</item>
     </style>
 
-    <style name="button_passive" parent="android:ButtonBar">
+    <style name="button_passive">
         <item name="android:background">@drawable/selector_gradient_gray_button_background</item>
         <item name="android:textColor">@drawable/selector_gray_button_text_color</item>
+        <item name="android:textSize">@dimen/all_text_size</item>
         <item name="android:gravity">center</item>
     </style>
 
@@ -409,12 +411,13 @@
     <style name="searchBarEditor">
         <item name="android:drawableStart">@mipmap/ic_search</item>
         <item name="android:drawablePadding">@dimen/all_spacing</item>
+        <item name="android:paddingStart">@dimen/all_padding</item>
         <item name="android:maxLines">1</item>
         <item name="android:maxLength">20</item>
         <item name="android:background">@drawable/shape_gray_r1</item>
-        <item name="android:padding">@dimen/all_spacing</item>
         <item name="android:imeOptions">actionSearch</item>
     </style>
+
     <style name="searchEditor">
         <item name="android:drawablePadding">@dimen/all_spacing</item>
         <item name="android:maxLines">1</item>