Merge remote-tracking branch 'origin/master'

.idea/modules.xml

@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
-      <module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" />
       <module fileurl="file://D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" filepath="D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" />
+      <module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>

app/build.gradle

@@ -66,7 +66,7 @@ dependencies {
     compile 'com.squareup.okhttp3:logging-interceptor:3.9.0'
     compile 'io.reactivex.rxjava2:rxjava:2.1.5'
     compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    compile 'com.alibaba:fastjson:1.2.39'
+    compile 'com.alibaba:fastjson:1.1.67.android'
     compile 'com.blankj:utilcode:1.11.1'
     compile 'com.facebook.fresco:fresco:1.5.0'
     compile 'com.facebook.fresco:animated-gif:1.5.0'

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

@@ -638,7 +638,19 @@ public final class ApiFactory {
 
         public static Observable<String> batchSend(String birthdayType, String vipLevel, Long
                 vipId, Long truleId) {
-            return Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId, truleId)
+            return Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId,
+                    truleId, null)
+                    .onErrorReturn(new ErrorFilter<>())
+                    .map(new ResultFilter<>())
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .retryWhen(new RetryHelper(3));
+        }
+
+        public static Observable<String> batchSendBefor(String birthdayType, String vipLevel, Long
+                vipId, Long truleId) {
+            return Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId,
+                    truleId, "true")
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
                     .subscribeOn(Schedulers.io())

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

@@ -195,18 +195,22 @@ interface ApiService {
     @POST(C.URL.RCTRACE.query)
     Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int
                                                                            pageNum, @Query
-            ("pageSize") int pageSize);
+                                                                           ("pageSize") int
+                                                                           pageSize);
 
     @POST(C.URL.RCTRACE.query)
     Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("vipId") long vipId,
                                                                    @Query("pageNumber") int
                                                                            pageNum, @Query
-            ("pageSize") int pageSize);
+                                                                           ("pageSize") int
+                                                                           pageSize);
 
     @POST(C.URL.RCTRACE.query)
     Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int
                                                                            pageNum, @Query
-            ("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long
+                                                                           ("pageSize") int
+                                                                           pageSize, @Query
+            ("startDate") long startDate, @Query("endDate") long
                                                                            endDate);
 
     @POST(C.URL.PSB.queryDetail)
@@ -239,14 +243,18 @@ interface ApiService {
     @POST(C.URL.TICKET.query)
     Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("pageNumber") int pageNum, @Query
             ("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList")
-            String ticketIsList, @Query("startDate") long startDate, @Query("endDate") long
+                                                               String ticketIsList, @Query
+                                                               ("startDate") long startDate,
+                                                       @Query("endDate") long
                                                                endDate);
 
     @POST(C.URL.TICKET.ticketBatchSend)
     Observable<HttpMessage<String>> ticketBatchSend(@Query("birthdayType") String birthdayType,
                                                     @Query("vipLevel") String vipLevel,
                                                     @Query("vipId") Long vipId,
-                                                    @Query("truleId") Long truleId);
+                                                    @Query("truleId") Long truleId, @Query
+                                                            ("flag") String flag);
+
 
     @POST(C.URL.SALEORDER.addOrderMis)
     Observable<HttpMessage<String>> addOrderMis(@Body Saleorder.Param saleorderParam);
@@ -257,7 +265,10 @@ interface ApiService {
     @POST(C.URL.SALEORDER.querySaleorderByVipId)
     Observable<HttpMessage<Pager<Saleorder>>> querySaleorderByVipId(@Query("vipId") Long vipId,
                                                                     @Query
-            ("pageNumber") int pageNum, @Query("pageSize") int pageSize);
+                                                                            ("pageNumber") int
+                                                                            pageNum, @Query
+                                                                            ("pageSize") int
+                                                                            pageSize);
 
 
     @POST(C.URL.USER.query)

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

