Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -98,6 +98,15 @@ public class C {
             public static final String addStore = PKG + "shop/addShopMis";
         }
 
+        public final class SMT {
+            /**
+             * 获取月份销售统计
+             */
+            public static final String querySmt = PKG + "smt/query";
+
+        }
+
+
         public final class COUNTER {
             /**
              * 添加款台信息

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

@@ -11,6 +11,7 @@ import com.xingdata.zzdpos.model.Category;
 import com.xingdata.zzdpos.model.Gbound;
 import com.xingdata.zzdpos.model.Mscard;
 import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Smt;
 import com.xingdata.zzdpos.model.Trule;
 import com.xingdata.zzdpos.model.Ubound;
 import com.xingdata.zzdpos.model.UsskuParam;
@@ -431,6 +432,19 @@ public final class ApiFactory {
         }
     }
 
+    public static class Smt {
+
+        public static Observable<Pager<com.xingdata.zzdpos.model.Smt>> queryAll(int pageSize, int
+                pageNumber) {
+            return Api.getInstance().service.querySmt(pageSize, pageNumber)
+                    .onErrorReturn(new ErrorFilter<>())
+                    .map(new ResultFilter<>())
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread());
+
+        }
+    }
+
     public static class Ussku {
         public static Observable<Pager<com.xingdata.zzdpos.model.Ussku>> usskuQuery(int pageNum,
                                                                                     String keyword) {
@@ -1230,6 +1244,7 @@ public final class ApiFactory {
                     .observeOn(AndroidSchedulers.mainThread())
                     .retryWhen(new RetryHelper(3));
         }
+
         public static Observable<Pager<Mscard>> mscardQuery() {
             return Api.getInstance().service.mscardQuery()
                     .onErrorReturn(new ErrorFilter<>())

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

@@ -18,6 +18,7 @@ import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Pay;
 import com.xingdata.zzdpos.model.Psb;
 import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.model.Smt;
 import com.xingdata.zzdpos.model.Sskugrp;
 import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.model.Sta;
@@ -210,7 +211,7 @@ interface ApiService {
                                                                            pageNum, @Query
                                                                            ("pageSize") int
                                                                            pageSize, @Query
-            ("startDate") long startDate, @Query("endDate") long
+                                                                           ("startDate") long startDate, @Query("endDate") long
                                                                            endDate);
 
     @POST(C.URL.PSB.queryDetail)
@@ -313,6 +314,10 @@ interface ApiService {
     @POST(C.URL.SHOP.queryAll)
     Observable<HttpMessage<List<Category>>> queryAll(@Body Category category);
 
+    @POST(C.URL.SMT.querySmt)
+    Observable<HttpMessage<Pager<Smt>>> querySmt(@Query("pageSize")
+                                                         int pageSize, @Query("pageNumber") int pageNumber);
+
     @POST(C.URL.USSKU.usskuQuery)
     Observable<HttpMessage<Pager<Ussku>>> usskuQuery(@Query("wd") String wd, @Query("pageSize")
             int pageSize, @Query("pageNumber") int pageNumber);

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

+package com.xingdata.zzdpos.model;
+
+/**
+ * Created by Administrator on 2018/1/18.
+ */
+
+
+public class Smt {
+    private Long sdtId;
+
+    private Long opMapId;
+
+    private Long channelMapId;
+
+    private Long merMapId;
+
+    private Long shopMapId;
+
+    private String merNameabcn;
+
+    private String shopNameabcn;
+
+    private Long cityCountyId;
+
+    private Long totalDate;
+
+    private Long totalInCnt;
+
+    private Long totalInAmt;
+
+    private Long totalAvgPrice;
+
+    private Long totalProfit;
+
+    private Long totalProfitPer;
+
+    private Long lossCnt;
+
+    private Long lossAmt;
+
+    private Long totalOutCnt;
+
+    private Long totalOutAmt;
+
+    private Long payCashCnt;
+
+    private Long payCashAmt;
+
+    private Long payBankCnt;
+
+    private Long payBankAmt;
+
+    private Long payVipcardCnt;
+
+    private Long payVipcardAmt;
+
+    private Long payWxCnt;
+
+    private Long payWxAmt;
+
+    private Long payAlipayCnt;
+
+    private Long payAlipayAmt;
+
+    private Long payOthpayCnt;
+
+    private Long payOthpayAmt;
+
+    private Long vipCnt;
+
+    private Long vipAmt;
+
+    private Long novipCnt;
+
+    private Long novipAmt;
+
+    private Long onlineCnt;
+
+    private Long onlineAmt;
+
+    private Long offlineCnt;
+
+    private Long offlineAmt;
+
+    private Long promoteCnt;
+
+    private Long promoteAmt;
+
+    private Long totalMonth;
+
+    private Long totalYear;
+
+    private Long lgeUnit;
+
+    private Long lge;
+
+    private Long avgInCnt;
+
+    public Long getSdtId() {
+        return sdtId;
+    }
+
+    public void setSdtId(Long sdtId) {
+        this.sdtId = sdtId;
+    }
+
+    public Long getOpMapId() {
+        return opMapId;
+    }
+
+    public void setOpMapId(Long opMapId) {
+        this.opMapId = opMapId;
+    }
+
+    public Long getChannelMapId() {
+        return channelMapId;
+    }
+
+    public void setChannelMapId(Long channelMapId) {
+        this.channelMapId = channelMapId;
+    }
+
+    public Long getMerMapId() {
+        return merMapId;
+    }
+
+    public void setMerMapId(Long merMapId) {
+        this.merMapId = merMapId;
+    }
+
+    public Long getShopMapId() {
+        return shopMapId;
+    }
+
+    public void setShopMapId(Long shopMapId) {
+        this.shopMapId = shopMapId;
+    }
+
+    public String getMerNameabcn() {
+        return merNameabcn;
+    }
+
+    public void setMerNameabcn(String merNameabcn) {
+        this.merNameabcn = merNameabcn == null ? null : merNameabcn.trim();
+    }
+
+    public String getShopNameabcn() {
+        return shopNameabcn;
+    }
+
+    public void setShopNameabcn(String shopNameabcn) {
+        this.shopNameabcn = shopNameabcn == null ? null : shopNameabcn.trim();
+    }
+
+    public Long getCityCountyId() {
+        return cityCountyId;
+    }
+
+    public void setCityCountyId(Long cityCountyId) {
+        this.cityCountyId = cityCountyId;
+    }
+
+    public Long getTotalDate() {
+        return totalDate;
+    }
+
+    public void setTotalDate(Long totalDate) {
+        this.totalDate = totalDate;
+    }
+
+    public Long getTotalInCnt() {
+        return totalInCnt;
+    }
+
+    public void setTotalInCnt(Long totalInCnt) {
+        this.totalInCnt = totalInCnt;
+    }
+
+    public Long getTotalInAmt() {
+        return totalInAmt;
+    }
+
+    public void setTotalInAmt(Long totalInAmt) {
+        this.totalInAmt = totalInAmt;
+    }
+
+    public Long getTotalAvgPrice() {
+        return totalAvgPrice;
+    }
+
+    public void setTotalAvgPrice(Long totalAvgPrice) {
+        this.totalAvgPrice = totalAvgPrice;
+    }
+
+    public Long getTotalProfit() {
+        return totalProfit;
+    }
+
+    public void setTotalProfit(Long totalProfit) {
+        this.totalProfit = totalProfit;
+    }
+
+    public Long getTotalProfitPer() {
+        return totalProfitPer;
+    }
+
+    public void setTotalProfitPer(Long totalProfitPer) {
+        this.totalProfitPer = totalProfitPer;
+    }
+
+    public Long getLossCnt() {
+        return lossCnt;
+    }
+
+    public void setLossCnt(Long lossCnt) {
+        this.lossCnt = lossCnt;
+    }
+
+    public Long getLossAmt() {
+        return lossAmt;
+    }
+
+    public void setLossAmt(Long lossAmt) {
+        this.lossAmt = lossAmt;
+    }
+
+    public Long getTotalOutCnt() {
+        return totalOutCnt;
+    }
+
+    public void setTotalOutCnt(Long totalOutCnt) {
+        this.totalOutCnt = totalOutCnt;
+    }
+
+    public Long getTotalOutAmt() {
+        return totalOutAmt;
+    }
+
+    public void setTotalOutAmt(Long totalOutAmt) {
+        this.totalOutAmt = totalOutAmt;
+    }
+
+    public Long getPayCashCnt() {
+        return payCashCnt;
+    }
+
+    public void setPayCashCnt(Long payCashCnt) {
+        this.payCashCnt = payCashCnt;
+    }
+
+    public Long getPayCashAmt() {
+        return payCashAmt;
+    }
+
+    public void setPayCashAmt(Long payCashAmt) {
+        this.payCashAmt = payCashAmt;
+    }
+
+    public Long getPayBankCnt() {
+        return payBankCnt;
+    }
+
+    public void setPayBankCnt(Long payBankCnt) {
+        this.payBankCnt = payBankCnt;
+    }
+
+    public Long getPayBankAmt() {
+        return payBankAmt;
+    }
+
+    public void setPayBankAmt(Long payBankAmt) {
+        this.payBankAmt = payBankAmt;
+    }
+
+    public Long getPayVipcardCnt() {
+        return payVipcardCnt;
+    }
+
+    public void setPayVipcardCnt(Long payVipcardCnt) {
+        this.payVipcardCnt = payVipcardCnt;
+    }
+
+    public Long getPayVipcardAmt() {
+        return payVipcardAmt;
+    }
+
+    public void setPayVipcardAmt(Long payVipcardAmt) {
+        this.payVipcardAmt = payVipcardAmt;
+    }
+
+    public Long getPayWxCnt() {
+        return payWxCnt;
+    }
+
+    public void setPayWxCnt(Long payWxCnt) {
+        this.payWxCnt = payWxCnt;
+    }
+
+    public Long getPayWxAmt() {
+        return payWxAmt;
+    }
+
+    public void setPayWxAmt(Long payWxAmt) {
+        this.payWxAmt = payWxAmt;
+    }
+
+    public Long getPayAlipayCnt() {
+        return payAlipayCnt;
+    }
+
+    public void setPayAlipayCnt(Long payAlipayCnt) {
+        this.payAlipayCnt = payAlipayCnt;
+    }
+
+    public Long getPayAlipayAmt() {
+        return payAlipayAmt;
+    }
+
+    public void setPayAlipayAmt(Long payAlipayAmt) {
+        this.payAlipayAmt = payAlipayAmt;
+    }
+
+    public Long getPayOthpayCnt() {
+        return payOthpayCnt;
+    }
+
+    public void setPayOthpayCnt(Long payOthpayCnt) {
+        this.payOthpayCnt = payOthpayCnt;
+    }
+
+    public Long getPayOthpayAmt() {
+        return payOthpayAmt;
+    }
+
+    public void setPayOthpayAmt(Long payOthpayAmt) {
+        this.payOthpayAmt = payOthpayAmt;
+    }
+
+    public Long getVipCnt() {
+        return vipCnt;
+    }
+
+    public void setVipCnt(Long vipCnt) {
+        this.vipCnt = vipCnt;
+    }
+
+    public Long getVipAmt() {
+        return vipAmt;
+    }
+
+    public void setVipAmt(Long vipAmt) {
+        this.vipAmt = vipAmt;
+    }
+
+    public Long getNovipCnt() {
+        return novipCnt;
+    }
+
+    public void setNovipCnt(Long novipCnt) {
+        this.novipCnt = novipCnt;
+    }
+
+    public Long getNovipAmt() {
+        return novipAmt;
+    }
+
+    public void setNovipAmt(Long novipAmt) {
+        this.novipAmt = novipAmt;
+    }
+
+    public Long getOnlineCnt() {
+        return onlineCnt;
+    }
+
+    public void setOnlineCnt(Long onlineCnt) {
+        this.onlineCnt = onlineCnt;
+    }
+
+    public Long getOnlineAmt() {
+        return onlineAmt;
+    }
+
+    public void setOnlineAmt(Long onlineAmt) {
+        this.onlineAmt = onlineAmt;
+    }
+
+    public Long getOfflineCnt() {
+        return offlineCnt;
+    }
+
+    public void setOfflineCnt(Long offlineCnt) {
+        this.offlineCnt = offlineCnt;
+    }
+
+    public Long getOfflineAmt() {
+        return offlineAmt;
+    }
+
+    public void setOfflineAmt(Long offlineAmt) {
+        this.offlineAmt = offlineAmt;
+    }
+
+    public Long getPromoteCnt() {
+        return promoteCnt;
+    }
+
+    public void setPromoteCnt(Long promoteCnt) {
+        this.promoteCnt = promoteCnt;
+    }
+
+    public Long getPromoteAmt() {
+        return promoteAmt;
+    }
+
+    public void setPromoteAmt(Long promoteAmt) {
+        this.promoteAmt = promoteAmt;
+    }
+
+    public Long getTotalMonth() {
+        return totalMonth;
+    }
+
+    public void setTotalMonth(Long totalMonth) {
+        this.totalMonth = totalMonth;
+    }
+
+    public Long getTotalYear() {
+        return totalYear;
+    }
+
+    public void setTotalYear(Long totalYear) {
+        this.totalYear = totalYear;
+    }
+
+    public Long getLgeUnit() {
+        return lgeUnit;
+    }
+
+    public void setLgeUnit(Long lgeUnit) {
+        this.lgeUnit = lgeUnit;
+    }
+
+    public Long getLge() {
+        return lge;
+    }
+
+    public void setLge(Long lge) {
+        this.lge = lge;
+    }
+
+    public Long getAvgInCnt() {
+        return avgInCnt;
+    }
+
+    public void setAvgInCnt(Long avgInCnt) {
+        this.avgInCnt = avgInCnt;
+    }
+}
\ No newline at end of file

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

-package com.xingdata.zzdpos.model;
-
-import com.xingdata.api.print.entity.BaseGoodPrint;
-import com.xingdata.api.print.entity.BaseOrderPrint;
-import com.xingdata.zzdpos.ui.login.LoginPresenter;
-import com.xingdata.zzdpos.util.ConvertUtil;
-
-import java.util.List;
-
-/**
- * Created by Administrator on 2017/12/15.
- */
-
-public class VipRechangeOrder implements BaseOrderPrint {
-    private Long cardAmtPay;
-    private Long cardAmtSend;
-    private Long rechangeBefore;
-    private Long rechangeAfter;
-    private String vipName;
-    private String rctraceNo;
-    private String vipMobile;
-    private Long createTime;
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getCardAmtPay() {
-        return cardAmtPay;
-    }
-
-    public void setCardAmtPay(Long cardAmtPay) {
-        this.cardAmtPay = cardAmtPay;
-    }
-
-    public Long getCardAmtSend() {
-        return cardAmtSend;
-    }
-
-    public void setCardAmtSend(Long cardAmtSend) {
-        this.cardAmtSend = cardAmtSend;
-    }
-
-    public String getVipName() {
-        return vipName;
-    }
-
-    public void setVipName(String vipName) {
-        this.vipName = vipName;
-    }
-
-    public String getRctraceNo() {
-        return rctraceNo;
-    }
-
-    public void setRctraceNo(String rctraceNo) {
-        this.rctraceNo = rctraceNo;
-    }
-
-    public String getVipMobile() {
-        return vipMobile;
-    }
-
-    public void setVipMobile(String vipMobile) {
-        this.vipMobile = vipMobile;
-    }
-
-    public Long getRechangeBefore() {
-        return rechangeBefore;
-    }
-
-    public void setRechangeBefore(Long rechangeBefore) {
-        this.rechangeBefore = rechangeBefore;
-    }
-
-    public Long getRechangeAfter() {
-        return rechangeAfter;
-    }
-
-    public void setRechangeAfter(Long rechangeAfter) {
-        this.rechangeAfter = rechangeAfter;
-    }
-
-    public String getVipname() {
-        return vipName;
-    }
-
-    public void setVipname(String vipname) {
-        this.vipName = vipname;
-    }
-
-    @Override
-    public String getPayAmt() {
-        if (cardAmtSend!=null&&cardAmtSend!=0){
-            return ConvertUtil.fenToYuan(cardAmtPay,false)+"+"+ConvertUtil.fenToYuan(cardAmtSend,false);
-        }else {
-            return ConvertUtil.fenToYuan(cardAmtPay,false);
-        }
-
-    }
-    @Override
-    public String getVip_money() {
-        return ConvertUtil.fenToYuan(getRechangeAfter(),false);
-    }
-
-    @Override
-    public String getBalanceOld() {
-        return ConvertUtil.fenToYuan(getRechangeBefore(),false);
-    }
-
-    @Override
-    public String getTitle() {
-        return LoginPresenter.loginReturnBean.getMerNameAbcn();
-    }
-
-    @Override
-    public String getStore() {
-        return LoginPresenter.loginReturnBean.getShopNameAbcn();
-    }
-
-    @Override
-    public String getOrderNo() {
-        return rctraceNo;
-    }
-
-    @Override
-    public String getOrderTime() {
-        return com.blankj.utilcode.util.TimeUtils.millis2String(createTime);
-    }
-
-    @Override
-    public String getCasherName() {
-        return LoginPresenter.loginReturnBean.getOperName();
-    }
-
-    @Override
-    public String getUserName() {
-        return vipName+"("+vipMobile.substring(vipMobile.length()-4)+")";
-    }
-
-
-    @Override
-    public String getPayChannel() {
-        return null;
-    }
-
-    @Override
-    public String getPayChange() {
-        return null;
-    }
-
-    @Override
-    public String getGoodsCnt() {
-        return null;
-    }
-
-    @Override
-    public String getGoodsAmtSum() {
-        return null;
-    }
-
-    @Override
-    public String getGoodsReduPer() {
-        return null;
-    }
-
-    @Override
-    public String getGoodsReduAmt() {
-        return null;
-    }
-
-    @Override
-    public List<BaseGoodPrint> getGoodList() {
-        return null;
-    }
-
-    @Override
-    public String getDRAW_URL() {
-        return null;
-    }
-
-    @Override
-    public String getPrint_state() {
-        return null;
-    }
-
-    @Override
-    public String getOper_mobile() {
-        return null;
-    }
-
-
-    @Override
-    public String getStore_tel() {
-        return null;
-    }
-
-    @Override
-    public String getSupplier() {
-        return null;
-    }
-}

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

@@ -122,7 +122,7 @@ public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements
     @Override
     public String getPayAmt() {
         if (cardAmtSend != null && cardAmtSend != 0) {
-            return ConvertUtil.fenToYuan(cardAmtPay, false) + "+" + ConvertUtil.fenToYuan(cardAmtSend, false);
+            return ConvertUtil.fenToYuan(cardAmtPay, false) + "（赠：" + ConvertUtil.fenToYuan(cardAmtSend, false) + "）";
         } else {
             return ConvertUtil.fenToYuan(cardAmtPay, false);
         }

app/src/main/java/com/xingdata/zzdpos/ui/feedback/FeedBackActivity.java

 package com.xingdata.zzdpos.ui.feedback;
 
+import android.content.Context;
 import android.databinding.DataBindingUtil;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
 
 import com.blankj.utilcode.util.KeyboardUtils;
 import com.blankj.utilcode.util.ToastUtils;
@@ -15,6 +19,7 @@ import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.databinding.ActivityFeedBackBinding;
 import com.xingdata.zzdpos.model.Feed;
 import com.xingdata.zzdpos.ui.login.LoginPresenter;
+import com.xingdata.zzdpos.util.Global;
 import com.xingdata.zzdpos.util.OnClickListener;
 
 public class FeedBackActivity extends AppCompatActivity {
@@ -38,7 +43,8 @@ public class FeedBackActivity extends AppCompatActivity {
         mFeedBackBinding.editText.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-                mFeedBackBinding.setTextSize(mFeedBackBinding.editText.getText().toString().length() + "");
+                mFeedBackBinding.setTextSize(mFeedBackBinding.editText.getText().toString()
+                        .length() + "");
             }
 
             @Override
@@ -58,7 +64,8 @@ public class FeedBackActivity extends AppCompatActivity {
                     ToastUtils.showShort("请详细描述下您遇到的问题");
                 } else {
                     Feed feed = new Feed();
-                    feed.setFeedText(mFeedBackBinding.editText.getText().toString() + "联系方式：" + mFeedBackBinding.editContactWay.getText().toString());
+                    feed.setFeedText(mFeedBackBinding.editText.getText().toString() + "联系方式：" +
+                            mFeedBackBinding.editContactWay.getText().toString());
                     feed.setOpMapId(LoginPresenter.loginReturnBean.getOpMapId());
                     feed.setOperMobile(LoginPresenter.loginReturnBean.getOperMobile());
                     feed.setFeedFlag("0");
@@ -79,6 +86,13 @@ public class FeedBackActivity extends AppCompatActivity {
                 });
     }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
+
     @Override
     protected void onPause() {
         KeyboardUtils.hideSoftInput(this);

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

 package com.xingdata.zzdpos.ui.login;
 
 import android.content.Intent;
+import android.view.MotionEvent;
 import android.view.View;
 
 import com.blankj.utilcode.util.AppUtils;
@@ -19,6 +20,7 @@ import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
 import com.xingdata.zzdpos.ui.main.MainActivity;
 import com.xingdata.zzdpos.ui.splash.SplashActivity;
+import com.xingdata.zzdpos.util.Global;
 import com.xingdata.zzdpos.view.PopupWindowDownList;
 
 import java.util.ArrayList;
@@ -318,5 +320,12 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
             loadingDialog.dismiss();
         }
     }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
 }
 