@@ -17,8 +17,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import io.realm.annotations.Ignore;
-
 
 /**
  * 订单
@@ -505,7 +503,8 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
     private Long createTime;
 
     private Salepay salepay;
-    @Ignore
+
+    @JSONField(serialize = false)
     private String PayName;
 
     private List<Saledetail> saledetailList;

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

@@ -69,6 +69,8 @@ public class Ticket extends SectionEntity<MediaStore.Video> implements BaseBean
 
     private Long ticketNo;
 
+    private String vipName;
+
     private Long vipId;
 
     private Long ticketExp;
@@ -91,6 +93,14 @@ public class Ticket extends SectionEntity<MediaStore.Video> implements BaseBean
 
     private String mac;
 
+    public String getVipName() {
+        return vipName;
+    }
+
+    public void setVipName(String vipName) {
+        this.vipName = vipName;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -18,7 +18,7 @@ import java.util.List;
 public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements BaseOrderPrint, BaseBean {
     private Long cardAmtPay;
     private Long cardAmtSend;
-    private String orderNo;
+    private String cardNo;
     private Long rechangeBefore;
     private Long rechangeAfter;
     private String vipName;
@@ -26,6 +26,14 @@ public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements
     private String vipMobile;
     private Long createTime;
 
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
     public VipRechargeOrder(boolean isHeader, String header) {
         super(isHeader, header);
     }
@@ -78,9 +86,6 @@ public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements
         this.rctraceNo = rctraceNo;
     }
 
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
 
     public String getVipMobile() {
         return vipMobile;
@@ -146,8 +151,8 @@ public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements
 
     @Override
     public String getOrderNo() {
-        if (orderNo != null && orderNo.length() != 0) {
-            return orderNo;
+        if (cardNo != null && cardNo.length() != 0) {
+            return cardNo;
         }
         return rctraceNo;
     }

app/src/main/java/com/xingdata/zzdpos/ui/dialog/PromptDialog.java

@@ -183,7 +183,7 @@ public class PromptDialog extends BaseDialog<LoginPresenter, DialogPromptBinding
             case PROMPTDIALOG_SELECT: {
                 mViewBinding.spinKit.setVisibility(View.GONE);
                 mViewBinding.ivLogo.setVisibility(View.GONE);
-                mViewBinding.tvText.setTextColor(getResources().getColor(R.color.succ));
+                mViewBinding.tvText.setTextColor(getResources().getColor(R.color.black_baozheng));
             }
             break;
             default: {

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

@@ -84,6 +84,7 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
         );
         loadingDialog.show((BaseActivity) getActivity());
         mPresenter.usskuQuery("", loadingDialog);
+
         KeyboardUtils.showSoftInput(mViewBinding.tvKeyword);
     }
 

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

@@ -3,8 +3,10 @@ package com.xingdata.zzdpos.ui.manage.bale.fragment;
 import android.annotation.SuppressLint;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 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;
@@ -72,6 +74,10 @@ public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleS
                                                          }
 
         );
+        mViewBinding.etKeyword.setFocusable(true);
+        mViewBinding.etKeyword.setFocusableInTouchMode(true);
+        mViewBinding.etKeyword.requestFocus();
+        KeyboardUtils.showSoftInput( mViewBinding.etKeyword);
     }
 
 

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

@@ -6,6 +6,7 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.widget.TextView;
 
+import com.blankj.utilcode.util.KeyboardUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
@@ -105,6 +106,10 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
                                                          }
 
         );
+        mViewBinding.etKeyword.setFocusable(true);
+        mViewBinding.etKeyword.setFocusableInTouchMode(true);
+        mViewBinding.etKeyword.requestFocus();
+        KeyboardUtils.showSoftInput( mViewBinding.etKeyword);
     }
 
     public void setNewData(List<Sssku> newData, Boolean isLoadMore) {

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

@@ -56,12 +56,15 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
 
         initRecycler();
         mViewBinding.setCartCount(0);
-        mViewBinding.icTitle.edTitle.setHint(R.string.inventory_add_et_hint);
-        mViewBinding.icTitle.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+        mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
+        mViewBinding.icTitle.tvTitle.setText("商品盘点");
+        mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
+        mViewBinding.edTitle.setHint(R.string.inventory_add_et_hint);
+        mViewBinding.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
                 if (i == EditorInfo.IME_ACTION_SEARCH) {
-                    mPresenter.getProductByBarcode(mViewBinding.icTitle.edTitle.getText().toString());
+                    mPresenter.getProductByBarcode(mViewBinding.edTitle.getText().toString());
                     hideSoftInput();
                 }
                 return false;

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

@@ -3,6 +3,8 @@ package com.xingdata.zzdpos.ui.manage.otherselect;
 import android.text.InputType;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.TextView;
 
 import com.blankj.utilcode.util.FragmentUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
@@ -31,12 +33,19 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter, Acti
     @Override
     public void initView() {
         mViewBinding.lyTitle.ivRight.setVisibility(View.GONE);
-        mViewBinding.lyTitle.edTitle.setInputType(InputType.TYPE_CLASS_TEXT);
+        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);
-        mViewBinding.lyTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
-            if (keyCode == KeyEvent.KEYCODE_ENTER)
-                search(mViewBinding.lyTitle.edTitle.getText().toString().trim());
-            return false;
+
+        mViewBinding.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
+                if (i == EditorInfo.IME_ACTION_SEARCH) {
+                    search(mViewBinding.edTitle.getText().toString().trim());
+                }
+                return true;
+            }
         });
         mViewBinding.lyTitle.setOnClickListener(new OnClickListener() {
             @Override

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

@@ -31,7 +31,10 @@ public class OtherSelectAdapter extends BaseAdapter<Ossku, ItemOtherSelectBindin
         mViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
         mViewBinding.imgGoods.setImageURI(item.getSpuImg());
 //        mViewBinding.tvNum.setText(item.getSkuStock() + "个");
-        mViewBinding.tvShop.setText(item.getShopName());
+        mViewBinding.setShopName(item.getShopName());
+        mViewBinding.setStock("库存:" +item.getSkuStock()+item.getSpuUnitName());
+        mViewBinding.setAddress(item.getCityProvName()+item.getCityName()+item.getCityCountyName()+item.getCityAddress());
+        mViewBinding.setPhone(item.getContactTel());
 //        mViewBinding.tvAddress.setText(item.getCityAddress());
 //        mViewBinding.tvTel.setText(item.getContactTel());
     }

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

@@ -51,12 +51,12 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
         Drawable drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
         mViewBinding.recyclerOtherSelcet.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
 
-        mOtherSelectAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-            @Override
-            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                mPresenter.clickOsskuItem(mOtherSelectAdapter.getData().get(position));
-            }
-        });
+//        mOtherSelectAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+//            @Override
+//            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+//                mPresenter.clickOsskuItem(mOtherSelectAdapter.getData().get(position));
+//            }
+//        });
 
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
         mOtherSelectAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.recyclerOtherSelcet);

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

@@ -46,9 +46,10 @@ public class ReplenishmentDetailAdapter extends BaseAdapter<Sssku, ItemReplenish
 
         if (!isTouch) {
             mViewBinding.etCount.setEnabled(false);
-            mViewBinding.etCount.setTextColor(ContextCompat.getColor(mContext, R.color.white_cargo));
+            mViewBinding.etCount.setTextColor(ContextCompat.getColor(mContext, R.color.red_lvzhi));
             mViewBinding.btnDown.setVisibility(View.GONE);
             mViewBinding.btnUp.setVisibility(View.GONE);
+            mViewBinding.tvFinallyCount.setVisibility(View.VISIBLE);
         }
     }
 
@@ -108,7 +109,6 @@ public class ReplenishmentDetailAdapter extends BaseAdapter<Sssku, ItemReplenish
     }
 
 
-
     public void setmUpdatePriceListener(UpdatePriceListener updatePriceListener) {
         this.mUpdatePriceListener = updatePriceListener;
     }

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

@@ -8,6 +8,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.text.InputType;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 
 import com.blankj.utilcode.util.KeyboardUtils;
@@ -53,8 +54,11 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
 
     @Override
     public void initView() {
-        mViewBinding.lyTitle.edTitle.setHint(R.string.inventory_add_et_hint);
-        mViewBinding.lyTitle.edTitle.setText("");
+        mViewBinding.lyTitle.edTitle.setVisibility(View.GONE);
+        mViewBinding.lyTitle.tvTitle.setVisibility(View.VISIBLE);
+        mViewBinding.lyTitle.tvTitle.setText("定货详情");
+        mViewBinding.edTitle.setHint(R.string.inventory_add_et_hint);
+        mViewBinding.edTitle.setText("");
         Drawable drawableTop = getResources().getDrawable(R.mipmap.but_unfurled);
         Drawable drawableBottom = getResources().getDrawable(R.mipmap.but_up);
         drawableTop.setBounds(0, 0, (int) mViewBinding.tvShopTitle.getTextSize() - 10, (int) mViewBinding.tvShopTitle.getTextSize() - 10);
@@ -93,10 +97,15 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
             }
         });
         mViewBinding.lyTitle.ivRight.setVisibility(View.GONE);
-        mViewBinding.lyTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
-            if (keyCode == KeyEvent.KEYCODE_ENTER)
-                scrollToItem(mViewBinding.lyTitle.edTitle.getText().toString().trim());
-            return false;
+
+        mViewBinding.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
+                if (i == EditorInfo.IME_ACTION_SEARCH) {
+                    scrollToItem(mViewBinding.edTitle.getText().toString().trim());
+                }
+                return true;
+            }
         });
         mViewBinding.lyTitle.ivBack.setOnClickListener(view -> {
             this.pop();
@@ -137,7 +146,7 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
                     mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
                     break;
                 case 1:
-                    mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
+                    mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, false);
                     break;
                 case 0:
                     mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, false);
@@ -205,15 +214,12 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
             switch (mPsb.getPsbStatus()) {
                 case 3:
                     mViewBinding.btnOk.setText("修改订单");
-
                     break;
                 case 1:
                     mViewBinding.btnOk.setText("确认收货");
-
                     break;
                 case 0:
                     mViewBinding.llBottom.setVisibility(View.GONE);
-
                     break;
                 default:
                     break;
@@ -296,5 +302,6 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
         }
 
         ToastUtils.showShort("没有找到相关货品");
+
     }
 }

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

@@ -65,6 +65,9 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
         mViewBinding.btnAdd.setOnClickListener(view -> {
             mPresenter.clickAdd();
         });
+        mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
+        mViewBinding.icTitle.tvTitle.setText("补货订货");
+        mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
@@ -72,23 +75,23 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
             }
         });
         mViewBinding.icTitle.ivRight.setVisibility(View.GONE);
-        mViewBinding.icTitle.edTitle.setHint("请输入供货商名称");
-        mViewBinding.icTitle.edTitle.setInputType(InputType.TYPE_CLASS_TEXT);
+        mViewBinding.edTitle.setHint("请输入供货商名称");
+        mViewBinding.edTitle.setInputType(InputType.TYPE_CLASS_TEXT);
 
-        mViewBinding.icTitle.edTitle.setOnClickListener(view -> {
-            if (mViewBinding.icTitle.edTitle.getText().toString().trim().length() == 0) {
+        mViewBinding.edTitle.setOnClickListener(view -> {
+            if (mViewBinding.edTitle.getText().toString().trim().length() == 0) {
                 ToastUtils.showShort("请输入供货商名称");
                 return;
             }
             switch (mViewBinding.tab.getSelectedTabPosition()) {
                 case 0:
-                    mPresenter.searchPsbList(mViewBinding.icTitle.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(0));
+                    mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(0));
                     break;
                 case 1:
-                    mPresenter.searchPsbList(mViewBinding.icTitle.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(1));
+                    mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(1));
                     break;
                 case 2:
-                    mPresenter.searchPsbList(mViewBinding.icTitle.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(2));
+                    mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(2));
                     break;
             }
 
@@ -160,15 +163,15 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
     }
 
 
-    public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C,boolean isFrist) {
-        if (isFrist){
+    public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C, boolean isFrist) {
+        if (isFrist) {
             this.psbA = A;
             this.psbB = B;
             this.psbC = C;
-        }else {
-            ((ReplenishmentListFragment) fragments.get(0)).setData(psbA,true);
-            ((ReplenishmentListFragment) fragments.get(1)).setData(psbB,true);
-            ((ReplenishmentListFragment) fragments.get(2)).setData(psbC,true);
+        } else {
+            ((ReplenishmentListFragment) fragments.get(0)).setData(psbA, true);
+            ((ReplenishmentListFragment) fragments.get(1)).setData(psbB, true);
+            ((ReplenishmentListFragment) fragments.get(2)).setData(psbC, true);
         }
 
 

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

@@ -138,6 +138,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
             public void run() {
                 if (psbs.size() == 0) {
                     mViewBinding.llEmpty.setVisibility(View.VISIBLE);
+                    hideSoftInput();
                 } else {
                     mReplenishmentAdapter.setNewData(psbs);
                     mReplenishmentAdapter.loadMoreEnd();

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

@@ -54,7 +54,7 @@ public class SkugrpFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSk
     public void loadSkugrps(List<Sskugrp> sskugrps) {
         mSskugrps = sskugrps;
         if (mSkugrpAdapter == null) return;
-        mSkugrpAdapter.notifyDataSetChanged();
+        mSkugrpAdapter.setNewData(mSskugrps);
         mViewBinding.setVisibility(sskugrps.size() > 0 ? View.VISIBLE : View.INVISIBLE);
     }
 

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

@@ -32,8 +32,8 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
     protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) {
 //        mViewBinding.tvSend.setText("发\n券");
 //        mViewBinding.tvSend.setText("\n");
-        mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
-                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
+//        mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
+//                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
         mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money,
                 ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
         mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,

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

@@ -56,6 +56,12 @@ public class SendTicketActivity extends BaseActivity<SendTicketPresenter,
         mPresenter.sendTickerFragment.sendSucc();
     }
 
+    @Override
+    public void sendTickerBeforSucc(long count,LoadingDialog loadingDialog) {
+        closeLoading(loadingDialog);
+        mPresenter.sendTickerFragment.sendSuccBefor(count);
+    }
+
     @Override
     protected void onResume() {
         super.onResume();

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

@@ -34,7 +34,9 @@ public interface SendTicketContract {
 
         void truleQuerySucc(Pager<Trule> trulePager, LoadingDialog loadingDialog);
 
-        void sendTickerSucc( LoadingDialog loadingDialog);
+        void sendTickerSucc(LoadingDialog loadingDialog);
+
+        void sendTickerBeforSucc(long count,LoadingDialog loadingDialog);
     }
 
     abstract class Presenter extends BasePresenter<View> {
@@ -56,5 +58,8 @@ public interface SendTicketContract {
 
         abstract void sendTicker(String birthdayType, String vipLevel, Long
                 vipId, Long truleId, LoadingDialog loadingDialog);
+
+        abstract void sendTickerBefor(String birthdayType, String vipLevel, Long
+                vipId, Long truleId, LoadingDialog loadingDialog);
     }
 }

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

@@ -66,4 +66,14 @@ public class SendTicketPresenter extends SendTicketContract.Presenter {
             mView.error(throwable.getMessage(), loadingDialog);
         });
     }
+
+    @Override
+    public void sendTickerBefor(String birthdayType, String vipLevel, Long vipId, Long truleId,
+                                LoadingDialog loadingDialog) {
+        ApiFactory.Ticket.batchSendBefor(birthdayType, vipLevel, vipId, truleId).subscribe(s -> {
+            mView.sendTickerBeforSucc(Long.parseLong(s), loadingDialog);
+        }, throwable -> {
+            mView.error(throwable.getMessage(), loadingDialog);
+        });
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/adapter/ReturnTicketAdapter.java

@@ -31,18 +31,18 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
     protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) {
         if (item.isSelect()) {
             mViewBinding.ivSelect.setImageResource(R.mipmap.but_elect01_stroke);
+            mViewBinding.ivSelect.setVisibility(View.VISIBLE);
         } else {
             mViewBinding.ivSelect.setImageResource(R.mipmap.but_elect02_stroke);
+            mViewBinding.ivSelect.setVisibility(View.GONE);
         }
-        mViewBinding.ivSelect.setVisibility(View.VISIBLE);
-        mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
-                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
-        mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money,
-                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
+//        mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
+//                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
+        mViewBinding.tvTicketMoneys.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt()));
         mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
                 ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
         mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,
-                TimeUtils.millis2String(item.getTruleExp(), new SimpleDateFormat("yyy-mm-dd"))));
+                TimeUtils.millis2String(item.getTruleExp(), new SimpleDateFormat("yyyy-mm-dd"))));
 
 
     }

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/dialog/SendTickerBeforDialog.java

+package com.xingdata.zzdpos.ui.sendticke.dialog;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseDialog;
+import com.xingdata.zzdpos.databinding.DialogSendtickerBeforBinding;
+import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
+
+/**
+ * Created by Administrator on 2018/1/17.
+ */
+
+public class SendTickerBeforDialog extends BaseDialog<SendTicketPresenter,
+        DialogSendtickerBeforBinding> {
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.dialog_sendticker_befor;
+    }
+
+    @Override
+    public void initView() {
+
+    }
+}

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

@@ -43,7 +43,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
     VipGroupAdapter vipGroupAdapter;
     LoadingDialog loadingDialog = new LoadingDialog();
     //当前优惠券点击的item id
-    int nowTickerItemId = -1;
+    int nowTickerItemId = 0;
     List<Trule> truleList = new ArrayList<>();
     //当前选中会员组别Item ID
     int nowVipGroupId = 0;
@@ -92,13 +92,13 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                             loadingDialog.show((BaseActivity) getActivity());
                             if (nowtype == 0) {
                                 //单独会员发券
-                                mPresenter.sendTicker(null, null, nowVip.getVipId(), tickerId,
+                                mPresenter.sendTickerBefor(null, null, nowVip.getVipId(), tickerId,
                                         loadingDialog);
                             } else if (nowtype == 1) {
                                 Long tempLevelId = levelList.get(nowVipGroupId).getId();
                                 if (tempLevelId == SendTickerC.getVipType().get(0).getId()) {
                                     //选择全部会员
-                                    mPresenter.sendTicker(null, null, null, tickerId,
+                                    mPresenter.sendTickerBefor(null, null, null, tickerId,
                                             loadingDialog);
                                     return;
                                 }
@@ -107,14 +107,14 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                                     //选择 当月下月以及流失会员
                                     if (tempLevelId == SendTickerC.getVipType().get(i).getId() &&
                                             tempServerId != -1) {
-                                        mPresenter.sendTicker(tempServerId + "", null,
+                                        mPresenter.sendTickerBefor(tempServerId + "", null,
                                                 null, tickerId,
                                                 loadingDialog);
                                         return;
                                     }
                                 }
                                 //选择金牌银牌等会员类别
-                                mPresenter.sendTicker(null, levelList.get(nowVipGroupId)
+                                mPresenter.sendTickerBefor(null, levelList.get(nowVipGroupId)
                                                 .getVipLevel() + "",
                                         null, tickerId,
                                         loadingDialog);
@@ -213,10 +213,11 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
             mViewBinding.tvEmpty.setVisibility(View.VISIBLE);
             mViewBinding.rlTicker.setVisibility(View.GONE);
         }
-        if (trulePager != null && trulePager.getList() != null) {
+        if (trulePager != null && trulePager.getList() != null && trulePager.getList().size() > 0) {
             truleList = trulePager.getList();
             mViewBinding.tvEmpty.setVisibility(View.GONE);
             mViewBinding.rlTicker.setVisibility(View.VISIBLE);
+            trulePager.getList().get(0).setSelect(true);
             returnTicketAdapter.setNewData(trulePager.getList());
         }
     }
@@ -263,11 +264,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
         if (nowtype == 0) {
             mPresenter.sendTickerSuccFragment.setUiData(truleList
                     .get(nowTickerItemId).getTruleName(), nowVip.getVipName());
-        }else {
+        } else {
             mPresenter.sendTickerSuccFragment.setUiData(truleList
-                    .get(nowTickerItemId).getTruleName(),  levelList.get(nowVipGroupId).getVipLevelName());
+                    .get(nowTickerItemId).getTruleName(), levelList.get(nowVipGroupId)
+                    .getVipLevelName());
         }
 
         startWithPop(mPresenter.sendTickerSuccFragment);
     }
+
+    public void sendSuccBefor(long count) {
+        LogUtils.e("count------------------------->  " + count);
+    }
 }
\ No newline at end of file

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

@@ -66,6 +66,10 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
             mPresenter.searchVip(textView.getText().toString());
             return false;
         });