app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java

 package com.xingdata.zzdpos.ui.main;
 
 
-import android.app.Activity;
+import android.content.Context;
 import android.databinding.DataBindingUtil;
 import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
+import android.view.MotionEvent;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.Toast;
 
 import com.blankj.utilcode.util.ActivityUtils;
 import com.xingdata.zzdpos.R;
@@ -20,6 +22,7 @@ import com.xingdata.zzdpos.ui.main.dialog.HandoverDialog;
 import com.xingdata.zzdpos.ui.main.fragment.CasherFragment;
 import com.xingdata.zzdpos.ui.main.fragment.MyselfFragment;
 import com.xingdata.zzdpos.ui.main.fragment.ServiceFragment;
+import com.xingdata.zzdpos.util.Global;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,10 +36,13 @@ import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 
 
-public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> implements MainContract.View {
+public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> implements
+        MainContract.View {
     public static MainActivity mainActivity;
+    private long mExitTime;
     private int[] titleInts = {R.string.menu_cashier, R.string.menu_service, R.string.menu_myself};
-    private int[] iconList = {R.mipmap.icon_menu_cashier_1, R.mipmap.icon_menu_service_0, R.mipmap.icon_menu_myself_0};
+    private int[] iconList = {R.mipmap.icon_menu_cashier_1, R.mipmap.icon_menu_service_0, R
+            .mipmap.icon_menu_myself_0};
     private FragmentViewAdapter mFragmentPagerAdapter;
     //    private List<View> views=new ArrayList<>();
     private List<ItemMenuBottomBinding> itemMenuBottomBindings = new ArrayList<>();
@@ -75,7 +81,8 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
                 e.onNext(getLayoutInflater().inflate(R.layout.item_menu_bottom, null));
                 e.onNext(getLayoutInflater().inflate(R.layout.item_menu_bottom, null));
             }
-        }).subscribeOn(Schedulers.newThread()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer<View>() {
+        }).subscribeOn(Schedulers.newThread()).observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<View>() {
             int i = 0;
 
             @Override
@@ -84,7 +91,8 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
                 ItemMenuBottomBinding itemMenuBottomBinding = DataBindingUtil.bind(view);
                 itemMenuBottomBinding.text.setText(titleInts[i]);
                 if (i == 0) {
-                    itemMenuBottomBinding.text.setTextColor(getResources().getColor(R.color.red_guanyu));
+                    itemMenuBottomBinding.text.setTextColor(getResources().getColor(R.color
+                            .red_guanyu));
                 }
                 itemMenuBottomBinding.img.setImageResource(iconList[i]);
                 itemMenuBottomBindings.add(itemMenuBottomBinding);
@@ -102,16 +110,22 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
             public void onTabSelected(TabLayout.Tab tab) {
                 switch (tab.getPosition()) {
                     case 0:
-                        itemMenuBottomBindings.get(0).img.setImageResource(R.mipmap.icon_menu_cashier_1);
-                        itemMenuBottomBindings.get(0).text.setTextColor(getResources().getColor(R.color.red_guanyu));
+                        itemMenuBottomBindings.get(0).img.setImageResource(R.mipmap
+                                .icon_menu_cashier_1);
+                        itemMenuBottomBindings.get(0).text.setTextColor(getResources().getColor(R
+                                .color.red_guanyu));
                         break;
                     case 1:
-                        itemMenuBottomBindings.get(1).img.setImageResource(R.mipmap.icon_menu_service_1);
-                        itemMenuBottomBindings.get(1).text.setTextColor(getResources().getColor(R.color.red_guanyu));
+                        itemMenuBottomBindings.get(1).img.setImageResource(R.mipmap
+                                .icon_menu_service_1);
+                        itemMenuBottomBindings.get(1).text.setTextColor(getResources().getColor(R
+                                .color.red_guanyu));
                         break;
                     case 2:
-                        itemMenuBottomBindings.get(2).img.setImageResource(R.mipmap.icon_menu_myself_1);
-                        itemMenuBottomBindings.get(2).text.setTextColor(getResources().getColor(R.color.red_guanyu));
+                        itemMenuBottomBindings.get(2).img.setImageResource(R.mipmap
+                                .icon_menu_myself_1);
+                        itemMenuBottomBindings.get(2).text.setTextColor(getResources().getColor(R
+                                .color.red_guanyu));
                         break;
                 }
             }
@@ -120,16 +134,22 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
             public void onTabUnselected(TabLayout.Tab tab) {
                 switch (tab.getPosition()) {
                     case 0:
-                        itemMenuBottomBindings.get(0).img.setImageResource(R.mipmap.icon_menu_cashier_0);
-                        itemMenuBottomBindings.get(0).text.setTextColor(getResources().getColor(R.color.black_likui));
+                        itemMenuBottomBindings.get(0).img.setImageResource(R.mipmap
+                                .icon_menu_cashier_0);
+                        itemMenuBottomBindings.get(0).text.setTextColor(getResources().getColor(R
+                                .color.black_likui));
                         break;
                     case 1:
-                        itemMenuBottomBindings.get(1).img.setImageResource(R.mipmap.icon_menu_service_0);
-                        itemMenuBottomBindings.get(1).text.setTextColor(getResources().getColor(R.color.black_likui));
+                        itemMenuBottomBindings.get(1).img.setImageResource(R.mipmap
+                                .icon_menu_service_0);
+                        itemMenuBottomBindings.get(1).text.setTextColor(getResources().getColor(R
+                                .color.black_likui));
                         break;
                     case 2:
-                        itemMenuBottomBindings.get(2).img.setImageResource(R.mipmap.icon_menu_myself_0);
-                        itemMenuBottomBindings.get(2).text.setTextColor(getResources().getColor(R.color.black_likui));
+                        itemMenuBottomBindings.get(2).img.setImageResource(R.mipmap
+                                .icon_menu_myself_0);
+                        itemMenuBottomBindings.get(2).text.setTextColor(getResources().getColor(R
+                                .color.black_likui));
                         break;
                 }
             }
@@ -167,6 +187,17 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
 
     @Override
     public void onBackPressedSupport() {
+        if ((System.currentTimeMillis() - mExitTime) > 1500) {
+            mExitTime = System.currentTimeMillis();
+        } else {
+            mPresenter.clickHandover();
+        }
+    }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
     }
+
 }

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

 package com.xingdata.zzdpos.ui.manage.bale;
 
+import android.view.MotionEvent;
+
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
@@ -12,6 +14,7 @@ import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.model.Ussku;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.manage.bale.fragment.BaleIndexFragment;
+import com.xingdata.zzdpos.util.Global;
 
 import java.util.List;
 
@@ -122,4 +125,11 @@ public class BaleActivity extends BaseActivity<BalePresenter, ActivityBaleBindin
         }
 
     }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
 }

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

@@ -65,10 +65,12 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
         if (nowType == 1) {
             //添加
             listData.clear();
+            mViewBinding.tvTitle.setText("添加组合");
             mViewBinding.btnDismantling.setVisibility(View.GONE);
 
         } else if (nowType == 2) {
             //更新可以拆解商品
+            mViewBinding.tvTitle.setText("编辑组合");
             mViewBinding.btnDismantling.setVisibility(View.VISIBLE);
             if (ussku != null) {
                 mViewBinding.etShopMoney.setText(ConvertUtil.fenToYuan(ussku.getSkuRetailPrice1()));

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

@@ -5,6 +5,7 @@ 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;
@@ -76,5 +77,4 @@ public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleS
         Global.setFocus(mViewBinding.etKeyword, getActivity());
     }
 
-
 }

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

@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.manage.inventory;
 
 
 import android.content.Intent;
+import android.view.MotionEvent;
 
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
@@ -11,20 +12,19 @@ import com.xingdata.zzdpos.databinding.ActivityInventoryBinding;
 import com.xingdata.zzdpos.model.Cs;
 import com.xingdata.zzdpos.model.CsDetail;
 import com.xingdata.zzdpos.model.Pager;
-import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
-
 import com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryAddFragment;
 import com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryFragment;
 import com.xingdata.zzdpos.ui.manage.manageMenu.ManageDateFragment;
 import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
-
+import com.xingdata.zzdpos.util.Global;
 
 import java.util.List;
 
 
-public class InventoryActivity extends BaseActivity<InventoryPresenter, ActivityInventoryBinding> implements InventoryContract.View {
+public class InventoryActivity extends BaseActivity<InventoryPresenter, ActivityInventoryBinding>
+        implements InventoryContract.View {
     private InventoryFragment mInventoryFragment = new InventoryFragment();
     private ManageDateFragment mManageDateFragment = new ManageDateFragment();
     private InventoryAddFragment mInventoryAddFragment;
@@ -139,6 +139,13 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
             }
         }
     }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
 }
 
 

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

 package com.xingdata.zzdpos.ui.manage.otherselect;
 
-import android.text.InputType;
+import android.content.Context;
 import android.view.KeyEvent;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
 import android.widget.TextView;
 
 import com.blankj.utilcode.util.FragmentUtils;
@@ -17,10 +20,12 @@ import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.manage.otherselect.fragment.OtherDetailFragment;
 import com.xingdata.zzdpos.ui.manage.otherselect.fragment.OtherListFragment;
+import com.xingdata.zzdpos.util.Global;
 import com.xingdata.zzdpos.util.OnClickListener;
 
 
-public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter, ActivityOtherSelectBinding> implements OtherSelectContract.View {
+public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter,
+        ActivityOtherSelectBinding> implements OtherSelectContract.View {
     private OtherListFragment mOtherListFragment = new OtherListFragment();
     private OtherDetailFragment mOtherDetailFragment = new OtherDetailFragment();
     LoadingDialog mLoadingDialog = new LoadingDialog();
@@ -36,7 +41,8 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter, Acti
         mViewBinding.lyTitle.edTitle.setVisibility(View.GONE);
         mViewBinding.lyTitle.tvTitle.setText("邻库查询");
         mViewBinding.lyTitle.tvTitle.setVisibility(View.VISIBLE);
-        FragmentUtils.add(getSupportFragmentManager(), mOtherListFragment, mViewBinding.fragmentContainer.getId(), false, true);
+        FragmentUtils.add(getSupportFragmentManager(), mOtherListFragment, mViewBinding
+                .fragmentContainer.getId(), false, true);
 
         mViewBinding.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
@@ -88,7 +94,8 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter, Acti
     @Override
     public void showOsskuDetail(Ossku ossku) {
         mOtherDetailFragment.setOssku(ossku);
-        FragmentUtils.add(getSupportFragmentManager(), mOtherDetailFragment, mViewBinding.fragmentContainer.getId(), false, true);
+        FragmentUtils.add(getSupportFragmentManager(), mOtherDetailFragment, mViewBinding
+                .fragmentContainer.getId(), false, true);
     }
 
     @Override
@@ -108,4 +115,11 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter, Acti
 
 
     }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
 }

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

 package com.xingdata.zzdpos.ui.manage.replenishment;
 
 
+import android.view.MotionEvent;
+
 import com.blankj.utilcode.util.KeyboardUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityReplenishmentBinding;
-import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Psb;
 import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
-
 import com.xingdata.zzdpos.ui.manage.replenishment.fragment.ReplenishmentDetailFragment;
 import com.xingdata.zzdpos.ui.manage.replenishment.fragment.ReplenishmentFragment;
+import com.xingdata.zzdpos.util.Global;
 
 import java.util.List;
 