+        mViewBinding.etSearch.setFocusable(true);
+        mViewBinding.etSearch.setFocusableInTouchMode(true);
+        mViewBinding.etSearch.requestFocus();
+        KeyboardUtils.showSoftInput(mViewBinding.etSearch);
 
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/settle/adapter/ReturnTicketAdapter.java

@@ -30,10 +30,9 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
 
     @Override
     protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) {
-        mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
-                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
-        mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money,
-                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
+//        mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
+//                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
+        mViewBinding.tvTicketMoneys.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt()));
         mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
                 ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
         mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,

app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/VipFragment.java

@@ -40,10 +40,6 @@ public class VipFragment extends BaseFragment<SettlePresenter, FragmentSettleVip
             mPresenter.selectVip(mVipAdapter.getData().get(position));
             this.pop();
         });
-        mViewBinding.llNone.setOnClickListener(view -> {
-            mPresenter.selectVip(Vip.createDefault());
-            this.pop();
-        });
     }
 
     /**
@@ -54,6 +50,10 @@ public class VipFragment extends BaseFragment<SettlePresenter, FragmentSettleVip
     public void loadVips(List<Vip> vips) {
         mViewBinding.setEmpty(vips.size() == 0);
         mVipAdapter.setNewData(vips);
+        if (vips.size() == 1) {
+            mPresenter.selectVip(vips.get(0));
+            this.pop();
+        }
     }
 
 

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

@@ -99,6 +99,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
         viewTicketBinding.tvAmt.setText(ConvertUtil.fenToYuan(ticket.getTicketValAmt(), true));
         viewTicketBinding.setDate(com.blankj.utilcode.util.TimeUtils.date2String(ticket.getUpdateTime()));
         viewTicketBinding.setOrderNo(ticket.getUseOrderNo());
+        viewTicketBinding.setVipName(ticket.getVipName());
 
     }
 
@@ -146,7 +147,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
         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.setOrderNo(vipRechargeOrder.getOrderNo());
+        viewVipRechargeBinding.setCardNo(vipRechargeOrder.getCardNo());
         viewVipRechargeBinding.setVipName(vipRechargeOrder.getVipName());
         viewVipRechargeBinding.setVipTel(vipRechargeOrder.getVipMobile());
         viewVipRechargeBinding.setPayAmt(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtPay(), false));

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

@@ -45,57 +45,60 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
                 mViewBinding.viewLine.setVisibility(View.GONE);
                 FragmentUtils.add(getChildFragmentManager(), mOrderMainFragment, mViewBinding.mainFrame.getId(), false, true);
 
-                mViewBinding.icTitle.edTitle.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-                    @Override
-                    public void onFocusChange(View view, boolean b) {
-                        if (b) {
-                            if (mViewBinding.viewStub.isInflated()) {
-                                mViewBinding.viewStub.getRoot().setVisibility(View.VISIBLE);
-                            } else {
-                                mViewBinding.viewStub.getViewStub().inflate();
-                                ViewSearchPaytypeBinding viewSearchPaytypeBinding = DataBindingUtil.bind(mViewBinding.viewStub.getRoot());
-                                viewSearchPaytypeBinding.setOnClickListener(new OnClickListener() {
-                                    @Override
-                                    protected void myOnClickListener(View v) {
-                                        switch (v.getId()) {
-                                            case R.id.pay_cash:
-                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CASH);
-                                                break;
-                                            case R.id.pay_alipay:
-                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.ALI);
-                                                break;
-                                            case R.id.pay_wechat:
-                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.WECHAT);
-                                                break;
-                                            case R.id.pay_bank:
-                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.BANK);
-                                                break;
-                                            case R.id.pay_vipcard:
-                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CARD);
-                                                break;
-                                            case R.id.pay_tally:
-                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.TALLY);
-                                                break;
-                                        }
-
-
-                                    }
-                                });
-                            }
-
-                        } else {
-                            mViewBinding.viewStub.getRoot().setVisibility(View.GONE);
-                        }
-                    }
-                });
-                mViewBinding.icTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
-                    if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
-                        mPresenter.getSaleOrderList(1, mViewBinding.icTitle.edTitle.getText().toString());
-                        hideSoftInput();
-                    }
-
-                    return false;
-                });
+//                mViewBinding.icTitle.edTitle.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+//                    @Override
+//                    public void onFocusChange(View view, boolean b) {
+//                        if (b) {
+//                            if (mViewBinding.viewStub.isInflated()) {
+//                                mViewBinding.viewStub.getRoot().setVisibility(View.VISIBLE);
+//                            } else {
+//                                mViewBinding.viewStub.getViewStub().inflate();
+//                                ViewSearchPaytypeBinding viewSearchPaytypeBinding = DataBindingUtil.bind(mViewBinding.viewStub.getRoot());
+//                                viewSearchPaytypeBinding.setOnClickListener(new OnClickListener() {
+//                                    @Override
+//                                    protected void myOnClickListener(View v) {
+//                                        switch (v.getId()) {
+//                                            case R.id.pay_cash:
+//                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CASH);
+//                                                break;
+//                                            case R.id.pay_alipay:
+//                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.ALI);
+//                                                break;
+//                                            case R.id.pay_wechat:
+//                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.WECHAT);
+//                                                break;
+//                                            case R.id.pay_bank:
+//                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.BANK);
+//                                                break;
+//                                            case R.id.pay_vipcard:
+//                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CARD);
+//                                                break;
+//                                            case R.id.pay_tally:
+//                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.TALLY);
+//                                                break;
+//                                        }
+//
+//
+//                                    }
+//                                });
+//                            }
+//
+//                        } else {
+//                            mViewBinding.viewStub.getRoot().setVisibility(View.GONE);
+//                        }
+//                    }
+//                });
+//                mViewBinding.icTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
+//                    if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
+//                        mPresenter.getSaleOrderList(1, mViewBinding.icTitle.edTitle.getText().toString());
+//                        hideSoftInput();
+//                    }
+//
+//                    return false;
+//                });
+                mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
+                mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
+                mViewBinding.icTitle.tvTitle.setText("订单列表");
                 mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() {
                     @Override
                     protected void myOnClickListener(View v) {

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

@@ -2,7 +2,13 @@ package com.xingdata.zzdpos.ui.statistics.fragment.order;
 
 
 import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.graphics.Typeface;
+import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.TextView;
 
 import com.blankj.utilcode.util.TimeUtils;
 import com.blankj.utilcode.util.ToastUtils;
@@ -11,7 +17,9 @@ import com.xingdata.zzdpos.base.BaseFragment;
 
 import com.xingdata.zzdpos.databinding.FragmentOrderMainBinding;
 
+import com.xingdata.zzdpos.databinding.ItemStringBinding;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
+import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
 import com.xingdata.zzdpos.ui.statistics.adapter.FragmentStateAdapter;
 import com.xingdata.zzdpos.util.StringUtil;
 
@@ -31,7 +39,7 @@ import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
 
 
-public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrderMainBinding> {
+public class OrderMainFragment extends BaseFragment<StatisticsPresenter, FragmentOrderMainBinding> {
 
     private FragmentStateAdapter mFragmentStateAdapter;
     private List<Long> dateLongs = new ArrayList<>();
@@ -48,6 +56,15 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
         Calendar calendar = Calendar.getInstance();
 //获得当前时间的月份，月份从0开始所以结果要加1
         month = calendar.get(Calendar.MONTH) + 1;
+        mViewBinding.edTitle.setOnKeyListener((v, keyCode, event) -> {
+            if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
+                mPresenter.getSaleOrderList(1, mViewBinding.edTitle.getText().toString());
+                hideSoftInput();
+            }
+
+            return false;
+        });
+
 
         initViewPager();
 
@@ -104,36 +121,65 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
                     for (int i = 0; i < dateLongs.size() - 1; i++) {
                         fragments.add(new OrderListFragment().setDate(dateLongs.get(i), dateLongs.get(i + 1)));
                     }
+                    initTab();
+                }
+            });
 
-                    mFragmentStateAdapter = new FragmentStateAdapter(fragments, getChildFragmentManager());
-                    mViewBinding.viewPagerData.setAdapter(mFragmentStateAdapter);
-                    mViewBinding.tabLayout.setupWithViewPager(mViewBinding.viewPagerData);
-
-                    for (int i = 0; i < fragments.size(); i++) {
-                        if (month == 0) month = 12;
-                        mViewBinding.tabLayout.getTabAt(i).setText(month + "");
-                        month--;
+        } else {
+            initTab();
         }
 
 
     }
-            });
-        } else {
+
+    private void initTab() {
         mFragmentStateAdapter = new FragmentStateAdapter(fragments, getChildFragmentManager());
         mViewBinding.viewPagerData.setAdapter(mFragmentStateAdapter);
         mViewBinding.tabLayout.setupWithViewPager(mViewBinding.viewPagerData);
+        if (mViewBinding.tabLayout.getSelectedTabPosition() != 0) {
             new android.os.Handler().postDelayed(new Runnable() {
                 @Override
                 public void run() {
                     mViewBinding.viewPagerData.setCurrentItem(0, false);
                 }
             }, 1);
+        }
         for (int i = 0; i < fragments.size(); i++) {
             if (month == 0) month = 12;
-                mViewBinding.tabLayout.getTabAt(i).setText(month + "");
+
+            View view = getLayoutInflater().inflate(R.layout.item_string, null);
+            ItemStringBinding itemMenuBottomBinding = DataBindingUtil.bind(view);
+            if (i == 0) {
+                itemMenuBottomBinding.itemTv.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
+            }
+            itemMenuBottomBinding.itemTv.setText(month + "月");
+            itemMenuBottomBinding.itemTv.setPadding(0, 0, 0, 0);
+
+            mViewBinding.tabLayout.getTabAt(i).setCustomView(view);
+
             month--;
         }
+
+        mViewBinding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                TextView textView = (TextView) tab.getCustomView().findViewById(R.id.item_tv);
+                textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
+
             }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+                TextView textView = (TextView) tab.getCustomView().findViewById(R.id.item_tv);
+                textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
+
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+
+            }
+        });
     }
 
 

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

@@ -85,7 +85,7 @@ public class RecyclerViewUtil {
         @Override
         public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
             super.getItemOffsets(outRect, view, parent, state);
-            outRect.top = mDividerHight;
+            outRect.top = mDividerHight + 1;
         }
 
         @Override
@@ -99,7 +99,7 @@ public class RecyclerViewUtil {
         public void drawHorizontalDivider(Canvas c, RecyclerView parent) {
 
             final int childCount = parent.getChildCount();
-            for (int i = 0; i < childCount; i++) {
+            for (int i = 0; i < childCount - 1; i++) {
                 final View child = parent.getChildAt(i);
                 RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
 
@@ -109,8 +109,8 @@ public class RecyclerViewUtil {
                 int bottom = 0;
 
 
-                bottom = child.getTop() - params.topMargin;
-                top = bottom - mDividerHight;
+                top = child.getTop() - params.topMargin;
+                bottom = top + mDividerHight;
                 //画分割线
                 mDividerDarwable.setBounds(left, top, right, bottom);
                 mDividerDarwable.draw(c);

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

@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/black" />
+        android:color="@color/black_likui" />
 
     <solid android:color="@color/all_transparent" />
 </shape>
\ No newline at end of file

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

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

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

@@ -47,7 +47,6 @@
                     android:id="@+id/et_search"
                     style="@style/searchBarEditor"
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:inputType="number"
                     android:labelFor="@+id/et_search"

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

 <?xml version="1.0" encoding="utf-8"?>
 <layout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -12,22 +12,18 @@
             android:id="@+id/ly_title"
             layout="@layout/title_order" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_huanggai" />
 
         <FrameLayout
             android:id="@+id/fragment_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
+            android:layout_below="@id/ly_title">
         </FrameLayout>
-
-    </LinearLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:layout_below="@id/ly_title"
+            android:background="@color/gray_huanggai" />
+    </RelativeLayout>
 
 </layout>
\ No newline at end of file

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

@@ -45,7 +45,6 @@
                     android:id="@+id/et_search"
                     style="@style/searchBarEditor"
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:inputType="number"
                     android:labelFor="@+id/et_search"

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

@@ -49,7 +49,6 @@
                     android:id="@+id/et_search"
                     style="@style/searchBarEditor"
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:inputType="text"
                     android:labelFor="@+id/et_search"

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

@@ -64,10 +64,10 @@
                 style="@style/button_passive"
                 android:layout_width="@dimen/button1_width"
                 android:layout_height="@dimen/button1_height"
+                android:gravity="center"
                 android:stateListAnimator="@null"
                 android:text="@string/settle_print_receipt"
                 android:textSize="@dimen/all_text_size"
-                android:gravity="center"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toLeftOf="@id/btn_return"
@@ -79,9 +79,9 @@
                 style="@style/button_positive"
                 android:layout_width="@dimen/button1_width"
                 android:layout_height="@dimen/button1_height"
+                android:gravity="center"
                 android:stateListAnimator="@null"
                 android:text="@string/pay_return"
-                android:gravity="center"
                 android:textSize="@dimen/all_text_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toRightOf="@id/btn_print"
@@ -90,6 +90,11 @@
                 app:layout_goneMarginStart="@dimen/all_margin_big_big"
                 tools:targetApi="lollipop" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/view_line_L050"
+                android:background="@color/gray_huanggai"
+                app:layout_constraintTop_toTopOf="parent" />
         </android.support.constraint.ConstraintLayout>
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -193,17 +193,15 @@
 
         <TextView
             android:id="@+id/tv_settle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/button2_width"
+            android:layout_height="@dimen/button2_height"
             android:layout_marginEnd="@dimen/all_margin"
             android:background="@drawable/shape_red_round_rectangle_more_round"
             android:foreground="?android:attr/actionBarItemBackground"
-            android:paddingBottom="@dimen/all_spacing"
-            android:paddingEnd="@dimen/all_margin_big"
-            android:paddingStart="@dimen/all_margin_big"
-            android:paddingTop="@dimen/all_spacing"
+            android:gravity="center"
             android:text="@string/store_btn_settle"
             android:textColor="@color/white_caocao"
+            android:textSize="@dimen/all_text_size"
             app:layout_constraintBottom_toTopOf="@id/fl_cart"
             app:layout_constraintRight_toRightOf="@id/fl_cart"
             app:layout_constraintTop_toBottomOf="@id/fl_cart" />

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

@@ -90,8 +90,8 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:paddingBottom="@dimen/all_padding"
-            android:paddingEnd="@dimen/all_padding_left_right"
-            android:paddingStart="@dimen/all_padding_left_right"
+            android:paddingEnd="@dimen/all_bounced_padding"
+            android:paddingStart="@dimen/all_bounced_padding"
             android:paddingTop="@dimen/dp_4"
             android:weightSum="2"
             app:layout_constraintTop_toBottomOf="@id/view1">

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

 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
         <variable
             name="onClickListener"
-            type="android.view.View.OnClickListener"/>
+            type="android.view.View.OnClickListener" />
 
     </data>
 
@@ -21,10 +21,10 @@
         <RelativeLayout
             android:layout_width="@dimen/prompt_dialog_width"
             android:layout_height="@dimen/prompt_dialog_height"
-            android:background="@color/store_back"
+            android:background="@color/white_caocao"
             android:gravity="center"
             android:orientation="vertical"
-            android:paddingTop="@dimen/all_margin">
+          >
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -33,74 +33,92 @@
                 android:gravity="center"
                 android:orientation="vertical">
 
-                <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="@dimen/prompt_dialog_logo_size"
                     android:layout_height="@dimen/prompt_dialog_logo_size"
-                    android:layout_marginTop="@dimen/all_margin"
+                    android:layout_marginTop="@dimen/all_bounced_padding"
                     android:visibility="gone"
-                    app:SpinKit_Color="@color/black"/>
+                    app:SpinKit_Color="@color/black" />
 
                 <ImageView
                     android:id="@+id/iv_logo"
                     android:layout_width="@dimen/prompt_dialog_logo_size"
                     android:layout_height="@dimen/prompt_dialog_logo_size"
                     android:layout_centerHorizontal="true"
-                    android:src="@mipmap/prompt_dialog_success"/>
+                    android:src="@mipmap/prompt_dialog_success" />
 
                 <ScrollView
                     android:layout_width="match_parent"
-                    android:layout_height="70dp">
+                    android:layout_height="@dimen/list2_height">
 
                     <TextView
                         android:id="@+id/tv_text"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/all_margin"
+                        android:layout_marginTop="@dimen/all_bounced_padding"
                         android:gravity="center"
                         android:text="正在处理，请稍后."
-                        android:textColor="@color/succ"
-                        android:textSize="@dimen/text_secondary_title"/>
+                        android:textColor="@color/black_baozheng"
+                        android:textSize="@dimen/all_text_size" />
                 </ScrollView>
 
 
                 <Button
                     android:id="@+id/btn_custom"
                     style="@style/button_positive_allradius"
-                    android:layout_width="@dimen/dialog_button_width"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/all_margin"
-                    android:layout_marginTop="@dimen/all_margin"
-                    android:text="重新获取"/>
+                    android:layout_width="@dimen/button1_width"
+                    android:layout_height="@dimen/button1_height"
+                    android:layout_marginBottom="@dimen/all_bounced_padding"
+                    android:text="重新获取" />
             </LinearLayout>
 
 
-            <LinearLayout
+            <android.support.constraint.ConstraintLayout
                 android:id="@+id/ll_bottom"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/list2_height"
                 android:layout_alignParentBottom="true"
                 android:orientation="horizontal"
                 android:visibility="gone">
 
                 <Button
                     android:id="@+id/btn_cancel"
-                    style="@style/button_positive_bg_gray_noradius"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="取消"/>
+                    style="@style/button_passive"
+                    android:layout_width="@dimen/button1_width"
+                    android:layout_height="@dimen/button1_height"
+                    android:text="取消"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/btn_ok"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <Button
                     android:id="@+id/btn_ok"
-                    style="@style/button_positive_noradius"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="确认"/>
-            </LinearLayout>
+                    style="@style/button_positive"
+                    android:layout_width="@dimen/button1_width"
+                    android:layout_height="@dimen/button1_height"
+                    android:text="确认"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/btn_cancel"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/view_line_L050"
+                    android:background="@color/gray_huanggai"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <View
+                    android:layout_width="@dimen/view_line_L050"
+                    android:layout_height="match_parent"
+                    android:background="@color/gray_huanggai"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </android.support.constraint.ConstraintLayout>
         </RelativeLayout>
 
     </LinearLayout>

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+
+        <variable
+            name="onClickListener"
+            type="android.view.View.OnClickListener"/>
+
+    </data>
+
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:background="@drawable/transparent_border"
+                  android:gravity="center"
+                  android:orientation="vertical">
+
+
+        <RelativeLayout
+            android:layout_width="@dimen/prompt_dialog_width"
+            android:layout_height="@dimen/prompt_dialog_height"
+            android:background="@color/store_back"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_above="@+id/ll_bottom"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/all_bounced_spacing"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="优惠券："
+                        android:textSize="@dimen/all_text_size_low"/>
+
+                    <TextView
+                        android:id="@+id/tv_ticker"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="right"
+                        android:text="50元"
+                        android:textSize="@dimen/all_text_size_small"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/all_bounced_spacing"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="发送对象："
+                        android:textSize="@dimen/all_text_size_low"/>
+
+                    <TextView
+                        android:id="@+id/tv_send_object"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="right"
+                        android:text="全部会员"
+                        android:textSize="@dimen/all_text_size_small"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/all_bounced_spacing"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="发送张数："
+                        android:textSize="@dimen/all_text_size_low"/>
+
+                    <TextView
+                        android:id="@+id/tv_send_count"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="right"
+                        android:text="5张"
+                        android:textSize="@dimen/all_text_size_small"/>
+                </LinearLayout>
+            </LinearLayout>
+
+        </RelativeLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file

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

@@ -19,17 +19,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/gray_zhouyu"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
         tools:context="com.xingdata.zzdhd.ui.manager.ticket.ReturnTicketActivity">
 
         <android.support.constraint.ConstraintLayout
             android:id="@+id/cl_title"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:animateLayoutChanges="true"
             android:background="@color/white_caocao"
-            android:focusableInTouchMode="true"
             app:layout_constraintBottom_toTopOf="@id/btn_add"
             app:layout_constraintTop_toTopOf="parent">
 
@@ -124,7 +120,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/all_padding"
-                android:text="添加获取规则"
+                android:text="添加商品组合"
                 android:textColor="@color/red_guanyu"
                 android:textSize="@dimen/text_three_title"/>
 
@@ -145,7 +141,7 @@
             android:paddingLeft="@dimen/all_padding"
             android:text="共 2 个组合"
             android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/text_secondary_title"
+            android:textSize="@dimen/text_three_title"
             app:layout_constraintTop_toBottomOf="@+id/btn_add"/>
 
         <View

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

@@ -73,7 +73,7 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/singleline_zhouyu_huanggai"
                 android:paddingBottom="@dimen/all_padding"
-                android:paddingStart="@dimen/all_padding_left_right"
+                android:paddingStart="@dimen/all_bounced_padding"
                 android:paddingTop="@dimen/all_padding"
                 android:text="共0人次盘库记录"
                 android:textColor="@color/black_baozheng"

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

@@ -57,7 +57,7 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/singleline_zhouyu_huanggai"
                 android:paddingBottom="@dimen/all_padding"
-                android:paddingStart="@dimen/all_padding_left_right"
+                android:paddingStart="@dimen/all_bounced_padding"
                 android:paddingTop="@dimen/all_padding"
                 android:text="@string/manage_inventory_add_title"
                 android:textColor="@color/black_baozheng"

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

@@ -53,7 +53,7 @@
             android:id="@+id/ll_empty"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:background="@color/white_caocao"
+            android:background="@color/gray_zhouyu"
             android:gravity="center"
             android:orientation="vertical"
             android:visibility="gone"

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

@@ -47,7 +47,7 @@
                 android:id="@+id/user_img"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
-                android:layout_margin="@dimen/all_padding_left_right"
+                android:layout_margin="@dimen/all_bounced_padding"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -111,7 +111,7 @@
                 android:id="@+id/drop_down_fff"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/all_padding_left_right"
+                android:layout_margin="@dimen/all_bounced_padding"
                 android:src="@mipmap/drop_down_fff"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"

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

@@ -5,18 +5,32 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/gray_zhouyu"
+        android:background="@color/white_caocao"
         tools:context="com.example.administrator.tangkupos.CasherFragment">
 
         <!-- TODO: Update blank fragmfragment_integral_indexyout -->
-
+        <EditText
+            android:id="@+id/ed_title"
+            style="@style/searchBarEditor"
+            android:layout_width="match_parent"
+            android:layout_marginEnd="@dimen/all_bounced_padding"
+            android:layout_marginStart="@dimen/all_bounced_padding"
+            android:layout_marginTop="@dimen/padding_small"
+            android:layout_marginBottom="@dimen/padding_small"
+            android:layout_height="30dp"
+            android:drawablePadding="@dimen/all_padding"
+            android:hint="@string/statistics_order_edit_hint"
+            android:inputType="number"
+            android:textColor="@color/black_likui"
+            android:textSize="@dimen/all_text_size_low"
+            android:layout_below="@id/tab_layout"
+            />
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tab_layout"
             android:layout_width="match_parent"
             android:layout_height="30dp"
             android:background="@color/white_caocao"
-            app:tabIndicatorHeight="0dp"
             app:tabMinWidth="100dp"
             app:tabMode="scrollable"
             app:tabSelectedTextColor="#ff7a61"
@@ -27,7 +41,7 @@
             android:id="@+id/viewPager_data"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@id/tab_layout"
+            android:layout_below="@id/ed_title"
             android:layout_marginTop="-1dp"
             android:background="@color/gray">
 
@@ -39,6 +53,10 @@
             android:layout_height="@dimen/view_line_L050"
             android:layout_above="@id/viewPager_data"
             android:background="@color/gray_huanggai" />
-
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:layout_above="@id/ed_title"
+            android:background="@color/gray_huanggai" />
     </RelativeLayout>
 </layout>
\ No newline at end of file

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

@@ -31,13 +31,13 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/view_line_L050"
-            android:layout_marginTop="@dimen/all_padding_left_right"
+            android:layout_marginTop="@dimen/all_bounced_padding"
             android:background="@color/gray_huanggai" />
 
         <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/all_padding_left_right"
+            android:layout_marginBottom="@dimen/all_bounced_padding"
             android:background="@drawable/singleline_white_gray"
             android:paddingBottom="@dimen/all_padding">
 
@@ -47,7 +47,7 @@
                 android:id="@+id/img_goods"
                 android:layout_width="65dp"
                 android:layout_height="65dp"
-                android:layout_marginStart="@dimen/all_padding_left_right"
+                android:layout_marginStart="@dimen/all_bounced_padding"
                 android:layout_marginTop="@dimen/all_padding"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -58,8 +58,8 @@
                 style="@style/other_select_blacktext_style"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/all_padding_left_right"
-                android:layout_marginStart="@dimen/all_padding_left_right"
+                android:layout_marginEnd="@dimen/all_bounced_padding"
+                android:layout_marginStart="@dimen/all_bounced_padding"
                 android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
                 app:layout_constraintStart_toEndOf="@id/img_goods"
                 app:layout_constraintTop_toTopOf="@id/img_goods" />
@@ -112,7 +112,7 @@
                 android:id="@+id/tv_price"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/all_padding_left_right"
+                android:layout_marginEnd="@dimen/all_bounced_padding"
                 android:textColor="@color/red_lvzhi"
                 android:textSize="@dimen/big_text_size"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -155,9 +155,9 @@
             android:background="@color/white_caocao"
             android:drawablePadding="@dimen/all_padding"
             android:drawableStart="@mipmap/icon_stores"
-            android:paddingEnd="@dimen/all_padding_left_right"
-            android:paddingStart="@dimen/all_padding_left_right"
-            android:paddingTop="@dimen/all_padding_left_right"
+            android:paddingEnd="@dimen/all_bounced_padding"
+            android:paddingStart="@dimen/all_bounced_padding"
+            android:paddingTop="@dimen/all_bounced_padding"
             android:text="@{shopName}"
             android:textSize="@dimen/all_text_size_low" />
 
@@ -167,9 +167,9 @@
             android:background="@color/white_caocao"
             android:drawablePadding="@dimen/all_padding"
             android:drawableStart="@mipmap/icon_address"
-            android:paddingEnd="@dimen/all_padding_left_right"
-            android:paddingStart="@dimen/all_padding_left_right"
-            android:paddingTop="@dimen/all_padding_left_right"
+            android:paddingEnd="@dimen/all_bounced_padding"
+            android:paddingStart="@dimen/all_bounced_padding"
+            android:paddingTop="@dimen/all_bounced_padding"
             android:text="@{address}"
             android:textSize="@dimen/all_text_size_low" />
 
@@ -179,10 +179,10 @@
             android:background="@color/white_caocao"
             android:drawablePadding="@dimen/all_padding"
             android:drawableStart="@mipmap/icon_telephone"
-            android:paddingBottom="@dimen/all_padding_left_right"
-            android:paddingEnd="@dimen/all_padding_left_right"
-            android:paddingStart="@dimen/all_padding_left_right"
-            android:paddingTop="@dimen/all_padding_left_right"
+            android:paddingBottom="@dimen/all_bounced_padding"
+            android:paddingEnd="@dimen/all_bounced_padding"
+            android:paddingStart="@dimen/all_bounced_padding"
+            android:paddingTop="@dimen/all_bounced_padding"
             android:text="@{phone}"
             android:textSize="@dimen/all_text_size_low" />
 

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

@@ -15,7 +15,7 @@
             android:id="@+id/srl_product"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@id/ll_title">
+           >
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/recycler_other_selcet"

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

@@ -69,7 +69,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/settle_pay_time"
                         android:textColor="@color/black_zhangfei"
-                        android:textSize="@dimen/all_caption_size" />
+                        android:textSize="@dimen/all_body_size" />
 
                     <TextView
                         android:id="@+id/tv_time"
@@ -77,7 +77,7 @@
                         android:layout_height="wrap_content"
                         android:gravity="end"
                         android:textColor="@color/black_likui"
-                        android:textSize="@dimen/all_caption_size" />
+                        android:textSize="@dimen/all_body_size" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -94,7 +94,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/settle_pay_type"
                         android:textColor="@color/black_zhangfei"
-                        android:textSize="@dimen/all_caption_size" />
+                        android:textSize="@dimen/all_body_size" />
 
                     <TextView
                         android:id="@+id/tv_type"
@@ -102,7 +102,7 @@
                         android:layout_height="wrap_content"
                         android:gravity="end"
                         android:textColor="@color/black_likui"
-                        android:textSize="@dimen/all_caption_size" />
+                        android:textSize="@dimen/all_body_size" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -118,7 +118,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/settle_pay_count"
                         android:textColor="@color/black_zhangfei"
-                        android:textSize="@dimen/all_caption_size" />
+                        android:textSize="@dimen/all_body_size" />
 
                     <TextView
                         android:id="@+id/tv_count"
@@ -126,7 +126,7 @@
                         android:layout_height="wrap_content"
                         android:gravity="end"
                         android:textColor="@color/black_likui"
-                        android:textSize="@dimen/all_caption_size" />
+                        android:textSize="@dimen/all_body_size" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -142,7 +142,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/settle_pay_order_amt"
                         android:textColor="@color/black_zhangfei"
-                        android:textSize="@dimen/all_caption_size" />
+                        android:textSize="@dimen/all_body_size" />
 
                     <TextView
                         android:id="@+id/tv_order_amt"
@@ -150,7 +150,7 @@
                         android:layout_height="wrap_content"
                         android:gravity="end"
                         android:textColor="@color/black_likui"
-                        android:textSize="@dimen/all_caption_size" />
+                        android:textSize="@dimen/all_body_size" />
                 </LinearLayout>
             </LinearLayout>
         </android.support.v7.widget.CardView>

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

@@ -73,16 +73,16 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/ly_title"
-            android:layout_marginTop="@dimen/all_padding_left_right"
+            android:layout_marginTop="@dimen/all_bounced_padding"
             android:background="@color/white_caocao">
 
             <TextView
                 android:id="@+id/tv_supplier_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/all_padding_left_right"
+                android:layout_marginEnd="@dimen/all_bounced_padding"
                 android:paddingBottom="@dimen/all_padding"
-                android:paddingStart="@dimen/all_padding_left_right"
+                android:paddingStart="@dimen/all_bounced_padding"
                 android:paddingTop="@dimen/all_padding"
                 android:text="供货方"
                 android:textColor="@color/black"
@@ -127,8 +127,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingEnd="@dimen/all_padding_left_right"
-                android:paddingStart="@dimen/all_padding_left_right"
+                android:paddingEnd="@dimen/all_bounced_padding"
+                android:paddingStart="@dimen/all_bounced_padding"
                 android:visibility="gone"
                 app:layout_constraintTop_toTopOf="@id/view_line_left_1">
 
@@ -213,9 +213,9 @@
                 android:id="@+id/tv_shop_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/all_padding_left_right"
+                android:layout_marginEnd="@dimen/all_bounced_padding"
                 android:paddingBottom="@dimen/all_padding"
-                android:paddingStart="@dimen/all_padding_left_right"
+                android:paddingStart="@dimen/all_bounced_padding"
                 android:paddingTop="@dimen/all_padding"
                 android:text="定货方"
                 android:textColor="@color/black"
@@ -254,8 +254,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingEnd="@dimen/all_padding_left_right"
-                android:paddingStart="@dimen/all_padding_left_right"
+                android:paddingEnd="@dimen/all_bounced_padding"
+                android:paddingStart="@dimen/all_bounced_padding"
                 android:visibility="gone"
                 app:layout_constraintTop_toBottomOf="@id/tv_shop_title">
 
@@ -355,8 +355,8 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingEnd="@dimen/all_padding_left_right"
-                android:paddingStart="@dimen/all_padding_left_right"
+                android:paddingEnd="@dimen/all_bounced_padding"
+                android:paddingStart="@dimen/all_bounced_padding"
                 android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
                 app:layout_constraintEnd_toEndOf="@id/ll_shop"
                 app:layout_constraintStart_toStartOf="@id/ll_shop"
@@ -384,8 +384,8 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingEnd="@dimen/all_padding_left_right"
-                android:paddingStart="@dimen/all_padding_left_right"
+                android:paddingEnd="@dimen/all_bounced_padding"
+                android:paddingStart="@dimen/all_bounced_padding"
                 android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
                 app:layout_constraintEnd_toEndOf="@id/ll_shop"
                 app:layout_constraintStart_toStartOf="@id/ll_shop"
@@ -494,7 +494,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@drawable/singleline_zhouyu_huanggai"
-                android:padding="@dimen/all_padding_left_right"
+                android:padding="@dimen/all_bounced_padding"
                 android:text="定货明细"
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/all_text_size_small_title"
@@ -513,7 +513,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/view_line_L050"
             android:layout_below="@id/ly_title"
-            android:layout_marginTop="@dimen/all_padding_left_right"
+            android:layout_marginTop="@dimen/all_bounced_padding"
             android:background="@color/gray_huanggai" />
 
         <android.support.v7.widget.RecyclerView
@@ -525,40 +525,32 @@
 
         </android.support.v7.widget.RecyclerView>
 
-        <LinearLayout
+        <android.support.constraint.ConstraintLayout
             android:id="@+id/ll_bottom"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/layout_statistics_bottom_height"
             android:layout_alignParentBottom="true"
             android:layout_alignParentStart="true"
             android:background="@color/white_caocao"
-            android:elevation="@dimen/view_line_L2"
-            android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent">
 
-            <Button
+            <TextView
                 android:id="@+id/btn_cancel"
                 style="@style/button_passive"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/all_padding"
-                android:layout_weight="1"
-                android:stateListAnimator="@null"
+                android:layout_width="@dimen/button1_width"
+                android:layout_height="@dimen/button1_height"
                 android:text="取消"
                 android:textSize="@dimen/all_text_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@id/btn_confirm"
+                app:layout_constraintRight_toLeftOf="@id/btn_ok"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <Button
+            <TextView
                 android:id="@+id/btn_ok"
                 style="@style/button_positive"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/all_padding"
-                android:layout_weight="1"
-                android:stateListAnimator="@null"
+                android:layout_width="@dimen/button1_width"
+                android:layout_height="@dimen/button1_height"
                 android:text="定货提交"
                 android:textSize="@dimen/all_text_size"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -566,7 +558,7 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-        </LinearLayout>
+        </android.support.constraint.ConstraintLayout>
 
         <View
             android:layout_width="match_parent"

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

@@ -32,7 +32,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="300dp"
-                android:layout_margin="@dimen/all_padding"
+                android:layout_margin="@dimen/all_margin"
                 android:background="@color/white"
                 android:orientation="vertical">
 
@@ -136,6 +136,8 @@
             <Button
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/all_margin"
+                android:layout_marginRight="@dimen/all_margin"
                 android:background="@drawable/red_border"
                 android:onClick="@{OnClickListener}"
                 android:text="确 定"

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

@@ -38,9 +38,9 @@
 
         <LinearLayout
             android:id="@+id/ll_top"
-            android:layout_above="@+id/ll_bottom"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_above="@+id/ll_bottom"
             android:orientation="vertical">
 
             <include
@@ -51,15 +51,10 @@
                 android:id="@+id/ll_vip_single"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="1.2"
+                android:layout_weight="2"
                 android:onClick="@{OnClickListener}"
                 android:orientation="vertical">
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/all_line_width"
-                    android:layout_gravity="bottom"
-                    android:background="@color/gray_huanggai"/>
 
                 <android.support.constraint.ConstraintLayout
                     android:id="@+id/cl_vip"
@@ -149,11 +144,19 @@
             <LinearLayout
                 android:id="@+id/ll_all"
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="2"
+                android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:visibility="gone">
 
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/all_margin"
+                    android:layout_marginTop="@dimen/all_margin"
+                    android:paddingLeft="@dimen/all_padding"
+                    android:text="请选择发放对象"
+                    android:textColor="@color/black_baozheng"
+                    android:textSize="@dimen/text_three_title"/>
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/vip_type"
@@ -162,6 +165,15 @@
                     android:background="@color/white"/>
             </LinearLayout>
 
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/all_margin"
+                android:layout_marginTop="@dimen/all_margin"
+                android:paddingLeft="@dimen/all_padding"
+                android:text="请选择要发送的优惠券"
+                android:textColor="@color/black_baozheng"
+                android:textSize="@dimen/text_three_title"/>
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/rl_ticker"
@@ -212,8 +224,8 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:background="@drawable/red_border_allradius"
-                android:text="发券"
                 android:onClick="@{OnClickListener}"
+                android:text="发券"
                 android:textColor="@color/white"
                 android:textSize="@dimen/et_textsize"/>
         </LinearLayout>

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

@@ -61,9 +61,10 @@
                     android:id="@+id/et_search"
                     style="@style/searchBarEditor"
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
+                    android:layout_height="@dimen/all_seach_height"
                     android:layout_weight="1"
                     android:inputType="number"
+                    android:maxLength="11"
                     android:textColor="@color/black_likui"
                     android:textColorHint="@color/gray_huanggai"
                     android:textSize="@dimen/all_text_size"/>

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

@@ -80,7 +80,7 @@
                 <android.support.constraint.ConstraintLayout
                     android:id="@+id/cl_vip"
                     android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
+                    android:layout_height="@dimen/list3_height"
                     android:background="@color/white_caocao"
                     android:foreground="?android:attr/selectableItemBackground">
 
@@ -336,30 +336,18 @@
                             android:paddingStart="@dimen/all_margin" />
                     </LinearLayout>
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/all_line_width"
-                        android:background="@color/gray_huanggai" />
-                </LinearLayout>
-
-
-                <LinearLayout
-                    android:id="@+id/ll_vip"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/all_margin"
-                    android:layout_marginTop="@dimen/all_margin"
-                    android:background="@color/white_caocao"
-                    android:orientation="vertical">
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/all_line_width"
-                        android:background="@color/gray_huanggai" />
+                        android:layout_marginEnd="@dimen/all_margin"
+                        android:layout_marginStart="@dimen/all_margin"
+                        android:background="@color/gray_kongming" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/title_height"
+                        android:background="@color/white_caocao"
                         android:gravity="center"
                         android:paddingEnd="@dimen/all_margin"
                         android:paddingStart="@dimen/all_margin">
@@ -385,9 +373,24 @@
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/all_line_width"
-                        android:layout_marginEnd="@dimen/all_margin"
-                        android:layout_marginStart="@dimen/all_margin"
-                        android:background="@color/gray_kongming" />
+                        android:background="@color/gray_huanggai" />
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:id="@+id/ll_vip"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/all_margin"
+                    android:layout_marginTop="@dimen/all_margin"
+                    android:background="@color/white_caocao"
+                    android:orientation="vertical"
+                    android:visibility="@{defualtVip?View.GONE:View.VISIBLE}">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/all_line_width"
+                        android:background="@color/gray_huanggai" />
 
                     <LinearLayout
                         android:id="@+id/ll_ticket"
@@ -563,16 +566,14 @@
 
                 <TextView
                     android:id="@+id/tv_settle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/button2_width"
+                    android:layout_height="@dimen/button2_height"
                     android:background="@drawable/shape_red_round_rectangle_more_round"
                     android:foreground="?android:attr/actionBarItemBackground"
-                    android:paddingBottom="@dimen/all_spacing"
-                    android:paddingEnd="@dimen/all_margin_big"
-                    android:paddingStart="@dimen/all_margin_big"
-                    android:paddingTop="@dimen/all_spacing"
+                    android:gravity="center"
                     android:text="@string/settle_btn_expand"
-                    android:textColor="@color/white_caocao" />
+                    android:textColor="@color/white_caocao"
+                    android:textSize="@dimen/all_text_size" />
             </LinearLayout>
 
             <View

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

@@ -18,49 +18,6 @@
         android:background="@color/gray_zhouyu"
         android:orientation="vertical">
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/all_line_width"
-            android:layout_gravity="bottom"
-            android:layout_marginTop="@dimen/all_spacing"
-            android:background="@color/gray_huanggai" />
-
-        <LinearLayout
-            android:id="@+id/ll_none"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/title_height"
-            android:background="@color/white_caocao"
-            android:foreground="?android:attr/selectableItemBackground"
-            android:gravity="center"
-            android:paddingEnd="@dimen/all_margin"
-            android:paddingStart="@dimen/all_margin">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/settle_vip_none"
-                android:textColor="@color/black_baozheng"
-                android:textSize="@dimen/all_text_size" />
-
-            <CheckBox
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:button="@mipmap/but_elect02" />
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/all_line_width"
-            android:layout_marginBottom="@dimen/all_margin"
-            android:background="@color/gray_huanggai"
-            android:visibility="@{empty?View.GONE:View.VISIBLE}" />
-
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/all_line_width"
-            android:background="@color/gray_huanggai" />
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/rl_vip"

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

@@ -58,9 +58,9 @@
                     android:orientation="horizontal">
 
                     <View
-                        android:layout_width="@dimen/all_line_width"
+                        android:layout_width="1dp"
                         android:layout_height="match_parent"
-                        android:background="@color/blue"></View>
+                        android:background="@mipmap/line"></View>
 
                     <TextView
                         android:id="@+id/tv_getsms"

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

@@ -5,7 +5,7 @@
 
         <variable
             name="onClickListener"
-            type="android.view.View.OnClickListener" />
+            type="android.view.View.OnClickListener"/>
     </data>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -16,33 +16,34 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:background="@color/white"
             android:orientation="horizontal">
 
             <include
                 android:id="@+id/title_search"
                 layout="@layout/title_search"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
+                android:layout_height="match_parent"
+                android:layout_weight="1"/>
 
             <ImageView
                 android:layout_width="50dp"
                 android:layout_height="match_parent"
-                android:background="@mipmap/swipe_card_bg" />
+                android:background="@mipmap/swipe_card_bg"/>
 
             <ImageView
                 android:id="@+id/onScan"
                 android:layout_width="50dp"
                 android:layout_height="match_parent"
                 android:background="@mipmap/scan_bg"
-                android:onClick="@{onClickListener}" />
+                android:onClick="@{onClickListener}"/>
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_margin="@dimen/view_line_L5"
-            android:background="@color/line1" />
+            android:background="@color/line1"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -58,7 +59,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="本店会员" />
+                android:text="本店会员"/>
 
             <TextView
                 android:id="@+id/vip_count_add_today_title"
@@ -67,7 +68,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="今日新增" />
+                android:text="今日新增"/>
         </LinearLayout>
 
         <LinearLayout
@@ -84,7 +85,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:textSize="22sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"/>
 
             <TextView
                 android:id="@+id/vip_count_add_today"
@@ -94,7 +95,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:textSize="22sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"/>
         </LinearLayout>
 
         <LinearLayout
@@ -118,7 +119,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_margin="5dp"
-                    android:background="@mipmap/add_bg" />
+                    android:background="@mipmap/add_bg"/>
 
                 <TextView
                     style="@style/default_blacktext_bigstyle"
@@ -126,7 +127,7 @@
                     android:layout_height="wrap_content"
                     android:text="添加会员"
                     android:textColor="@color/deep_red"
-                    android:textSize="22sp" />
+                    android:textSize="22sp"/>
             </LinearLayout>
         </LinearLayout>
 
@@ -134,7 +135,7 @@
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_margin="@dimen/view_line_L5"
-            android:background="@color/line1" />
+            android:background="@color/line1"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -169,7 +170,7 @@
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/vipRecyclerView"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
+                        android:layout_height="match_parent"/>
                 </android.support.v4.widget.SwipeRefreshLayout>
             </LinearLayout>
         </LinearLayout>

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

@@ -31,7 +31,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
-                android:paddingBottom="@dimen/all_padding_left_right">
+                android:paddingBottom="@dimen/all_bounced_padding">
 
                 <TextView
                     android:id="@+id/title"

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

@@ -26,8 +26,8 @@
             style="@style/other_select_blacktext_style"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/all_padding_left_right"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginEnd="@dimen/all_bounced_padding"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
             app:layout_constraintStart_toEndOf="@id/iv_pic"
             app:layout_constraintTop_toTopOf="@id/iv_pic"/>
@@ -68,7 +68,7 @@
 
         <TextView
             android:id="@+id/tv_money"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/all_et_money_width"
             android:layout_height="wrap_content"
             android:text="999"
             android:textColor="@color/store_product_price"
@@ -98,9 +98,9 @@
             android:gravity="center"
             android:orientation="horizontal"
             android:visibility="visible"
-            app:layout_constraintLeft_toRightOf="@+id/tv_money"
             app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
-            app:layout_constraintEnd_toEndOf="parent">
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintLeft_toRightOf="@+id/tv_money">
 
             <ImageButton
                 android:id="@+id/btn_down"
@@ -171,7 +171,7 @@
             <EditText
                 android:id="@+id/et_shop_Num_edit"
                 android:layout_width="50dp"
-                android:layout_height="@dimen/textview_height"
+                android:layout_height="match_parent"
                 android:background="@drawable/selector_edit_frame_blue_background"
                 android:digits="1234567890"
                 android:ems="5"
@@ -180,6 +180,8 @@
                 android:lines="1"
                 android:maxLength="2"
                 android:singleLine="true"
+                android:textColor="@color/black"
+                android:textSize="@dimen/all_text_size_low"
                 />
 
 

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

@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:background="@color/white"
                 android:orientation="horizontal"
-                android:padding="@dimen/all_margin">
+                android:padding="@dimen/all_padding">
 
                 <TextView
                     android:id="@+id/tv_vip_title"
@@ -70,7 +70,7 @@
                 android:layout_below="@+id/ll_vip"
                 android:background="@color/white"
                 android:orientation="horizontal"
-                android:padding="@dimen/all_margin">
+                android:padding="@dimen/all_padding">
 
                 <TextView
                     android:id="@+id/tv_source_title"
@@ -101,7 +101,7 @@
                 android:layout_below="@+id/ll_source"
                 android:background="@color/white"
                 android:orientation="horizontal"
-                android:padding="@dimen/all_margin">
+                android:padding="@dimen/all_padding">
 
                 <TextView
                     android:id="@+id/tv_status_title"

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

@@ -20,7 +20,7 @@
             android:id="@+id/img"
             android:layout_width="50dp"
             android:layout_height="50dp"
-            android:layout_margin="@dimen/all_padding_left_right"
+            android:layout_margin="@dimen/all_bounced_padding"
             android:src="@mipmap/img_boss"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -29,7 +29,7 @@
             android:id="@+id/tv_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/all_padding_left_right"
+            android:layout_margin="@dimen/all_bounced_padding"
             android:text=""
             android:textColor="@color/black"
             android:textSize="@dimen/all_text_size"
@@ -41,7 +41,7 @@
             android:id="@+id/tv_phone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/all_padding_left_right"
+            android:paddingStart="@dimen/all_bounced_padding"
             android:text=""
             android:textColor="@color/black"
             android:textSize="@dimen/all_text_size_low"
@@ -53,7 +53,7 @@
             android:id="@+id/view_line"
             android:layout_width="match_parent"
             android:layout_height="@dimen/view_line_L050"
-            android:layout_marginTop="@dimen/all_padding_left_right"
+            android:layout_marginTop="@dimen/all_bounced_padding"
             android:background="@color/gray_kongming"
             app:layout_constraintTop_toBottomOf="@id/img" />
 

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

@@ -10,6 +10,7 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:foreground="?attr/selectableItemBackground"
         android:background="@drawable/singleline_white_gray"
         android:paddingBottom="@dimen/all_padding">
 
@@ -18,7 +19,7 @@
             android:id="@+id/img_goods"
             android:layout_width="65dp"
             android:layout_height="65dp"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:layout_marginTop="@dimen/all_padding"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -29,8 +30,8 @@
             style="@style/other_select_blacktext_style"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/all_padding_left_right"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginEnd="@dimen/all_bounced_padding"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/img_goods"
@@ -61,7 +62,7 @@
             android:id="@+id/tv_goods_size"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/all_padding_left_right"
+            android:layout_marginEnd="@dimen/all_bounced_padding"
             android:background="@drawable/frame_frame_zhouyu_bg"
             android:padding="@dimen/dp_4"
             android:text="规格"
@@ -98,7 +99,7 @@
             android:id="@+id/linearLayout"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/dialog_cart_item_button_height"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:gravity="center"
             android:orientation="horizontal"
             app:layout_constraintStart_toStartOf="parent"
@@ -145,7 +146,7 @@
             style="@style/other_select_smallstyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:layout_marginTop="@dimen/dp_4"
             android:text="构成数量："
             android:textStyle="bold"
@@ -157,7 +158,7 @@
             style="@style/other_select_smallstyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:layout_marginTop="@dimen/all_padding"
             android:text="系统库存："
             android:textStyle="bold"
@@ -191,7 +192,7 @@
             android:id="@+id/btn_ok"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/all_padding_left_right"
+            android:layout_marginEnd="@dimen/all_bounced_padding"
             android:background="@drawable/shape_red_round_rectangle_more_round"
             android:foreground="?android:attr/actionBarItemBackground"
             android:paddingBottom="@dimen/all_spacing"

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

@@ -9,7 +9,7 @@
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/all_padding_left_right"
+        android:layout_marginTop="@dimen/all_bounced_padding"
         android:background="@color/white"
         android:foreground="?android:attr/selectableItemBackground"
         android:orientation="horizontal">
@@ -21,7 +21,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:layout_marginRight="@dimen/all_padding_left_right"
+            android:layout_marginRight="@dimen/all_bounced_padding"
             android:src="@mipmap/right" />
 
         <LinearLayout
@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_toLeftOf="@+id/iv"
             android:paddingBottom="@dimen/all_padding"
-            android:paddingStart="@dimen/all_padding_left_right"
+            android:paddingStart="@dimen/all_bounced_padding"
             android:paddingTop="@dimen/all_padding">
 
             <ImageView

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

@@ -8,6 +8,7 @@
         android:layout_height="wrap_content"
         android:background="@color/white_caocao"
         android:gravity="center"
+        android:foreground="?attr/selectableItemBackground"
         android:orientation="vertical">
 
         <ImageView

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

@@ -19,7 +19,7 @@
             android:id="@+id/img_goods"
             android:layout_width="65dp"
             android:layout_height="65dp"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:layout_marginTop="@dimen/all_padding"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -30,8 +30,8 @@
             style="@style/other_select_blacktext_style"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/all_padding_left_right"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginEnd="@dimen/all_bounced_padding"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
             app:layout_constraintStart_toEndOf="@id/img_goods"
             app:layout_constraintTop_toTopOf="@id/img_goods" />
@@ -73,7 +73,7 @@
             android:id="@+id/tv_shop"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/all_padding_left_right"
+            android:layout_marginEnd="@dimen/all_bounced_padding"
             android:drawableStart="@mipmap/icon_stores"
             android:padding="@dimen/dp_4"
             android:textColor="@color/black_baozheng"

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

@@ -40,6 +40,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:foreground="?attr/selectableItemBackground"
         android:background="@drawable/singleline_white_gray">
 
 
@@ -47,7 +48,7 @@
             android:id="@+id/ll_boss"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:layout_marginTop="@dimen/all_padding"
             android:gravity="center"
             android:padding="@dimen/dp_4"
@@ -86,7 +87,7 @@
             android:id="@+id/ll_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:gravity="center"
             android:padding="@dimen/dp_4"
             app:layout_constraintStart_toStartOf="parent"
@@ -112,7 +113,7 @@
             android:id="@+id/ll_no"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:gravity="center"
             android:padding="@dimen/dp_4"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -12,6 +12,7 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:foreground="?attr/selectableItemBackground"
         android:background="@drawable/singleline_white_gray"
         android:padding="@dimen/all_padding">
 
@@ -26,9 +27,10 @@
             style="@style/other_select_blacktext_style"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/all_padding_left_right"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginEnd="@dimen/all_bounced_padding"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/img_goods"
             app:layout_constraintTop_toTopOf="@id/img_goods" />
 
@@ -61,6 +63,7 @@
             android:padding="@dimen/dp_4"
             android:text="规格"
             android:textSize="@dimen/all_text_size_small"
+            android:layout_marginEnd="@dimen/all_bounced_padding"
             app:layout_constraintBottom_toBottomOf="@id/tv_goods_code"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tv_goods_code" />
@@ -94,6 +97,7 @@
             android:id="@+id/linearLayout"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/dialog_cart_item_button_height"
+            android:layout_marginEnd="@dimen/all_padding"
             android:gravity="center"
             android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
@@ -103,7 +107,7 @@
                 android:id="@+id/btn_down"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginEnd="@dimen/all_margin"
+                android:layout_marginEnd="@dimen/all_padding"
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:src="@mipmap/but_reduce" />
@@ -127,7 +131,7 @@
                 android:id="@+id/btn_up"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginStart="@dimen/all_margin"
+                android:layout_marginStart="@dimen/all_padding"
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:src="@mipmap/but_add"
@@ -158,27 +162,27 @@
             app:layout_constraintStart_toEndOf="@id/tv_goods_code_hint"
             app:layout_constraintTop_toTopOf="@id/tv_stock_hint" />
 
-        <TextView
-            android:id="@+id/tv_traffic_hint"
-            style="@style/other_select_smallstyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_margin_big"
-            android:text="在途："
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="@id/tv_stock"
-            app:layout_constraintStart_toEndOf="@id/tv_stock"
-            app:layout_constraintTop_toTopOf="@id/tv_stock" />
-
-        <TextView
-            android:id="@+id/tv_traffic"
-            style="@style/other_select_smallstyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="0个"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="@id/tv_traffic_hint"
-            app:layout_constraintStart_toEndOf="@id/tv_traffic_hint" />
+        <!--<TextView-->
+            <!--android:id="@+id/tv_traffic_hint"-->
+            <!--style="@style/other_select_smallstyle"-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_marginStart="@dimen/all_margin_big"-->
+            <!--android:text="在途："-->
+            <!--android:textStyle="bold"-->
+            <!--app:layout_constraintBottom_toBottomOf="@id/tv_stock"-->
+            <!--app:layout_constraintStart_toEndOf="@id/tv_stock"-->
+            <!--app:layout_constraintTop_toTopOf="@id/tv_stock" />-->
+
+        <!--<TextView-->
+            <!--android:id="@+id/tv_traffic"-->
+            <!--style="@style/other_select_smallstyle"-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:text="0个"-->
+            <!--android:textStyle="bold"-->
+            <!--app:layout_constraintBottom_toBottomOf="@id/tv_traffic_hint"-->
+            <!--app:layout_constraintStart_toEndOf="@id/tv_traffic_hint" />-->
 
         <TextView
             android:id="@+id/tv_price_hint"

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

@@ -12,20 +12,18 @@
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/all_padding"
                     android:orientation="horizontal">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/all_padding"
             android:orientation="horizontal">
 
             <android.support.constraint.ConstraintLayout
                 android:id="@+id/cl_item"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="2.3">
+                android:layout_weight="1">
 
                 <ImageView
                     android:layout_width="match_parent"
@@ -33,68 +31,39 @@
                     android:background="@mipmap/return_ticket_one"/>
 
                 <LinearLayout
-                    android:id="@+id/ll_top"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:gravity="center"
-                    android:orientation="horizontal"
-                    android:padding="@dimen/all_padding"
-                    app:layout_constraintBottom_toTopOf="@id/ll_bottom"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_weight="4">
+                    android:orientation="horizontal">
 
-                    <ImageView
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="right"
-                        android:layout_weight="1.8"
-                        android:src="@mipmap/bg_return_ticker_logo"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="￥"
+                        android:textStyle="bold"
+                        android:layout_marginTop="@dimen/all_spacing_min"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/all_text_size_low"/>
 
                     <TextView
-                        android:id="@+id/tv_ticket_money"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="5"
+                        android:id="@+id/tv_ticket_moneys"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:text="@string/tv_money"
+                        android:text="123.3"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/text_secondary_title"
+                        android:textSize="@dimen/text_primary_title_smile"
                         android:textStyle="bold"/>
-
                 </LinearLayout>
 
-                <LinearLayout
-                    android:id="@+id/ll_bottom"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:orientation="vertical"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/ll_top"
-                    app:layout_constraintVertical_weight="2">
-
 
-                    <TextView
-                        android:id="@+id/tv_date"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
-                        android:paddingLeft="@dimen/all_margin"
-                        android:text="@string/tv_date"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/et_textsize"/>
-                </LinearLayout>
             </android.support.constraint.ConstraintLayout>
 
             <android.support.constraint.ConstraintLayout
                 android:id="@+id/cl_send"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1">
+                android:layout_weight="2.3">
 
                 <ImageView
                     android:layout_width="match_parent"
@@ -103,19 +72,20 @@
                     />
 
                 <TextView
-                    android:id="@+id/tv_ticket_moneys"
+                    android:id="@+id/tv_rule"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:gravity="center"
-                    android:text="@string/money"
+                    android:paddingTop="@dimen/all_spacing"
+                    android:text="@string/tv_rule"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/text_primary_title_smile"
-                    android:textStyle="bold"
+                    android:textSize="@dimen/big_text_size"
                     app:layout_constraintBottom_toTopOf="@+id/vw_line"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent"/>
 
+
                 <View
                     android:id="@+id/vw_line"
                     android:layout_width="0dp"
@@ -123,19 +93,22 @@
                     android:layout_marginLeft="@dimen/all_padding"
                     android:layout_marginRight="@dimen/all_padding"
                     android:background="@color/gray1"
-                    app:layout_constraintBottom_toTopOf="@id/tv_rule"
+                    app:layout_constraintBottom_toTopOf="@id/tv_date"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tv_ticket_moneys"></View>
+                    app:layout_constraintTop_toBottomOf="@+id/tv_rule"></View>
 
                 <TextView
-                    android:id="@+id/tv_rule"
+                    android:id="@+id/tv_date"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
+                    android:layout_weight="1"
                     android:gravity="center"
-                    android:text="@string/tv_rule"
+                    android:paddingBottom="@dimen/all_spacing"
+                    android:paddingLeft="@dimen/all_margin"
+                    android:text="@string/tv_date"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/et_textsize"
+                    android:textSize="@dimen/dialog_inputPassWord_textsize_small"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
@@ -147,9 +120,9 @@
             android:id="@+id/iv_select"
             android:layout_width="30dp"
             android:layout_height="30dp"
-            android:visibility="gone"
             android:layout_alignParentRight="true"
             android:layout_marginRight="@dimen/all_margin"
-            android:src="@mipmap/but_elect02_stroke"/>
+            android:src="@mipmap/but_elect02_stroke"
+            android:visibility="gone"/>
     </RelativeLayout>
 </layout>
\ No newline at end of file

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

@@ -32,7 +32,7 @@
             android:layout_height="match_parent"
             android:gravity="center"
             android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/all_text_size" />
+            android:textSize="@{selected?@dimen/all_text_size:@dimen/all_body_size}" />
 
     </FrameLayout>
 

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

@@ -17,7 +17,7 @@
             android:maxLines="2"
             android:textColor="@color/black_baozheng"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintHorizontal_weight="5"
+            app:layout_constraintHorizontal_weight="4"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@+id/tv_count"
             app:layout_constraintTop_toTopOf="parent" />

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

@@ -6,21 +6,21 @@
 
         <variable
             name="name"
-            type="String" />
+            type="String"/>
 
         <variable
             name="phone"
-            type="String" />
+            type="String"/>
 
         <variable
             name="disRate"
-            type="String" />
+            type="String"/>
     </data>
 
     <android.support.constraint.ConstraintLayout
         android:id="@+id/cl_vip"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/list3_height"
         android:background="@color/white_caocao"
         android:foreground="?android:attr/selectableItemBackground">
 
@@ -36,7 +36,7 @@
             app:placeholderImage="@mipmap/img_number01"
             app:roundAsCircle="true"
             app:roundingBorderColor="@color/gray_huanggai"
-            app:roundingBorderWidth="@dimen/all_line_width" />
+            app:roundingBorderWidth="@dimen/all_line_width"/>
 
 
         <com.facebook.drawee.view.SimpleDraweeView
@@ -45,7 +45,7 @@
             android:layout_height="@dimen/settle_vip_level"
             app:layout_constraintBottom_toBottomOf="@id/iv_head"
             app:layout_constraintRight_toRightOf="@id/iv_head"
-            app:roundAsCircle="true" />
+            app:roundAsCircle="true"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -61,14 +61,14 @@
                 android:layout_height="wrap_content"
                 android:text="@{name}"
                 android:textColor="@color/black_zhangfei"
-                android:textSize="@dimen/all_text_size" />
+                android:textSize="@dimen/all_text_size"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{phone}"
                 android:textColor="@color/black_likui"
-                android:textSize="@dimen/all_caption_size" />
+                android:textSize="@dimen/all_caption_size"/>
         </LinearLayout>
 
         <TextView
@@ -80,7 +80,7 @@
             android:textSize="@dimen/all_caption_size"
             app:layout_constraintBottom_toTopOf="parent"
             app:layout_constraintRight_toLeftOf="@id/cb_point"
-            app:layout_constraintTop_toBottomOf="parent" />
+            app:layout_constraintTop_toBottomOf="parent"/>
 
         <CheckBox
             android:id="@+id/cb_point"
@@ -91,13 +91,13 @@
             android:contentDescription="@string/settle_balance"
             app:layout_constraintBottom_toTopOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="parent" />
+            app:layout_constraintTop_toBottomOf="parent"/>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/all_line_width"
             android:background="@color/gray_huanggai"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            app:layout_constraintBottom_toBottomOf="parent"/>
     </android.support.constraint.ConstraintLayout>
 
 </layout>

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

@@ -14,7 +14,7 @@
             android:layout_height="45dp"
             android:layout_marginBottom="@dimen/all_padding"
             android:layout_marginEnd="@dimen/all_padding"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:layout_marginTop="@dimen/all_padding"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -47,7 +47,7 @@
             android:id="@+id/tv_left_top"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:paddingEnd="@dimen/all_padding"
             android:text="1231231244124124"
             android:textColor="@color/black_baozheng"

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

@@ -14,7 +14,7 @@
             android:background="@drawable/singleline_zhouyu_huanggai"
             android:gravity="left"
             android:paddingBottom="@dimen/all_padding"
-            android:paddingStart="@dimen/all_padding_left_right"
+            android:paddingStart="@dimen/all_bounced_padding"
             android:paddingTop="@dimen/all_padding"
             android:singleLine="true"
             android:text="北京店"

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

@@ -29,7 +29,7 @@
             android:padding="@dimen/all_padding"
             android:singleLine="true"
             android:text="全部会员"
-            android:textColor="@color/black"
+            android:textColor="@color/black_likui"
             android:textSize="@dimen/et_textsize"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"

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

@@ -29,8 +29,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/all_margin"
-            android:layout_marginEnd="@dimen/all_padding_left_right"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginEnd="@dimen/all_bounced_padding"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:layout_marginTop="@dimen/all_margin"
             android:padding="@dimen/dp_4">
 

app/src/main/res/layout/view_saledetail_header.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">
+<layout>
 
-    <LinearLayout
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
@@ -26,7 +26,7 @@
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="5"
+                android:layout_weight="4"
                 android:gravity="start"
                 android:text="@string/cart_product_name"
                 android:textColor="@color/black_baozheng"

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

@@ -15,6 +15,9 @@
             name="orderNo"
             type="String" />
 
+        <variable
+            name="vipName"
+            type="String" />
 
     </data>
 
@@ -26,8 +29,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/all_margin"
-            android:layout_marginEnd="@dimen/all_padding_left_right"
-            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginEnd="@dimen/all_bounced_padding"
+            android:layout_marginStart="@dimen/all_bounced_padding"
             android:layout_marginTop="@dimen/all_margin">
 
             <android.support.constraint.ConstraintLayout
@@ -35,8 +38,8 @@
                 android:layout_height="wrap_content"
                 android:background="@color/white_caocao"
                 android:paddingBottom="@dimen/dp_4"
-                android:paddingEnd="@dimen/all_padding_left_right"
-                android:paddingStart="@dimen/all_padding_left_right"
+                android:paddingEnd="@dimen/all_bounced_padding"
+                android:paddingStart="@dimen/all_bounced_padding"
                 android:paddingTop="@dimen/dp_4"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -95,92 +98,81 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="horizontal"
-                            android:paddingBottom="@dimen/all_padding"
-                            android:paddingEnd="@dimen/dp_4"
-                            android:paddingStart="@dimen/dp_4"
-                            android:paddingTop="@dimen/dp_4"
-                            android:weightSum="10">
-
-                            <LinearLayout
-
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="7"
-                                android:orientation="vertical">
+                            android:weightSum="3">
 
                             <TextView
                                 style="@style/textView_body_small"
-                                    android:layout_width="wrap_content"
+                                android:layout_width="0dp"
                                 android:layout_height="wrap_content"
+                                android:layout_weight="1"
                                 android:singleLine="true"
-                                    android:text="@string/ticket_detail_date"
+                                android:text="会员名："
                                 android:textSize="@dimen/all_text_size_low" />
 
                             <TextView
                                 style="@style/textView_body_small"
-                                    android:layout_width="wrap_content"
+                                android:layout_width="0dp"
                                 android:layout_height="wrap_content"
+                                android:layout_weight="2"
+                                android:gravity="right|center_vertical"
                                 android:singleLine="true"
-                                    android:text="@string/ticket_detail_no"
-                                    android:textSize="@dimen/all_text_size_low" />
-
-
+                                android:text="@{vipName}"
+                                android:textColor="@color/black_likui" />
                         </LinearLayout>
 
                         <LinearLayout
                             android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:layout_weight="3"
-                                android:gravity="right"
-                                android:orientation="vertical"
-                                android:weightSum="2">
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:weightSum="3">
 
                             <TextView
                                 style="@style/textView_body_small"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="0dp"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
                                 android:layout_weight="1"
-                                    android:gravity="right|center_vertical"
                                 android:singleLine="true"
-                                    android:text="@{date}"
-                                    android:textColor="@color/black_likui" />
+                                android:text="使用时间："
+                                android:textSize="@dimen/all_text_size_low" />
 
                             <TextView
                                 style="@style/textView_body_small"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="0dp"
-                                    android:layout_weight="1"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="2"
                                 android:gravity="right|center_vertical"
                                 android:singleLine="true"
-                                    android:text="@{orderNo}"
+                                android:text="@{date}"
                                 android:textColor="@color/black_likui" />
-
-
-                            </LinearLayout>
-
                         </LinearLayout>
 
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="@dimen/view_line_L1"
-                            android:background="@color/gray_zhouyu" />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="@dimen/view_line_L1"
-                            android:background="@color/gray_zhouyu" />
-
                         <LinearLayout
-                            android:id="@+id/ll_goods_list"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="@dimen/all_padding"
-                            android:orientation="vertical"
-                            android:padding="@dimen/dp_4"
-                            android:visibility="gone">
+                            android:orientation="horizontal"
+                            android:weightSum="3">
 
+                            <TextView
+                                style="@style/textView_body_small"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:singleLine="true"
+                                android:text="销售单号："
+                                android:textSize="@dimen/all_text_size_low" />
+
+                            <TextView
+                                style="@style/textView_body_small"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="2"
+                                android:gravity="right|center_vertical"
+                                android:singleLine="true"
+                                android:text="@{orderNo}"
+                                android:textColor="@color/black_likui" />
                         </LinearLayout>
 
+
                     </LinearLayout>
 
 

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

@@ -127,7 +127,7 @@
 
     <color name="gray_zhouyu">#f6f6f6</color>
     <color name="gray_huanggai">#afb9c3</color>
-    <color name="gray_kongming">#e6e6e6</color>
+    <color name="gray_kongming">#dddddd</color>
 
     <color name="white_caocao">#ffffff</color>
 

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

@@ -8,6 +8,9 @@
     <dimen name="all_margin_big_big">40dp</dimen>
     <dimen name="all_margin_big">28dp</dimen>
     <dimen name="all_spacing">8dp</dimen>
+    <dimen name="all_spacing_min">5dp</dimen>
+    <dimen name="all_bounced_spacing">6dp</dimen>
+    <dimen name="all_bounced_padding">16dp</dimen>
     <dimen name="all_sub_title_size">20sp</dimen>
     <dimen name="big_text_size">18sp</dimen>
     <dimen name="big_big_text_size">20sp</dimen>
@@ -24,7 +27,6 @@
     <dimen name="all_title_size">26sp</dimen>
     <dimen name="all_padding">10dp</dimen>
     <dimen name="all_seach_height">36dp</dimen>
-    <dimen name="all_padding_left_right">16dp</dimen>
     <dimen name="Minus_padding_left_right">-17dp</dimen>
     <dimen name="all_text_size_big">22sp</dimen>
     <dimen name="all_text_size_big_big">30sp</dimen>
@@ -39,6 +41,8 @@
     <dimen name="all_button_radius_height_min">35dp</dimen>
     <dimen name="all_button_radius_width">120dp</dimen>
     <dimen name="all_button_radius_height">40dp</dimen>
+    <!--金额显示框-->
+    <dimen name="all_et_money_width">100dp</dimen>
     <!--RADIUS-->
     <dimen name="card_radius_medium">14dp</dimen>
     <!--PADDING-->
@@ -65,8 +69,8 @@
     <dimen name="dialog_button_width">190dp</dimen>
     <!--提示对话框-->
     <dimen name="prompt_dialog_width">300dp</dimen>
-    <dimen name="prompt_dialog_height">250dp</dimen>
-    <dimen name="prompt_dialog_logo_size">64dp</dimen>
+    <dimen name="prompt_dialog_height">200dp</dimen>
+    <dimen name="prompt_dialog_logo_size">48dp</dimen>
     <!--商品页面-->
     <integer name="fragment_store_product_item_span_count">4</integer>
     <integer name="fragment_store_group_item_span_count">7</integer>
@@ -109,7 +113,7 @@
     <dimen name="et_width">270dp</dimen>
     <dimen name="et_height">44dp</dimen>
     <dimen name="et_textsize">16sp</dimen>
-    <dimen name="et_padding">12dp</dimen>
+    <dimen name="et_padding">10dp</dimen>
     <dimen name="et_margin_logo">44dp</dimen>
     <dimen name="et_margin_edittext">20dp</dimen>
     <dimen name="drop_down_margin_right_et">20dp</dimen>
@@ -215,8 +219,7 @@
     <!--统计条目-->
     <dimen name="item_statistics_height">72dp</dimen>
     <dimen name="layout_statistics_bottom_height">56dp</dimen>
-    <dimen name="layout_statistics_bottom_button_height">35dp</dimen>
-    <dimen name="layout_statistics_bottom_button_width">105dp</dimen>
+
 
     <!--新标准-->
     <dimen name="headline">20dp</dimen>
@@ -234,6 +237,15 @@
     <dimen name="button3_height">44dp</dimen>
     <dimen name="button3_marginHorizontal">16dp</dimen>
     <dimen name="button3_width">328dp</dimen>
+
+
+    <dimen name="list1_height">48dp</dimen>
+    <dimen name="list2_height">56dp</dimen>
+    <dimen name="list3_height">72dp</dimen>
+    <dimen name="list4_height">90dp</dimen>
+    <dimen name="list5_height">100dp</dimen>
+
+
     <!--交班-->
     <dimen name="handover_amt_size">34sp</dimen>
 

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

@@ -88,7 +88,7 @@
     <string name="cart_product_price">单价</string>
     <string name="cart_product_amt">小计</string>
     <string name="cart_count">总数:</string>
-    <string name="cart_amt">总计:</string>
+    <string name="cart_amt">总计</string>
     <string name="cart_pay">应收:</string>
     <string name="cart_dis">优惠:</string>
     <string name="cart_dis_list">优惠项目:</string>
@@ -562,7 +562,7 @@
     <string name="settle_pay_order_amt">合计金额</string>
     <string name="settle_retry">重新支付</string>
     <string name="settle_complete">完成</string>
-    <string name="settle_auth_amt">总计</string>
+    <string name="settle_auth_amt">合计</string>
     <string name="settle_ticket">优惠券</string>
     <string name="settle_ticket_text">张可用</string>
     <string name="settle_point">积分抵扣</string>
@@ -672,6 +672,7 @@
     <!--商品详情POS-->
     <string name="oder_detail_date">交易时间:</string>
     <string name="oder_detail_no">订单号:</string>
+    <string name="oder_detail_card_no">卡号:</string>
     <string name="oder_detail_oper">收银员:</string>
     <string name="oder_detail_payType">收款方式:</string>
     <string name="oder_detail_goodsNum">商品总数:</string>