-public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter, ActivityReplenishmentBinding> implements ReplenishmentContract.View {
+public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
+        ActivityReplenishmentBinding> implements ReplenishmentContract.View {
     private ReplenishmentFragment mReplenishmentFragment = new ReplenishmentFragment();
-        private ReplenishmentDetailFragment mReplenishmentDetailFragment = new ReplenishmentDetailFragment();
+    private ReplenishmentDetailFragment mReplenishmentDetailFragment = new
+            ReplenishmentDetailFragment();
     private boolean isAllowFragment = true;
     LoadingDialog mLoadingDialog = new LoadingDialog();
 
@@ -41,10 +44,10 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
 
     @Override
     public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C) {
-        if (mReplenishmentFragment.isAdded()){
-            mReplenishmentFragment.showReplenishmentList(A, B, C,false);
-        }else {
-            mReplenishmentFragment.showReplenishmentList(A, B, C,true);
+        if (mReplenishmentFragment.isAdded()) {
+            mReplenishmentFragment.showReplenishmentList(A, B, C, false);
+        } else {
+            mReplenishmentFragment.showReplenishmentList(A, B, C, true);
             loadRootFragment(R.id.f_bottom, mReplenishmentFragment, true, false);
         }
 
@@ -92,5 +95,10 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
         isAllowFragment = is;
     }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
 
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java

 package com.xingdata.zzdpos.ui.manage.sssku;
 
+import android.view.MotionEvent;
 import android.view.inputmethod.EditorInfo;
 
 import com.blankj.utilcode.util.ActivityUtils;
@@ -23,10 +24,12 @@ import com.xingdata.zzdpos.ui.manage.sssku.fragment.PriceFragment;
 import com.xingdata.zzdpos.ui.manage.sssku.fragment.SearchFragment;
 import com.xingdata.zzdpos.ui.manage.sssku.fragment.SkugrpFragment;
 import com.xingdata.zzdpos.ui.manage.sssku.fragment.VipFragment;
+import com.xingdata.zzdpos.util.Global;
 
 import java.util.List;
 
-public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBinding> implements SsskuContract.View {
+public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBinding> implements
+        SsskuContract.View {
 
     private ManagerFragment mManagerFragment = new ManagerFragment();
     private SearchFragment mSearchFragment = new SearchFragment();
@@ -276,4 +279,11 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
         mViewBinding.etSearch.setText("");
         mViewBinding.clTitle.requestFocus();
     }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserActivity.java

 package com.xingdata.zzdpos.ui.manage.user;
 
-import android.os.Bundle;
-import android.view.View;
+import android.view.MotionEvent;
 
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityUserBinding;
-import com.xingdata.zzdpos.databinding.ActivityVipBinding;
-import com.xingdata.zzdpos.model.Level;
-import com.xingdata.zzdpos.model.Mscard;
 import com.xingdata.zzdpos.model.Oper;
 import com.xingdata.zzdpos.model.Pager;
-import com.xingdata.zzdpos.model.Pay;
-import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Sta;
-import com.xingdata.zzdpos.model.Ticket;
-import com.xingdata.zzdpos.model.Trule;
-import com.xingdata.zzdpos.model.Vip;
-import com.xingdata.zzdpos.model.VipRechargeOrder;
-import com.xingdata.zzdpos.ui.dialog.PromptDialog;
-import com.xingdata.zzdpos.ui.manage.user.fragment.UserListFragment;
-import com.xingdata.zzdpos.ui.vip.VipContract;
-import com.xingdata.zzdpos.ui.vip.VipPresenter;
-import com.xingdata.zzdpos.view.ViewTools;
+import com.xingdata.zzdpos.util.Global;
 
-import java.util.List;
-
-public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBinding> implements UserContract.View {
+public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBinding> implements
+        UserContract.View {
 
     @Override
     public int getLayoutId() {
@@ -64,4 +49,11 @@ public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBindin
         mPresenter.userInfoFragment.pop();
         mPresenter.userListFragment.delUserSus();
     }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/IntegralActivity.java

 package com.xingdata.zzdpos.ui.marketing.integral;
 
 import android.support.annotation.Nullable;
+import android.view.MotionEvent;
 import android.view.View;
 
-import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
@@ -16,7 +16,7 @@ import com.xingdata.zzdpos.model.Ubound;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.dialog.PromptDialog;
 import com.xingdata.zzdpos.ui.marketing.integral.fragment.IntegralIndexFragment;
-import com.xingdata.zzdpos.util.OnClickListener;
+import com.xingdata.zzdpos.util.Global;
 
 import java.util.List;
 
@@ -88,4 +88,10 @@ public class IntegralActivity extends BaseActivity<IntegralPresenter, ActivityIn
         mPresenter.exchangeQuery(loadingDialog);
     }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralGetFragment.java

 package com.xingdata.zzdpos.ui.marketing.integral.fragment;
 
+import android.text.Editable;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bigkoo.pickerview.OptionsPickerView;
 import com.bigkoo.pickerview.listener.CustomListener;
+import com.blankj.utilcode.util.KeyboardUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.App;
@@ -177,6 +180,9 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
         if (loadingDialog != null) {
             loadingDialog.dismiss();
         }
+        mViewBinding.etIntegralTimeLimit.addTextChangedListener(textWatcher);
+        mViewBinding.etIntegralCategoryTimeLimit.addTextChangedListener(textWatcher);
+        mViewBinding.etShopTimeLimit.addTextChangedListener(textWatcher);
     }
 
     private void setShopTypeClick(Boolean b) {
@@ -230,7 +236,6 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
                         mViewBinding.etIntegralTimeLimit.setText(ShowGbound.getBoundExp() + "");
                     }
 
-
                 }
                 break;
                 case 1: {
@@ -528,6 +533,27 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
     public void setNowType(int nowType) {
         this.nowType = nowType;
     }
+
+    TextWatcher textWatcher = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+        }
+
+        @Override
+        public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+        }
+
+        @Override
+        public void afterTextChanged(Editable editable) {
+            String tempStr = editable.toString();
+            int len = tempStr.length();
+            if (len >= 1 && tempStr.startsWith("0")) {
+                editable.replace(0, 1, "");
+            }
+        }
+    };
 //
 //    /**
 //     * 显示软键盘，Dialog使用

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsActivity.java

 package com.xingdata.zzdpos.ui.marketing.ms;
 
 
+import android.content.Context;
+import android.view.MotionEvent;
+import android.view.View;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
 
 import com.blankj.utilcode.util.KeyboardUtils;
 import com.blankj.utilcode.util.ToastUtils;
@@ -21,10 +26,12 @@ import com.xingdata.zzdpos.ui.marketing.ms.model.Area;
 import com.xingdata.zzdpos.ui.marketing.ms.model.Group;
 import com.xingdata.zzdpos.ui.marketing.ms.model.Type;
 import com.xingdata.zzdpos.ui.marketing.ms.model.User;
+import com.xingdata.zzdpos.util.Global;
 
 import java.util.List;
 
-public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, ActivityMsBinding> implements MsContract.View<Sku> {
+public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, ActivityMsBinding>
+        implements MsContract.View<Sku> {
 
     private ManagerFragment mManagerFragment = new ManagerFragment();
     private EditorFragment mEditorFragment = new EditorFragment();
@@ -182,4 +189,9 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
         }
     }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/RechargeRuleActivity.java

 package com.xingdata.zzdpos.ui.marketing.recharge;
 
+import android.content.Context;
 import android.os.Bundle;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
 
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityVipLevelBinding;
 import com.xingdata.zzdpos.model.Mscard;
 import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.util.Global;
 
 public class RechargeRuleActivity extends BaseActivity<RechargeRulePresenter, ActivityVipLevelBinding> implements RechargeRuleContract.View {
     private Bundle mBundle;
@@ -35,6 +41,11 @@ public class RechargeRuleActivity extends BaseActivity<RechargeRulePresenter, Ac
         mPresenter.mscardQuery();
 
     }
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
 
 
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/ReturnTicketActivity.java

 package com.xingdata.zzdpos.ui.marketing.ticket;
 
+import android.content.Context;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
@@ -8,6 +14,7 @@ import com.xingdata.zzdpos.databinding.ActivityReturnTicketBinding;
 import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Trule;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
+import com.xingdata.zzdpos.util.Global;
 
 public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
         ActivityReturnTicketBinding>
@@ -68,4 +75,11 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
             loadingDialog.dismiss();
         }
     }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/LevelActivity.java

 package com.xingdata.zzdpos.ui.marketing.viplevel;
 
 import android.os.Bundle;
-import android.view.View;
+import android.view.MotionEvent;
 
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
-import com.xingdata.zzdpos.databinding.ActivityVipBinding;
 import com.xingdata.zzdpos.databinding.ActivityVipLevelBinding;
 import com.xingdata.zzdpos.model.Level;
-import com.xingdata.zzdpos.model.Mscard;
 import com.xingdata.zzdpos.model.Pager;
-import com.xingdata.zzdpos.model.Pay;
-import com.xingdata.zzdpos.model.Saleorder;
-import com.xingdata.zzdpos.model.Sta;
-import com.xingdata.zzdpos.model.Ticket;
-import com.xingdata.zzdpos.model.Trule;
-import com.xingdata.zzdpos.model.Vip;
-import com.xingdata.zzdpos.model.VipRechargeOrder;
-import com.xingdata.zzdpos.ui.dialog.PromptDialog;
-import com.xingdata.zzdpos.ui.vip.VipContract;
-import com.xingdata.zzdpos.ui.vip.VipPresenter;
-import com.xingdata.zzdpos.view.ViewTools;
-
-import java.util.List;
-
-public class LevelActivity extends BaseActivity<LevelPresenter, ActivityVipLevelBinding> implements LevelContract.View {
+import com.xingdata.zzdpos.util.Global;
+
+public class LevelActivity extends BaseActivity<LevelPresenter, ActivityVipLevelBinding>
+        implements LevelContract.View {
     private Bundle mBundle;
 
     @Override
@@ -47,8 +34,13 @@ public class LevelActivity extends BaseActivity<LevelPresenter, ActivityVipLevel
     @Override
     public void updateVipLevelSus(Level level) {
         mPresenter.vipLevelEditFragment.pop();
-        mPresenter.getVipLevel(0,200);
+        mPresenter.getVipLevel(0, 200);
     }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
 
 }

app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentActivity.java

 package com.xingdata.zzdpos.ui.payment;
 
 import android.content.Intent;
+import android.view.MotionEvent;
 
 import com.blankj.utilcode.util.ActivityUtils;
 import com.xingdata.zzdpos.C;
@@ -9,8 +10,10 @@ import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityPaymentBinding;
 import com.xingdata.zzdpos.ui.payment.fragment.PaymentFragment;
 import com.xingdata.zzdpos.ui.settle.SettleActivity;
+import com.xingdata.zzdpos.util.Global;
 
-public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaymentBinding> implements PaymentContract.View {
+public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaymentBinding>
+        implements PaymentContract.View {
 
     private PaymentFragment mPaymentFragment = new PaymentFragment();
 
@@ -33,4 +36,10 @@ public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaym
         intent.putExtra(C.EXTRA_KEY.SETTLE_EXTRA, amt);
         ActivityUtils.startActivity(intent);
     }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTicketActivity.java

 package com.xingdata.zzdpos.ui.sendticke;
 
+import android.view.MotionEvent;
+
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
@@ -11,6 +13,7 @@ import com.xingdata.zzdpos.model.Trule;
 import com.xingdata.zzdpos.model.Vip;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerIndexFragment;
+import com.xingdata.zzdpos.util.Global;
 
 import java.util.List;
 
@@ -84,4 +87,11 @@ public class SendTicketActivity extends BaseActivity<SendTicketPresenter,
             loadingDialog.dismiss();
         }
     }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java

@@ -120,10 +120,13 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                                         null, tickerId,
                                         loadingDialog);
                             }
-
                         }
-
                     }
+                    case R.id.cl_all:{
+                        mViewBinding.llAllVipGroup.setVisibility(View.VISIBLE);
+                        mViewBinding.clAll.setVisibility(View.GONE);
+                    }
+                    break;
 
                 }
             }
@@ -136,6 +139,9 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                 levelList.get(nowVipGroupId).setSelect(true);
                 vipGroupAdapter.notifyDataSetChanged();
                 mViewBinding.tvSelect.setText(levelList.get(position).getVipLevelName());
+                mViewBinding.tvVipGroupName.setText(levelList.get(position).getVipLevelName());
+                mViewBinding.llAllVipGroup.setVisibility(View.GONE);
+                mViewBinding.clAll.setVisibility(View.VISIBLE);
             }
         });
         returnTicketAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java

 package com.xingdata.zzdpos.ui.settle;
 
+import android.view.MotionEvent;
 import android.view.inputmethod.EditorInfo;
 
 import com.blankj.utilcode.util.ActivityUtils;
@@ -24,11 +25,13 @@ import com.xingdata.zzdpos.ui.settle.fragment.PayResultFragment;
 import com.xingdata.zzdpos.ui.settle.fragment.SettleFragment;
 import com.xingdata.zzdpos.ui.settle.fragment.TicketFragment;
 import com.xingdata.zzdpos.ui.settle.fragment.VipFragment;
+import com.xingdata.zzdpos.util.Global;
 
 import java.util.List;
 
 
-public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettleBinding> implements SettleContract.View {
+public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettleBinding>
+        implements SettleContract.View {
 
     private SettleFragment mSettleFragment = new SettleFragment();
 
@@ -224,4 +227,10 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
         }
     }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/splash/SplashActivity.java

@@ -12,6 +12,7 @@ import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivitySplashBinding;
 import com.xingdata.zzdpos.ui.splash.dialog.UpgradeDialog;
+import com.xingdata.zzdpos.util.SystemUtil;
 
 
 public class SplashActivity extends BaseActivity<com.xingdata.zzdpos.ui.splash.SplashPresenter, ActivitySplashBinding>
@@ -29,6 +30,7 @@ public class SplashActivity extends BaseActivity<com.xingdata.zzdpos.ui.splash.S
     @Override
     public void initView() {
 //        mPresenter.init();
+        mViewBinding.setVersion("V"+SystemUtil.getVersionName());
         mPresenter.checkUpdate();
         FadingCircle doubleBounce = new FadingCircle();
         mViewBinding.spinKit.setIndeterminateDrawable(doubleBounce);

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsActivity.java

 package com.xingdata.zzdpos.ui.statistics;
 
 
-import android.content.Intent;
-import android.os.Bundle;
 import android.view.KeyEvent;
+import android.view.MotionEvent;
 
-import com.alibaba.fastjson.JSON;
-import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.FragmentUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
@@ -14,6 +11,7 @@ import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityStatisticsBinding;
 import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.model.Smt;
 import com.xingdata.zzdpos.model.Sta;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
@@ -21,13 +19,16 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsDateFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsTitleFragment;
+import com.xingdata.zzdpos.util.Global;
 
 
-public class StatisticsActivity extends BaseActivity<StatisticsPresenter, ActivityStatisticsBinding> implements StatisticsContract.View {
+public class StatisticsActivity extends BaseActivity<StatisticsPresenter,
+        ActivityStatisticsBinding> implements StatisticsContract.View {
     private StatisticsDateFragment mStatisticsDateFragment = new StatisticsDateFragment();
     private StatisticsFragment mStatisticsFragment = new StatisticsFragment();
     private StatisticsTitleFragment mStatisticsTitleFragment = new StatisticsTitleFragment();
     LoadingDialog mLoadingDialog = new LoadingDialog();
+
     @Override
     public int getLayoutId() {
         return R.layout.activity_statistics;
@@ -35,7 +36,8 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
 
     @Override
     public void initView() {
-        FragmentUtils.add(getSupportFragmentManager(), mStatisticsFragment, mViewBinding.fragmentContainer.getId(), false, true);
+        FragmentUtils.add(getSupportFragmentManager(), mStatisticsFragment, mViewBinding
+                .fragmentContainer.getId(), false, true);
 
     }
 
@@ -47,13 +49,15 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
     @Override
     public void showOrderListFragment() {
         mStatisticsTitleFragment.setTitle(C.MENU.MENU_STATISTICS_ORDER);
-        FragmentUtils.add(getSupportFragmentManager(), mStatisticsTitleFragment, mViewBinding.fragmentContainer.getId(), false, true);
+        FragmentUtils.add(getSupportFragmentManager(), mStatisticsTitleFragment, mViewBinding
+                .fragmentContainer.getId(), false, true);
     }
 
     @Override
     public void showMStFragment() {
         mStatisticsTitleFragment.setTitle(C.MENU.MENU_STATISTICS_MS);
-        FragmentUtils.add(getSupportFragmentManager(), mStatisticsTitleFragment, mViewBinding.fragmentContainer.getId(), false, true);
+        FragmentUtils.add(getSupportFragmentManager(), mStatisticsTitleFragment, mViewBinding
+                .fragmentContainer.getId(), false, true);
     }
 
     @Override
@@ -74,25 +78,27 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
     @Override
     public void searchSuc(Pager<Saleorder> saleorderPager, long start, long end) {
         mStatisticsDateFragment.pop();
-        mStatisticsTitleFragment.searchSuc(saleorderPager, start,end);
+        mStatisticsTitleFragment.searchSuc(saleorderPager, start, end);
     }
 
     @Override
-    public void searchRechargeSuc(Pager<VipRechargeOrder> vipRechargeOrderPager, long start, long end) {
+    public void searchRechargeSuc(Pager<VipRechargeOrder> vipRechargeOrderPager, long start, long
+            end) {
         mStatisticsDateFragment.pop();
-        mStatisticsTitleFragment.searchRechargeSuc(vipRechargeOrderPager, start,end);
+        mStatisticsTitleFragment.searchRechargeSuc(vipRechargeOrderPager, start, end);
     }
 
     @Override
     public void searchTicketSuc(Pager<Ticket> ticketPager, long start, long end) {
         mStatisticsDateFragment.pop();
-        mStatisticsTitleFragment.searchTicketSuc(ticketPager, start,end);
+        mStatisticsTitleFragment.searchTicketSuc(ticketPager, start, end);
     }
 
     @Override
     public void showDateFragment(Integer integer) {
         mStatisticsDateFragment.setSearchType(integer);
-        FragmentUtils.add(getSupportFragmentManager(), mStatisticsDateFragment, mViewBinding.fragmentContainer.getId(), false, true);
+        FragmentUtils.add(getSupportFragmentManager(), mStatisticsDateFragment, mViewBinding
+                .fragmentContainer.getId(), false, true);
     }
 
 
@@ -107,9 +113,15 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
         }
     }
 
+    @Override
+    public void getSmtListSucc(Pager<Smt> smtPager) {
+        mStatisticsTitleFragment.getSmtListSucc(smtPager);
+    }
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-//        if (event.getKeyCode() == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
+//        if (event.getKeyCode() == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent
+// .ACTION_DOWN) {
 //            if (getSupportFragmentManager().getBackStackEntryCount() > 1) {
 //                getSupportFragmentManager().popBackStack();
 //            }
@@ -117,4 +129,10 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
         return super.onKeyDown(keyCode, event);
     }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsContract.java

@@ -6,6 +6,7 @@ import com.xingdata.zzdpos.base.BasePresenter;
 import com.xingdata.zzdpos.base.BaseView;
 import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.model.Smt;
 import com.xingdata.zzdpos.model.Sta;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
@@ -22,6 +23,7 @@ public interface StatisticsContract {
 
     interface View extends BaseView {
         void isShowLoading(Boolean is);
+         void getSmtListSucc(Pager<Smt> smtPager);
         /**
          * 设置统计信息
          */
@@ -51,6 +53,7 @@ public interface StatisticsContract {
          * 搜索成功
          */
         void searchSuc(Pager<Saleorder> saleorderPager, int payType);
+
         /**
          * 日期搜索成功
          */
@@ -65,6 +68,7 @@ public interface StatisticsContract {
          * 日期搜索成功
          */
         void searchTicketSuc(Pager<Ticket> ticketPager, long start, long end);
+
         /**
          * 展示日期警告
          */
@@ -78,6 +82,9 @@ public interface StatisticsContract {
          */
         public abstract void clickDate(Integer integer);
 
+
+
+
         /**
          * 跳转营销页
          */
@@ -93,6 +100,10 @@ public interface StatisticsContract {
          */
         public abstract void getRechargeList(int pageNumber, RechargeListFragment msListFragment);
 
+        /**
+         * 获取月份统计的列表
+         */
+        public abstract void getSmtList();
 
         /**
          * 获取充值列表
@@ -108,7 +119,8 @@ public interface StatisticsContract {
         /**
          * 获取已用优惠券列表
          */
-        public abstract void getTicketList(int pageNumber,long startDate, long endDate);
+        public abstract void getTicketList(int pageNumber, long startDate, long endDate);
+
         /**
          * 获取订单列表
          */
@@ -123,6 +135,7 @@ public interface StatisticsContract {
          * 搜索订单列表
          */
         public abstract void getSaleOrderList(int pageNumber, int payType);
+
         /**
          * 搜索日期订单列表
          */

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java

@@ -2,19 +2,19 @@ package com.xingdata.zzdpos.ui.statistics;
 
 
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.databinding.DataBindingUtil;
 import android.graphics.Paint;
 import android.support.v7.widget.LinearLayoutManager;
-import android.util.TimeUtils;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
 
-import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.ToastUtils;
-import com.google.gson.Gson;
 import com.xingdata.api.print.ZX_PrintPOS;
-import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityStatisticsDetailBinding;
@@ -26,20 +26,18 @@ import com.xingdata.zzdpos.databinding.ViewVipRechargeBinding;
 import com.xingdata.zzdpos.model.Cs;
 import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
-import com.xingdata.zzdpos.model.Salepay;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.main.MainActivity;
 import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryDetailAdapter;
 import com.xingdata.zzdpos.util.ConvertUtil;
+import com.xingdata.zzdpos.util.Global;
 import com.xingdata.zzdpos.util.OnClickListener;
 
-import java.util.ArrayList;
-import java.util.List;
 
-
-public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPresenter, ActivityStatisticsDetailBinding> implements StatisticsDetailContract.View {
+public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPresenter,
+        ActivityStatisticsDetailBinding> implements StatisticsDetailContract.View {
 
     LoadingDialog mLoadingDialog = new LoadingDialog();
 
@@ -64,7 +62,8 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
     private void initData() {
         if (getIntent().getExtras() != null) {
             Long data = getIntent().getLongExtra(Saleorder.class.getName(), -1);
-            VipRechargeOrder vipRechargeOrder = (VipRechargeOrder) getIntent().getSerializableExtra(VipRechargeOrder.class.getName());
+            VipRechargeOrder vipRechargeOrder = (VipRechargeOrder) getIntent()
+                    .getSerializableExtra(VipRechargeOrder.class.getName());
             Ticket ticket = (Ticket) getIntent().getSerializableExtra(Ticket.class.getName());
             Cs cs = (Cs) getIntent().getSerializableExtra(Cs.class.getName());
             if (data > 0) {
@@ -95,9 +94,11 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
     private void getTicketSuss(Ticket ticket) {
         mViewBinding.llBottom.setVisibility(View.GONE);
         mViewBinding.viewTicket.getViewStub().inflate();
-        ViewTicketBinding viewTicketBinding = DataBindingUtil.bind(mViewBinding.viewTicket.getRoot());
+        ViewTicketBinding viewTicketBinding = DataBindingUtil.bind(mViewBinding.viewTicket
+                .getRoot());
         viewTicketBinding.tvAmt.setText(ConvertUtil.fenToYuan(ticket.getTicketValAmt(), true));
-        viewTicketBinding.setDate(com.blankj.utilcode.util.TimeUtils.date2String(ticket.getUpdateTime()));
+        viewTicketBinding.setDate(com.blankj.utilcode.util.TimeUtils.date2String(ticket
+                .getUpdateTime()));
         viewTicketBinding.setOrderNo(ticket.getUseOrderNo());
         viewTicketBinding.setVipName(ticket.getVipName());
 
@@ -106,14 +107,18 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
 
     private void getCsSuss(Cs cs) {
         mViewBinding.viewCs.getViewStub().inflate();
-        ViewInventoryDetailBinding viewInventoryDetailBinding = DataBindingUtil.bind(mViewBinding.viewCs.getRoot());
-        viewInventoryDetailBinding.replenishmentLeftRecycler.setLayoutManager(new LinearLayoutManager(this));
-        InventoryDetailAdapter mInventoryDetailAdapter = new InventoryDetailAdapter(cs.getCsdetailList());
+        ViewInventoryDetailBinding viewInventoryDetailBinding = DataBindingUtil.bind(mViewBinding
+                .viewCs.getRoot());
+        viewInventoryDetailBinding.replenishmentLeftRecycler.setLayoutManager(new
+                LinearLayoutManager(this));
+        InventoryDetailAdapter mInventoryDetailAdapter = new InventoryDetailAdapter(cs
+                .getCsdetailList());
         viewInventoryDetailBinding.replenishmentLeftRecycler.setAdapter(mInventoryDetailAdapter);
         mViewBinding.btnPrint.setText("取消");
         mViewBinding.btnReturn.setText("打印清单");
         viewInventoryDetailBinding.setOperName(cs.getOperName());
-        viewInventoryDetailBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(cs.getCreateTime()));
+        viewInventoryDetailBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(cs
+                .getCreateTime()));
         viewInventoryDetailBinding.setSumNum(cs.getCount() + "");
         switch (cs.getCsResultFlag()) {
             case 0:
@@ -144,14 +149,19 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
     private void getVipRechargeOrderSuss(VipRechargeOrder vipRechargeOrder) {
         mViewBinding.btnReturn.setVisibility(View.GONE);
         mViewBinding.viewVipRecharge.getViewStub().inflate();
-        ViewVipRechargeBinding viewVipRechargeBinding = DataBindingUtil.bind(mViewBinding.viewVipRecharge.getRoot());
-        viewVipRechargeBinding.tvAmt.setText(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtPay() + vipRechargeOrder.getCardAmtSend(), true));
-        viewVipRechargeBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(vipRechargeOrder.getCreateTime()));
+        ViewVipRechargeBinding viewVipRechargeBinding = DataBindingUtil.bind(mViewBinding
+                .viewVipRecharge.getRoot());
+        viewVipRechargeBinding.tvAmt.setText(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtPay
+                () + vipRechargeOrder.getCardAmtSend(), true));
+        viewVipRechargeBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String
+                (vipRechargeOrder.getCreateTime()));
         viewVipRechargeBinding.setCardNo(vipRechargeOrder.getCardNo());
         viewVipRechargeBinding.setVipName(vipRechargeOrder.getVipName());
         viewVipRechargeBinding.setVipTel(vipRechargeOrder.getVipMobile());
-        viewVipRechargeBinding.setPayAmt(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtPay(), false));
-        viewVipRechargeBinding.setSendAmt(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtSend(), false));
+        viewVipRechargeBinding.setPayAmt(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtPay(),
+                false));
+        viewVipRechargeBinding.setSendAmt(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtSend()
+                , false));
     }
 
     @Override
@@ -168,20 +178,27 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
     @Override
     public void getOrderDetailSuss(Saleorder mSaleorder) {
         mViewBinding.viewOrderDetail.getViewStub().inflate();
-        ViewOrderDetailBinding viewOrderDetailBinding = DataBindingUtil.bind(mViewBinding.viewOrderDetail.getRoot());
+        ViewOrderDetailBinding viewOrderDetailBinding = DataBindingUtil.bind(mViewBinding
+                .viewOrderDetail.getRoot());
         switch (mSaleorder.getOrderStatus()) {
             case 9:
                 viewOrderDetailBinding.tvAmtHint.setText("退货金额");
-                viewOrderDetailBinding.setPayType(mSaleorder.getSalepay() == null ? "退货" : mSaleorder.getSalepay().getPayName());
+                viewOrderDetailBinding.setPayType(mSaleorder.getSalepay() == null ? "退货" :
+                        mSaleorder.getSalepay().getPayName());
                 break;
             default:
-                viewOrderDetailBinding.setPayType(mSaleorder.getSalepay() == null ? "未支付" : mSaleorder.getSalepay().getPayName());
+                viewOrderDetailBinding.setPayType(mSaleorder.getSalepay() == null ? "未支付" :
+                        mSaleorder.getSalepay().getPayName());
         }
-        viewOrderDetailBinding.tvAmt.setText(ConvertUtil.fenToYuan(mSaleorder.getOrderPayAmt(), true));
-        viewOrderDetailBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(mSaleorder.getCreateTime()));
+        viewOrderDetailBinding.tvAmt.setText(ConvertUtil.fenToYuan(mSaleorder.getOrderPayAmt(),
+                true));
+        viewOrderDetailBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String
+                (mSaleorder.getCreateTime()));
         viewOrderDetailBinding.setOrderNo(mSaleorder.getOrderNo());
-        viewOrderDetailBinding.setDisAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderReduAmt(), false));
-        viewOrderDetailBinding.setSumAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderAuthAmt(), false));
+        viewOrderDetailBinding.setDisAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderReduAmt(),
+                false));
+        viewOrderDetailBinding.setSumAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderAuthAmt(),
+                false));
         viewOrderDetailBinding.setOperName(mSaleorder.getOperName());
         viewOrderDetailBinding.setGoodsNum(mSaleorder.getOrderCnt() + "");
 
@@ -197,18 +214,23 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
 
 
             for (Saledetail saledetail : mSaleorder.getSaledetailList()) {
-                View view = LayoutInflater.from(this).inflate(R.layout.item_settle_saledetail, null);
+                View view = LayoutInflater.from(this).inflate(R.layout.item_settle_saledetail,
+                        null);
                 view.setPadding(20, 20, 20, 20);
-                ItemSettleSaledetailBinding itemSettleSaledetailBinding = DataBindingUtil.bind(view);
+                ItemSettleSaledetailBinding itemSettleSaledetailBinding = DataBindingUtil.bind
+                        (view);
                 itemSettleSaledetailBinding.tvAmt.setText("￥" + saledetail.getSubtotal());
                 itemSettleSaledetailBinding.tvCount.setText(saledetail.getCnt());
                 itemSettleSaledetailBinding.tvPrice.setText("￥" + saledetail.getPrice());
                 itemSettleSaledetailBinding.tvName.setText(saledetail.getName());
 
                 if (saledetail.isDiscount()) {
-                    itemSettleSaledetailBinding.tvInitialPrice.setText(ConvertUtil.fenToYuan(saledetail.getSkuPrice(), true));
+                    itemSettleSaledetailBinding.tvInitialPrice.setText(ConvertUtil.fenToYuan
+                            (saledetail.getSkuPrice(), true));
                     itemSettleSaledetailBinding.tvInitialPrice.setVisibility(View.VISIBLE);
-                    itemSettleSaledetailBinding.tvInitialPrice.setPaintFlags(itemSettleSaledetailBinding.tvInitialPrice.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+                    itemSettleSaledetailBinding.tvInitialPrice.setPaintFlags
+                            (itemSettleSaledetailBinding.tvInitialPrice.getPaintFlags() | Paint
+                                    .STRIKE_THRU_TEXT_FLAG);
                 } else {
                     itemSettleSaledetailBinding.tvInitialPrice.setVisibility(View.GONE);
                 }
@@ -217,7 +239,8 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
             }
 
             viewOrderDetailBinding.tvGoodslistTitle.setOnClickListener(view -> {
-                viewOrderDetailBinding.tvGoodslistTitle.setCompoundDrawables(null, null, null, null);
+                viewOrderDetailBinding.tvGoodslistTitle.setCompoundDrawables(null, null, null,
+                        null);
                 viewOrderDetailBinding.tvGoodslistTitle.setClickable(false);
                 viewOrderDetailBinding.llGoodsList.setVisibility(View.VISIBLE);
             });
@@ -225,7 +248,9 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
             mViewBinding.btnReturn.setOnClickListener(new OnClickListener() {
                 @Override
                 protected void myOnClickListener(View v) {
-                    new AlertDialog.Builder(StatisticsDetailActivity.this).setTitle("确认退货").setNegativeButton("取消", null).setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                    new AlertDialog.Builder(StatisticsDetailActivity.this).setTitle("确认退货")
+                            .setNegativeButton("取消", null).setPositiveButton("确认", new
+                            DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialogInterface, int i) {
                             mPresenter.returnOrder(mSaleorder.getOrderNo() + "");
@@ -255,4 +280,11 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
     public void returnOrderSuss() {
         finish();
     }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java

@@ -75,7 +75,7 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
     @Override
     public void getRechargeList(int pageNumber, RechargeListFragment msListFragment) {
         mView.isShowLoading(true);
-        ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize).doFinally(()-> mView.isShowLoading(false))
+        ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(vipRechargeOrderPager -> {
                     msListFragment.setData(vipRechargeOrderPager);
                 }, throwable -> {
@@ -83,10 +83,21 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
                 });
     }
 
+    @Override
+    public void getSmtList() {
+        mView.isShowLoading(true);
+        ApiFactory.Smt.queryAll(1, 12).doFinally(() -> mView.isShowLoading(false))
+                .subscribe(smtPager -> {
+                   mView.getSmtListSucc(smtPager);
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+    }
+
     @Override
     public void getRechargeList(int pageNumber, long startDate, long endDate) {
         mView.isShowLoading(true);
-        ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize, startDate, endDate).doFinally(()-> mView.isShowLoading(false))
+        ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize, startDate, endDate).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(vipRechargeOrderPager -> {
                     //判断是否能加载更多
                     if (vipRechargeOrderPager.getList() == null || vipRechargeOrderPager.getList().size() == 0) {
@@ -102,7 +113,7 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
     @Override
     public void getTicketList(int pageNumber, UsedTicketListFragment msListFragment) {
         mView.isShowLoading(true);
-        ApiFactory.Ticket.query(pageNumber, nowPageSize, 2).doFinally(()-> mView.isShowLoading(false))
+        ApiFactory.Ticket.query(pageNumber, nowPageSize, 2).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(ticketPager -> {
                     msListFragment.setData(ticketPager);
                 }, throwable -> {
@@ -113,7 +124,7 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
     @Override
     public void getTicketList(int pageNumber, long startDate, long endDate) {
         mView.isShowLoading(true);
-        ApiFactory.Ticket.query(pageNumber, nowPageSize, 2, startDate, endDate).doFinally(()-> mView.isShowLoading(false))
+        ApiFactory.Ticket.query(pageNumber, nowPageSize, 2, startDate, endDate).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(ticketPager -> {
                     if (ticketPager.getList() == null || ticketPager.getList().size() == 0) {
                         ToastUtils.showShort("没有查询到相关优惠券");
@@ -131,7 +142,7 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
     @Override
     public void getSaleOrderList(int pageNumber, String wd) {
         mView.isShowLoading(true);
-        ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", null, wd).doFinally(()-> mView.isShowLoading(false))
+        ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", null, wd).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(saleorderPager -> {
                     //判断是否能加载更多
                     if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
@@ -152,7 +163,7 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
     @Override
     public void getSaleOrderList(int pageNumber, int payType) {
         mView.isShowLoading(true);
-        ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", payType).doFinally(()-> mView.isShowLoading(false))
+        ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", payType).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(saleorderPager -> {
                     //判断是否能加载更多
                     if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
@@ -170,7 +181,7 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
     @Override
     public void getSaleOrderList(int pageNumber, long startDate, long endDate) {
         mView.isShowLoading(true);
-        ApiFactory.Test.getSaleOrderList("99", pageNumber, nowPageSize, startDate, endDate).doFinally(()-> mView.isShowLoading(false))
+        ApiFactory.Test.getSaleOrderList("99", pageNumber, nowPageSize, startDate, endDate).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(saleorderPager -> {
                     //判断是否能加载更多
                     if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {

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

@@ -13,6 +13,7 @@ import com.xingdata.zzdpos.databinding.FragmentStatisticsTitleBinding;
 import com.xingdata.zzdpos.databinding.ViewSearchPaytypeBinding;
 import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.model.Smt;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
 import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
@@ -244,4 +245,8 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
         return false;
 
     }
+
+    public void getSmtListSucc(Pager<Smt> smtPager) {
+             mOrderMainFragment.getSmtListSucc(smtPager);
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/RechargeListFragment.java

@@ -45,15 +45,11 @@ public class RechargeListFragment extends BaseFragment<StatisticsPresenter, Frag
 
 
         mViewBinding.tvEmpty.setText(R.string.statistics_search_empty_recharge);
-        if (mStatisticsGroupAdapter == null) {
+
             mStatisticsGroupAdapter = new StatisticsRechargeGroupAdapter(new ArrayList<>());
             mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
             mViewBinding.statisticsRecycler.setAdapter(mStatisticsGroupAdapter);
 
-        } else {
-            mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
-            mViewBinding.statisticsRecycler.setAdapter(mStatisticsGroupAdapter);
-        }
 
         mStatisticsGroupAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/UsedTicketListFragment.java

@@ -45,15 +45,11 @@ public class UsedTicketListFragment extends BaseFragment<StatisticsPresenter, Fr
         pagerNum = 1;
 
         mViewBinding.tvEmpty.setText(R.string.statistics_search_empty_ticket);
-        if (mStatisticsGroupAdapter == null) {
-            mStatisticsGroupAdapter = new StatisticsTicketGroupAdapter(new ArrayList<>());
-            mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
-            mViewBinding.statisticsRecycler.setAdapter(mStatisticsGroupAdapter);
 
-        } else {
-            mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
-            mViewBinding.statisticsRecycler.setAdapter(mStatisticsGroupAdapter);
-        }
+        mStatisticsGroupAdapter = new StatisticsTicketGroupAdapter(new ArrayList<>());
+        mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+        mViewBinding.statisticsRecycler.setAdapter(mStatisticsGroupAdapter);
+
 
         mStatisticsGroupAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override

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

@@ -80,15 +80,12 @@ public class OrderListFragment extends BaseFragment<StatisticsPresenter, Fragmen
 //        });
         mViewBinding.tvEmpty.setText(R.string.statistics_search_empty);
 
-        if (mStatisticsAdapter == null) {
+
             mStatisticsAdapter = new StatisticsOrderGroupAdapter(new ArrayList<>());
             mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
             mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
 
-        } else {
-            mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
-            mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
-        }
+
 
         mStatisticsAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override

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

@@ -18,6 +18,8 @@ import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentOrderMainBinding;
 
 import com.xingdata.zzdpos.databinding.ItemStringBinding;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Smt;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
 import com.xingdata.zzdpos.ui.statistics.adapter.FragmentStateAdapter;
@@ -65,13 +67,12 @@ public class OrderMainFragment extends BaseFragment<StatisticsPresenter, Fragmen
             return false;
         });
 
-
-        initViewPager();
+        mPresenter.getSmtList();
 
 
     }
 
-    public void initViewPager() {
+    public void initViewPager(Integer monthEnd) {
         if (fragments.size() == 0) {
             Observable.create(new ObservableOnSubscribe<String>() {
                 @Override
@@ -80,7 +81,7 @@ public class OrderMainFragment extends BaseFragment<StatisticsPresenter, Fragmen
                     String[] dates = date.split("-");
                     int y = Integer.valueOf(dates[0]);
                     int m = month + 1;
-                    for (int i = 0; i < 5; i++) {
+                    for (int i = 0; i < 12; i++) {
                         if (m == 0) {
                             m = 12;
                             y--;
@@ -91,6 +92,9 @@ public class OrderMainFragment extends BaseFragment<StatisticsPresenter, Fragmen
                         }
                         String month = String.valueOf(m).length() >= 2 ? String.valueOf(m) : "0" + String.valueOf(m);
                         e.onNext(y + "-" + month + "-01");
+                        if (m == monthEnd) {
+                            break;
+                        }
                         m--;
                     }
                     e.onComplete();
@@ -185,5 +189,21 @@ public class OrderMainFragment extends BaseFragment<StatisticsPresenter, Fragmen
 
     }
 
+    public void getSmtListSucc(Pager<Smt> smtPager) {
+
+        int size = smtPager.getList().size();
+        if (size != 0) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTimeInMillis(smtPager.getList().get(size - 1).getTotalDate());
+            int monthEnd = calendar.get(Calendar.MONTH);
+            if (monthEnd == 0) {
+                monthEnd = 12;
+            }
+            initViewPager(monthEnd);
+        } else {
+            initViewPager(month);
+        }
+
+    }
 
 }

app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java

@@ -5,6 +5,7 @@ import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 
@@ -29,12 +30,14 @@ import com.xingdata.zzdpos.ui.store.dialog.CartDialog;
 import com.xingdata.zzdpos.ui.store.dialog.MsDialog;
 import com.xingdata.zzdpos.ui.store.fragment.SearchFragment;
 import com.xingdata.zzdpos.ui.store.fragment.StoreFragment;
+import com.xingdata.zzdpos.util.Global;
 
 import java.util.ArrayList;
 import java.util.List;
 
 
-public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBinding> implements StoreContract.View {
+public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBinding> implements
+        StoreContract.View {
 
     private StoreFragment mStoreFragment = new StoreFragment();
     private SearchFragment mSearchFragment = new SearchFragment();
@@ -65,7 +68,8 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
             return false;
         });
 
-        mViewBinding.btnScan.setOnClickListener(view -> PermissionUtils.permission(PermissionConstants.CAMERA)
+        mViewBinding.btnScan.setOnClickListener(view -> PermissionUtils.permission
+                (PermissionConstants.CAMERA)
                 .callback(new PermissionUtils.FullCallback() {
                     @Override
                     public void onGranted(List<String> permissionsGranted) {
@@ -73,7 +77,8 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
                     }
 
                     @Override
-                    public void onDenied(List<String> permissionsDeniedForever, List<String> permissionsDenied) {
+                    public void onDenied(List<String> permissionsDeniedForever, List<String>
+                            permissionsDenied) {
                     }
                 })
                 .request());
@@ -189,7 +194,8 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
      * @param scaleLarge 放大比例
      * @param duration   时间
      */
-    private void startShakeByPropertyAnim(View view, float scaleSmall, float scaleLarge, long duration) {
+    private void startShakeByPropertyAnim(View view, float scaleSmall, float scaleLarge, long
+            duration) {
         if (view == null) {
             return;
         }
@@ -208,8 +214,16 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
                 Keyframe.ofFloat(0.75f, scaleLarge),
                 Keyframe.ofFloat(1.0f, 1.0f)
         );
-        ObjectAnimator objectAnimator = ObjectAnimator.ofPropertyValuesHolder(view, scaleXValuesHolder, scaleYValuesHolder);
+        ObjectAnimator objectAnimator = ObjectAnimator.ofPropertyValuesHolder(view,
+                scaleXValuesHolder, scaleYValuesHolder);
         objectAnimator.setDuration(duration);
         objectAnimator.start();
     }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java

 package com.xingdata.zzdpos.ui.vip;
 
 import android.os.Bundle;
+import android.view.MotionEvent;
 import android.view.View;
+import android.widget.EditText;
 
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
@@ -17,13 +19,13 @@ import com.xingdata.zzdpos.model.Trule;
 import com.xingdata.zzdpos.model.Vip;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
 import com.xingdata.zzdpos.ui.dialog.PromptDialog;
-import com.xingdata.zzdpos.ui.vip.fragment.VipInfoEditFragment;
-import com.xingdata.zzdpos.ui.vip.fragment.VipListFragment;
+import com.xingdata.zzdpos.util.Global;
 import com.xingdata.zzdpos.view.ViewTools;
 
 import java.util.List;
 
-public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding> implements VipContract.View {
+public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding> implements
+        VipContract.View {
     private Bundle mBundle;
 
     @Override
@@ -94,13 +96,14 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
     @Override
     public void rechangeErr(Vip vip, Long amtPay, Long amtSend, String mes) {
         PromptDialog promptDialog = new PromptDialog();
-        promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_ERROR, "支付失败").setCustomButton("重新支付", new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mPresenter.fullVip(vip, amtPay, amtSend);
-                promptDialog.dismiss();
-            }
-        }).show(this);
+        promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_ERROR, "支付失败").setCustomButton
+                ("重新支付", new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        mPresenter.fullVip(vip, amtPay, amtSend);
+                        promptDialog.dismiss();
+                    }
+                }).show(this);
     }
 
     @Override
@@ -118,4 +121,10 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
         mPresenter.vipListFragment.getVipNumberSus(sta);
     }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        Global.clickHideKeyboard(ev, this);
+        return super.dispatchTouchEvent(ev);
+    }
+
 }

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

 package com.xingdata.zzdpos.util;
 
+import android.app.Activity;
 import android.content.Context;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
 
 /**
  * Created by Administrator on 2018/1/17.
  */
 
 public class Global {
-    private static void fragmentShowKeyboard(Context context) {
-        InputMethodManager imm = (InputMethodManager) context.getSystemService(Context
-                .INPUT_METHOD_SERVICE);
-        imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, InputMethodManager.HIDE_NOT_ALWAYS);
+    public static void clickHideKeyboard(MotionEvent ev, Activity context) {
+        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+            View v = context.getCurrentFocus();
+            if (isShouldHideKeyboard(v, ev)) {
+                InputMethodManager imm =
+                        (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.hideSoftInputFromWindow(v.getWindowToken(),
+                        InputMethodManager.HIDE_NOT_ALWAYS
+                );
+            }
+        }
     }
 
     public static void setFocus(View view, Context context) {
@@ -21,4 +31,25 @@ public class Global {
         view.requestFocus();
         Global.fragmentShowKeyboard(context);
     }
+
+    private static void fragmentShowKeyboard(Context context) {
+        InputMethodManager imm = (InputMethodManager) context.getSystemService(Context
+                .INPUT_METHOD_SERVICE);
+        imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, InputMethodManager.HIDE_NOT_ALWAYS);
+    }
+
+    // 根据 EditText 所在坐标和用户点击的坐标相对比，来判断是否隐藏键盘
+    private static boolean isShouldHideKeyboard(View v, MotionEvent event) {
+        if (v != null && (v instanceof EditText)) {
+            int[] l = {0, 0};
+            v.getLocationInWindow(l);
+            int left = l[0],
+                    top = l[1],
+                    bottom = top + v.getHeight(),
+                    right = left + v.getWidth();
+            return !(event.getX() > left && event.getX() < right
+                    && event.getY() > top && event.getY() < bottom);
+        }
+        return false;
+    }
 }

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

@@ -28,8 +28,8 @@ public final class SystemUtil {
      * @return 设备型号
      */
     public static String getDeviceModel() {
-        return DeviceUtils.getModel();
-//        return "AECRC10";
+//        return DeviceUtils.getModel();
+        return "AECRC10";
     }
 
 
@@ -57,8 +57,8 @@ public final class SystemUtil {
                 e.printStackTrace();
             }
         }
-        return deviceSN;
-//        return "548496";
+//        return deviceSN;
+        return "548496";
     }
 
     /**

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

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:radius="@dimen/all_shape_radius" />
-    <solid android:color="@color/gray_zhouyu" />
+    <solid android:color="@color/gray_kongming" />
 
 </shape>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.constraint.ConstraintLayout
-        xmlns:tools="http://schemas.android.com/tools"
+    <data>
+
+        <variable
+            name="version"
+            type="String" />
+    </data>
+
+    <android.support.constraint.ConstraintLayout xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@mipmap/splash"
         android:orientation="vertical"
-        android:padding="@dimen/all_margin"
         tools:context="com.xingdata.zzdpos.ui.splash.SplashActivity">
 
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/all_margin_big"
+            android:layout_marginBottom="@dimen/all_margin_big_big"
             android:gravity="center"
             android:orientation="vertical"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -30,14 +35,13 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/all_margin">
 
-                <com.github.ybq.android.spinkit.SpinKitView
-                    xmlns:app="http://schemas.android.com/apk/res-auto"
+                <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/spin_kit"
                     style="@style/SpinKitView.Circle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
-                    app:SpinKit_Color="@color/black_zhangfei"/>
+                    app:SpinKit_Color="@color/black_zhangfei" />
 
                 <TextView
                     android:id="@+id/tv_progress"
@@ -45,7 +49,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:text="0 %"
-                    android:textColor="@color/black_zhangfei"/>
+                    android:textColor="@color/black_zhangfei" />
             </RelativeLayout>
 
             <TextView
@@ -55,7 +59,7 @@
                 android:layout_marginTop="@dimen/all_padding"
                 android:gravity="center"
                 android:text="正在加载数据..."
-                android:textColor="@color/black_zhangfei"/>
+                android:textColor="@color/black_zhangfei" />
 
         </LinearLayout>
 
@@ -87,7 +91,16 @@
         <!--android:text="@string/login_phone"-->
         <!--android:textColor="@color/white" />-->
         <!--</LinearLayout>-->
-
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{version}"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_text_size_small"
+            android:layout_margin="@dimen/padding_small"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -49,25 +49,23 @@
                 app:layout_constraintTop_toBottomOf="parent">
 
                 <TextView
-                    android:id="@+id/tv_keyword"
+                    android:id="@+id/tv_title"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/all_seach_height"
                     android:layout_marginEnd="@dimen/all_spacing"
                     android:layout_weight="1"
-                    android:background="@drawable/shape_gray_r1"
                     android:clickable="true"
-                    android:drawableLeft="@mipmap/ic_search"
                     android:drawablePadding="@dimen/all_spacing"
                     android:enabled="true"
-                    android:gravity="center|left"
-                    android:hint="@string/store_search_hint"
+                    android:gravity="center"
                     android:maxLength="20"
                     android:maxLines="1"
                     android:onClick="@{OnClickListener}"
                     android:paddingLeft="@dimen/all_padding"
-                    android:textColor="@color/black_likui"
+                    android:text="新增组合"
+                    android:textColor="@color/black_baozheng"
                     android:textColorHint="@color/gray_huanggai"
-                    android:textSize="@dimen/all_text_size"/>
+                    android:textSize="@dimen/all_sub_title_size"/>
 
                 <ImageButton
                     android:id="@+id/btn_scan"
@@ -122,10 +120,45 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/ll_left"
+            android:id="@+id/ll_keyword"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/cl_title"
+            android:background="@color/white"
+            android:orientation="horizontal"
+            >
+
+            <TextView
+                android:id="@+id/tv_keyword"
+                style="@style/searchBarEditor"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginBottom="@dimen/padding_small"
+                android:layout_marginEnd="@dimen/all_bounced_padding"
+                android:layout_marginStart="@dimen/all_bounced_padding"
+                android:layout_marginTop="@dimen/padding_small"
+                android:background="@drawable/shape_gray_r1"
+                android:clickable="true"
+                android:drawableLeft="@mipmap/ic_search"
+                android:drawablePadding="@dimen/all_padding"
+                android:enabled="true"
+                android:gravity="center|left"
+                android:hint="@string/store_search_hint"
+                android:maxLength="20"
+                android:maxLines="1"
+                android:onClick="@{OnClickListener}"
+                android:paddingLeft="@dimen/all_padding"
+                android:textColor="@color/black_likui"
+                android:textColorHint="@color/gray_huanggai"
+                android:textSize="@dimen/all_text_size_low"
+                />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_left"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/ll_keyword"
             android:orientation="vertical"
             >
 

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

@@ -26,7 +26,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="@color/white_caocao"
-            app:layout_constraintBottom_toTopOf="@id/btn_add"
+            app:layout_constraintBottom_toTopOf="@id/tv_keyword"
             app:layout_constraintTop_toTopOf="parent">
 
             <ImageButton
@@ -52,25 +52,22 @@
                 app:layout_constraintTop_toBottomOf="parent">
 
                 <TextView
-                    android:id="@+id/tv_keyword"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/all_seach_height"
                     android:layout_marginEnd="@dimen/all_spacing"
                     android:layout_weight="1"
-                    android:background="@drawable/shape_gray_r1"
                     android:clickable="true"
-                    android:drawableLeft="@mipmap/ic_search"
                     android:drawablePadding="@dimen/all_spacing"
                     android:enabled="true"
-                    android:gravity="center|left"
-                    android:hint="@string/store_search_hint"
+                    android:gravity="center"
                     android:maxLength="20"
                     android:maxLines="1"
                     android:onClick="@{OnClickListener}"
                     android:paddingLeft="@dimen/all_padding"
-                    android:textColor="@color/black_likui"
+                    android:text="商品组合"
+                    android:textColor="@color/black_baozheng"
                     android:textColorHint="@color/gray_huanggai"
-                    android:textSize="@dimen/all_text_size"/>
+                    android:textSize="@dimen/all_sub_title_size"/>
 
                 <ImageButton
                     android:id="@+id/btn_scan"
@@ -91,10 +88,39 @@
                 app:layout_constraintBottom_toBottomOf="parent"/>
         </android.support.constraint.ConstraintLayout>
 
-        <View
+        <LinearLayout
+            android:id="@+id/ll_keyword"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/all_line_width"
-            android:background="@color/gray_huanggai"></View>
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:orientation="horizontal"
+            app:layout_constraintTop_toBottomOf="@+id/cl_title">
+
+            <TextView
+                android:id="@+id/tv_keyword"
+                style="@style/searchBarEditor"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginBottom="@dimen/padding_small"
+                android:layout_marginEnd="@dimen/all_bounced_padding"
+                android:layout_marginStart="@dimen/all_bounced_padding"
+                android:layout_marginTop="@dimen/padding_small"
+                android:background="@drawable/shape_gray_r1"
+                android:clickable="true"
+                android:drawableLeft="@mipmap/ic_search"
+                android:drawablePadding="@dimen/all_padding"
+                android:enabled="true"
+                android:gravity="center|left"
+                android:hint="@string/store_search_hint"
+                android:maxLength="20"
+                android:maxLines="1"
+                android:onClick="@{OnClickListener}"
+                android:paddingLeft="@dimen/all_padding"
+                android:textColor="@color/black_likui"
+                android:textColorHint="@color/gray_huanggai"
+                android:textSize="@dimen/all_text_size_low"
+                />
+        </LinearLayout>
 
         <LinearLayout
             android:id="@+id/btn_add"
@@ -107,7 +133,7 @@
             app:layout_constraintBottom_toTopOf="@id/ll_menu"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/cl_title">
+            app:layout_constraintTop_toBottomOf="@+id/ll_keyword">
 
 
             <ImageView
@@ -126,11 +152,6 @@
 
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/all_line_width"
-            android:background="@color/gray_huanggai"
-            app:layout_constraintTop_toBottomOf="@+id/btn_add"></View>
 
         <TextView
             android:id="@+id/btn_group"

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

@@ -31,6 +31,7 @@
             type="String"/>
     </data>
 
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -52,7 +53,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:onClick="@{OnClickListener}"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="gone">
 
 
                 <android.support.constraint.ConstraintLayout
@@ -72,7 +74,7 @@
                         app:layout_constraintBottom_toTopOf="parent"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintTop_toBottomOf="parent"
-                        app:placeholderImage="@mipmap/icon_menu_service_1"
+                        app:placeholderImage="@mipmap/vip_send"
                         app:roundAsCircle="true"
                         app:roundingBorderColor="@color/gray_huanggai"
                         app:roundingBorderWidth="@dimen/all_line_width"/>
@@ -117,6 +119,7 @@
                         android:text="@{@string/settle_vip_dis_rate_hint + disRate + @string/settle_vip_dis_rate}"
                         android:textColor="@color/black_zhangfei"
                         android:textSize="@dimen/all_caption_size"
+                        android:visibility="gone"
                         app:layout_constraintBottom_toTopOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/cb_point"
                         app:layout_constraintTop_toBottomOf="parent"/>
@@ -128,6 +131,7 @@
                         android:layout_marginEnd="@dimen/all_margin"
                         android:button="@mipmap/but_elect02"
                         android:contentDescription="@string/settle_balance"
+                        android:visibility="gone"
                         app:layout_constraintBottom_toTopOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintTop_toBottomOf="parent"/>
@@ -147,30 +151,89 @@
                 android:layout_marginTop="@dimen/all_bounced_padding"
                 android:background="@drawable/up_down_line_white"
                 android:orientation="vertical"
-                android:visibility="gone">
+                android:visibility="visible">
 
-                <TextView
+                <LinearLayout
+                    android:id="@+id/ll_all_vip_group"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/up_down_line_white"
-                    android:paddingBottom="@dimen/all_margin"
-                    android:paddingLeft="@dimen/all_padding"
-                    android:paddingTop="@dimen/all_margin"
-                    android:text="请选择发放对象"
-                    android:textColor="@color/black_baozheng"
-                    android:textSize="@dimen/text_three_title"/>
-
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/vip_type"
+                    android:orientation="vertical"
+                    android:visibility="visible">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/up_down_line_white"
+                        android:paddingBottom="@dimen/all_margin"
+                        android:paddingLeft="@dimen/all_padding"
+                        android:paddingTop="@dimen/all_margin"
+                        android:text="请选择发放对象"
+                        android:textColor="@color/black_baozheng"
+                        android:textSize="@dimen/text_three_title"/>
+
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/vip_type"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@color/white"/>
+
+                </LinearLayout>
+
+
+                <android.support.constraint.ConstraintLayout
+                    android:id="@+id/cl_all"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/white"/>
+                    android:visibility="gone"
+                    android:layout_height="@dimen/list3_height"
+                    android:background="@drawable/up_down_line_white"
+                    android:foreground="?android:attr/selectableItemBackground"
+                    android:onClick="@{OnClickListener}">
+
+                    <com.facebook.drawee.view.SimpleDraweeView
+                        android:id="@+id/iv_all_head"
+                        android:layout_width="@dimen/settle_vip_head"
+                        android:layout_height="@dimen/settle_vip_head"
+                        android:layout_marginStart="@dimen/all_margin"
+                        app:backgroundImage="@color/white_caocao"
+                        app:layout_constraintBottom_toTopOf="parent"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toBottomOf="parent"
+                        app:placeholderImage="@mipmap/vip_type_send"
+                        app:roundAsCircle="true"
+                        app:roundingBorderColor="@color/gray_huanggai"
+                        app:roundingBorderWidth="@dimen/all_line_width"/>
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/all_margin"
+                        android:orientation="vertical"
+                        app:layout_constraintBottom_toTopOf="parent"
+                        app:layout_constraintLeft_toRightOf="@id/iv_all_head"
+                        app:layout_constraintTop_toBottomOf="parent">
+
+                        <TextView
+                            android:id="@+id/tv_vip_group_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:textColor="@color/black_zhangfei"
+                            android:textSize="@dimen/all_text_size"/>
+
+                    </LinearLayout>
+
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/all_line_width"
+                        android:background="@color/gray_huanggai"
+                        app:layout_constraintBottom_toBottomOf="parent"/>
+                </android.support.constraint.ConstraintLayout>
+
+
             </LinearLayout>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/all_line_width"
-                android:layout_gravity="bottom"
-                android:background="@color/gray_huanggai"/>
+
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"