Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/modules.xml

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/TangKuPos.iml" filepath="$PROJECT_DIR$/.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://D:\AndroidStudioProject\TangKuPos\.idea\TangKuPos.iml" filepath="D:\AndroidStudioProject\TangKuPos\.idea\TangKuPos.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />

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

@@ -27,7 +27,7 @@ import java.util.List;
 public class InventoryActivity extends BaseActivity<InventoryPresenter, ActivityInventoryBinding> implements InventoryContract.View {
     private InventoryFragment mInventoryFragment = new InventoryFragment();
     private ManageDateFragment mManageDateFragment = new ManageDateFragment();
-    private InventoryAddFragment mInventoryAddFragment = new InventoryAddFragment();
+    private InventoryAddFragment mInventoryAddFragment;
     LoadingDialog mLoadingDialog = new LoadingDialog();
 
     @Override
@@ -107,6 +107,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
 
     @Override
     public void openInventoryAddFragment(Cs cs) {
+        mInventoryAddFragment = new InventoryAddFragment();
         mInventoryAddFragment.setCs(cs);
         start(mInventoryAddFragment);
     }

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

@@ -180,9 +180,14 @@ public class InventoryPresenter extends InventoryContract.Presenter {
         ApiFactory.Cs.querCsList(pageNum, nowPageSize, start, end).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(csPager -> {
                     //判断是否能加载更多
+                    if (csPager.getList().size() == 0) {
+                        ToastUtils.showShort("没有盘库记录");
+                    } else {
                         mView.loadCs(csPager, start, end);
                         mView.setInventoryCount(com.blankj.utilcode.util.TimeUtils.millis2String(start, new SimpleDateFormat(StringUtil.defaultDatePattern)) + " ~ " +
-                            com.blankj.utilcode.util.TimeUtils.millis2String(end, new SimpleDateFormat(StringUtil.defaultDatePattern)));
+                                com.blankj.utilcode.util.TimeUtils.millis2String(end - 86400000L, new SimpleDateFormat(StringUtil.defaultDatePattern)));
+                    }
+
 
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());

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

 package com.xingdata.zzdpos.ui.manage.inventory.fragment;
 
+import android.graphics.drawable.Drawable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.KeyEvent;
 import android.view.View;
@@ -21,6 +22,7 @@ import com.xingdata.zzdpos.ui.manage.inventory.InventoryPresenter;
 import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryGoodsAdapter;
 import com.xingdata.zzdpos.ui.manage.inventory.dialog.CsCartDialog;
 import com.xingdata.zzdpos.util.OnClickListener;
+import com.xingdata.zzdpos.util.RecyclerViewUtil;
 
 
 import java.util.ArrayList;
@@ -135,6 +137,8 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
             }
 
         });
+        Drawable drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
+        mViewBinding.recyclerView.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
         mViewBinding.recyclerView.setAdapter(mInventoryGoodsAdapter);
 
     }

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

@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.manage.inventory.fragment;
 
 import android.databinding.DataBindingUtil;
 import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.Html;
@@ -26,7 +27,9 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.dialog.PromptDialog;
 import com.xingdata.zzdpos.ui.manage.inventory.InventoryPresenter;
 import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryAdapter;
+import com.xingdata.zzdpos.util.MyMenuItemDecoration;
 import com.xingdata.zzdpos.util.OnClickListener;
+import com.xingdata.zzdpos.util.RecyclerViewUtil;
 import com.xingdata.zzdpos.util.StringUtil;
 
 
@@ -46,7 +49,6 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
     private Long end;
 
 
-
     @Override
     public int getLayoutId() {
         return R.layout.fragment_inventory;
@@ -67,7 +69,11 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
         mViewBinding.recyclerInventory.setLayoutManager(new LinearLayoutManager(getActivity()));
         mInventoryAdapter = new InventoryAdapter(new ArrayList<>());
         mInventoryAdapter.setEmptyView(getEmptyView());
-        mViewBinding.recyclerInventory.setAdapter(mInventoryAdapter);
+        Drawable drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
+
+        mInventoryAdapter.bindToRecyclerView( mViewBinding.recyclerInventory);
+        mViewBinding.recyclerInventory.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
+
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
         mInventoryAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.recyclerInventory);
         mInventoryAdapter.setOnItemClickListener((adapter, view, position) -> {
@@ -156,6 +162,12 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
         if (pager.isLastPage()) mInventoryAdapter.loadMoreEnd(isRefresh);
         else mInventoryAdapter.loadMoreComplete();
 
+        if (mInventoryAdapter.getData().size() == 0) {
+            mViewBinding.tvCount.setVisibility(View.GONE);
+        } else {
+            mViewBinding.tvCount.setVisibility(View.VISIBLE);
+        }
+
     }
 
 
@@ -167,8 +179,6 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
     }
 
 
-
-
     public void setDate(long start, long end) {
         this.start = start;
         this.end = end;

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

 package com.xingdata.zzdpos.ui.manage.otherselect;
 
+import android.text.InputType;
 import android.view.KeyEvent;
 import android.view.View;
 
@@ -30,6 +31,7 @@ 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);
         FragmentUtils.add(getSupportFragmentManager(), mOtherListFragment, mViewBinding.fragmentContainer.getId(), false, true);
         mViewBinding.lyTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
             if (keyCode == KeyEvent.KEYCODE_ENTER)

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

@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.manage.otherselect.fragment;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.KeyEvent;
@@ -20,6 +21,7 @@ import com.xingdata.zzdpos.model.Ossku;
 import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.ui.manage.otherselect.OtherSelectPresenter;
 import com.xingdata.zzdpos.ui.manage.otherselect.adpter.OtherSelectAdapter;
+import com.xingdata.zzdpos.util.RecyclerViewUtil;
 
 
 import java.util.ArrayList;
@@ -46,7 +48,8 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
         mOtherSelectAdapter.setEmptyView(getEmptyView(R.string.empty_other_select));
         mViewBinding.recyclerOtherSelcet.setLayoutManager(new LinearLayoutManager(getActivity()));
         mViewBinding.recyclerOtherSelcet.setAdapter(mOtherSelectAdapter);
-
+        Drawable drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
+        mViewBinding.recyclerOtherSelcet.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
 
         mOtherSelectAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
@@ -84,12 +87,16 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
         else if (pager.getList().size() > 0) mOtherSelectAdapter.addData(pager.getList());
         if (pager.isLastPage()) mOtherSelectAdapter.loadMoreEnd(isRefresh);
         else mOtherSelectAdapter.loadMoreComplete();
+        if (mOtherSelectAdapter.getData().size() == 0) {
+            mViewBinding.viewLine.setVisibility(View.GONE);
+        } else {
+            mViewBinding.viewLine.setVisibility(View.VISIBLE);
+        }
 
     }
 
     private View getEmptyView(int resHint) {
         View view = getLayoutInflater().inflate(R.layout.view_empty, null);
-        view.setBackgroundResource(R.color.white_caocao);
         ((TextView) view.findViewById(R.id.tv_empty)).setText(resHint);
         return view;
     }

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

@@ -55,13 +55,19 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
     public void initView() {
         mViewBinding.lyTitle.edTitle.setHint(R.string.inventory_add_et_hint);
         mViewBinding.lyTitle.edTitle.setText("");
-        Drawable drawableTop = getResources().getDrawable(R.mipmap.but_up);
-        Drawable drawableBottom = getResources().getDrawable(R.mipmap.but_unfurled);
+        Drawable drawableTop = getResources().getDrawable(R.mipmap.but_unfurled);
+        Drawable drawableBottom = getResources().getDrawable(R.mipmap.but_up);
         drawableTop.setBounds(0, 0, (int) mViewBinding.tvShopTitle.getTextSize() - 10, (int) mViewBinding.tvShopTitle.getTextSize() - 10);
         drawableBottom.setBounds(0, 0, (int) mViewBinding.tvShopTitle.getTextSize() - 10, (int) mViewBinding.tvShopTitle.getTextSize() - 10);
         mViewBinding.tvShopTitle.setCompoundDrawables(null, null, drawableTop, null);
         mViewBinding.tvSupplierTitle.setCompoundDrawables(null, null, drawableTop, null);
         initRecycycler();
+        mViewBinding.lyTitle.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                pop();
+            }
+        });
         mViewBinding.tvShopTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {

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

@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.manage.replenishment.fragment;
 
 
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
@@ -23,6 +24,7 @@ import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentPresenter;
 import com.xingdata.zzdpos.ui.manage.replenishment.adpter.ReplenishmentAdapter;
 import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderGroupAdapter;
+import com.xingdata.zzdpos.util.RecyclerViewUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,15 +44,17 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
 
     @Override
     public void initView() {
+        Drawable drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
         if (mReplenishmentAdapter == null) {
             mReplenishmentAdapter = new ReplenishmentAdapter(new ArrayList<>());
             mViewBinding.recycler.setLayoutManager(new LinearLayoutManager(getActivity()));
             mViewBinding.recycler.setAdapter(mReplenishmentAdapter);
-
+            mViewBinding.recycler.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
         } else {
 
             mViewBinding.recycler.setLayoutManager(new LinearLayoutManager(getActivity()));
             mViewBinding.recycler.setAdapter(mReplenishmentAdapter);
+            mViewBinding.recycler.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
         }
 
         mReplenishmentAdapter.setOnItemClickListener((adapter, view, position) -> {
@@ -63,7 +67,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
         });
 
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
-        setData(psbArrayList,true);
+        setData(psbArrayList, true);
     }
 
     private void onRefresh() {
@@ -85,8 +89,8 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
      * @param isRefresh 是否刷新
      */
     public void setData(List<Psb> psbList, boolean isRefresh) {
-         if (mReplenishmentAdapter==null){
-             this.psbArrayList=psbList;
+        if (mReplenishmentAdapter == null) {
+            this.psbArrayList = psbList;
             return;
         }
 
@@ -106,13 +110,14 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
 
     }
 
-    public void setData(List<Psb> psbList){
-        this.psbArrayList=psbList;
+    public void setData(List<Psb> psbList) {
+        this.psbArrayList = psbList;
 
     }
+
     public void searchSucc(String wd) {
         List<Psb> psbs = new ArrayList<>();
-        if (psbArrayList .size()==0) {
+        if (psbArrayList.size() == 0) {
             return;
         }
         for (Psb psb : psbArrayList) {

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

@@ -8,6 +8,7 @@ import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivitySsskuBinding;
+import com.xingdata.zzdpos.model.Cor;
 import com.xingdata.zzdpos.model.Sskugrp;
 import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
@@ -68,6 +69,8 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     public void loadSkugrps(List<Sskugrp> sskugrps) {
         mManagerFragment.loadSkugrps(sskugrps);
         mSkugrpFragment.loadSkugrps(sskugrps);
+        mDetailFragment.loadSkugrps(sskugrps);
+        mEditorFragment.loadSkugrps(sskugrps);
     }
 
     @Override
@@ -90,6 +93,12 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
         mSearchFragment.loadSkus(skus, isRefresh);
     }
 
+    @Override
+    public void loadCors(List<Cor> cors) {
+        mDetailFragment.loadCors(cors);
+        mEditorFragment.loadCors(cors);
+    }
+
     @Override
     public void showSearchFragment(int searchType) {
         if (mSearchFragment.isAdded()) return;
@@ -101,7 +110,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     public void showEditorFragment(Sssku sku) {
         this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
         mViewBinding.tvTitle.setText(R.string.sssku_update);
-        this.start(mEditorFragment);
+        this.start(mEditorFragment.setSssku(sku));
     }
 
     @Override
@@ -115,7 +124,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     public void showDetailFragment(Sssku sku) {
         this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_DETAIL);
         mViewBinding.tvTitle.setText(R.string.sssku_detail);
-        this.start(mDetailFragment);
+        this.start(mDetailFragment.setSssku(sku));
     }
 
     @Override
@@ -128,13 +137,13 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     @Override
     public void backToEditFragment() {
         this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
-        this.popTo(EditorFragment.class, false);
+        this.pop();
     }
 
     @Override
     public void backToManagerFragment() {
         this.showTitleBarByTitleMode(C.TITLE_MODE.SKU);
-        this.popTo(ManagerFragment.class, false);
+        this.pop();
         this.resetSearchBar();
     }
 

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

@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.manage.sssku;
 
 import com.xingdata.zzdpos.base.BasePresenter;
 import com.xingdata.zzdpos.base.BaseView;
+import com.xingdata.zzdpos.model.Cor;
 import com.xingdata.zzdpos.model.Sskugrp;
 import com.xingdata.zzdpos.model.Sssku;
 
@@ -53,6 +54,13 @@ public interface SsskuContract {
          */
         void loadSearchResult(List<Sssku> skus, boolean isRefresh);
 
+        /**
+         * 加载供应商列表
+         *
+         * @param cors 供应商列表
+         */
+        void loadCors(List<Cor> cors);
+
         /**
          * 显示搜索页面
          */

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

@@ -15,6 +15,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
 
     @Override
     public void onAttached() {
+        getCor();
     }
 
     @Override
@@ -40,7 +41,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
 
     @Override
     public void clickSku(Sssku sssku) {
-        mView.showDetailFragment(sssku);
+        clickSku(sssku, C.TITLE_MODE.SKU);
     }
 
     @Override
@@ -84,7 +85,17 @@ public class SsskuPresenter extends SsskuContract.Presenter {
     public void clickSku(Sssku sssku, int searchType) {
         switch (searchType) {
             case C.TITLE_MODE.SKU:
-                mView.showDetailFragment(sssku);
+                mView.showLoadingDialog();
+                mCompositeDisposable.add(
+                        ApiFactory.Sssku.detailSssku(sssku.getId())
+                                .doFinally(() -> mView.dismissLoadingDialog())
+                                .subscribe(
+                                        sssku1 -> {
+                                            mView.showDetailFragment(sssku1);
+                                        },
+                                        throwable -> {
+                                        })
+                );
                 break;
             case C.TITLE_MODE.PKG:
                 break;
@@ -195,4 +206,13 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                 ApiFactory.Psb.preOrder().subscribe(ssskuPager -> mView.loadReplenishCount(ssskuPager.getTotalRow()))
         );
     }
+
+    /**
+     * 获取供货商
+     */
+    private void getCor() {
+        mCompositeDisposable.add(
+                ApiFactory.Cor.queryAll().subscribe(cors -> mView.loadCors(cors))
+        );
+    }
 }

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

@@ -4,13 +4,20 @@ package com.xingdata.zzdpos.ui.manage.sssku.fragment;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentSsskuDetailBinding;
+import com.xingdata.zzdpos.model.Cor;
+import com.xingdata.zzdpos.model.Sskugrp;
 import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class DetailFragment extends BaseFragment<SsskuPresenter, FragmentSsskuDetailBinding> {
 
     private Sssku mSssku;
+    private List<Sskugrp> mSskugrps;
+    private List<Cor> mCors;
 
     @Override
     public int getLayoutId() {
@@ -19,10 +26,44 @@ public class DetailFragment extends BaseFragment<SsskuPresenter, FragmentSsskuDe
 
     @Override
     public void initView() {
-//        mViewBinding.tv.setOnClickListener(view -> {
-//            this.pop();
-//            mPresenter.clickEditSku(mSssku);
-//        });
+        mViewBinding.ivPic.setImageURI(mSssku.getSpuImg());
+        mViewBinding.setSku(mSssku);
+
+        for (int i = 0; i < mSskugrps.size(); i++) {
+            if (mSskugrps.get(i).getSkuGrpId().longValue() == mSssku.getSkuGrpId()) {
+                mViewBinding.setSkugrpName(mSskugrps.get(i).getSkuGrpName());
+                break;
+            }
+        }
+
+        for (int i = 0; i < mCors.size(); i++) {
+            if (mCors.get(i).getChannelMapId().longValue() == mSssku.getChannelMapId()) {
+                mViewBinding.setChannelName(mCors.get(i).getChannelName());
+                break;
+            }
+        }
+        if (mSssku.getSkuFlag() == 1) {
+
+        }
+    }
+
+    /**
+     * 加载商品分组
+     *
+     * @param sskugrps 分组信息
+     */
+    public void loadSkugrps(List<Sskugrp> sskugrps) {
+        mSskugrps = new ArrayList<>();
+        mSskugrps.addAll(sskugrps);
+    }
+
+    /**
+     * 加载供应商
+     *
+     * @param cors 供应商
+     */
+    public void loadCors(List<Cor> cors) {
+        this.mCors = cors;
     }
 
     /**

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

@@ -4,14 +4,22 @@ package com.xingdata.zzdpos.ui.manage.sssku.fragment;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentSsskuEditorBinding;
+import com.xingdata.zzdpos.model.Cor;
+import com.xingdata.zzdpos.model.Sskugrp;
 import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class EditorFragment extends BaseFragment<SsskuPresenter, FragmentSsskuEditorBinding> {
 
     private Sssku mSssku;
 
+    private List<Sskugrp> mSskugrps;
+    private List<Cor> mCors;
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_sssku_editor;
@@ -23,6 +31,25 @@ public class EditorFragment extends BaseFragment<SsskuPresenter, FragmentSsskuEd
 
     }
 
+    /**
+     * 加载商品分组
+     *
+     * @param sskugrps 分组信息
+     */
+    public void loadSkugrps(List<Sskugrp> sskugrps) {
+        mSskugrps = new ArrayList<>();
+        mSskugrps.addAll(sskugrps);
+    }
+
+    /**
+     * 加载供应商
+     *
+     * @param cors 供应商
+     */
+    public void loadCors(List<Cor> cors) {
+        this.mCors = cors;
+    }
+
     /**
      * 设置商品
      *

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

@@ -193,6 +193,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
 
             for (Saledetail saledetail : mSaleorder.getSaledetailList()) {
                 View view = LayoutInflater.from(this).inflate(R.layout.item_settle_saledetail, null);
+                view.setPadding(20, 20, 20, 20);
                 ItemSettleSaledetailBinding itemSettleSaledetailBinding = DataBindingUtil.bind(view);
                 itemSettleSaledetailBinding.tvAmt.setText("￥" + saledetail.getSubtotal());
                 itemSettleSaledetailBinding.tvCount.setText(saledetail.getCnt());

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

@@ -158,7 +158,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
             FragmentUtils.add(getChildFragmentManager(), mOrderSearchFragment, mViewBinding.mainFrame.getId(), false, true);
         } else {
             mOrderSearchFragment.setType(OrderSearchFragment.PAYTYPE);
-            mOrderSearchFragment.setData(saleorderPager, saleorderPager.isFirstPage());
+            mOrderSearchFragment.setData(saleorderPager);
         }
     }
 
@@ -171,7 +171,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
             FragmentUtils.add(getChildFragmentManager(), mOrderSearchFragment, mViewBinding.mainFrame.getId(), false, true);
         } else {
             mOrderSearchFragment.setType(OrderSearchFragment.WD);
-            mOrderSearchFragment.setData(saleorderPager, saleorderPager.isFirstPage());
+            mOrderSearchFragment.setData(saleorderPager);
         }
 
     }
@@ -185,7 +185,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
             FragmentUtils.add(getChildFragmentManager(), mOrderSearchFragment, mViewBinding.mainFrame.getId(), false, true);
         } else {
             mOrderSearchFragment.setType(OrderSearchFragment.DATE);
-            mOrderSearchFragment.setData(saleorderPager, saleorderPager.isFirstPage());
+            mOrderSearchFragment.setData(saleorderPager);
         }
     }
 
@@ -196,7 +196,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
             FragmentUtils.add(getChildFragmentManager(), mRechargeSearchFragment, mViewBinding.mainFrame.getId(), false, true);
         } else {
             mRechargeSearchFragment.setType(OrderSearchFragment.DATE);
-            mRechargeSearchFragment.setData(vipRechargeOrderPager, vipRechargeOrderPager.isFirstPage());
+            mRechargeSearchFragment.setData(vipRechargeOrderPager);
         }
     }
 
@@ -206,7 +206,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
             FragmentUtils.add(getChildFragmentManager(), mTicketSearchFragment, mViewBinding.mainFrame.getId(), false, true);
         } else {
             mTicketSearchFragment.setType(OrderSearchFragment.DATE);
-            mTicketSearchFragment.setData(ticketPager, ticketPager.isFirstPage());
+            mTicketSearchFragment.setData(ticketPager);
         }
     }
 

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

@@ -6,6 +6,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 
 import com.blankj.utilcode.util.ActivityUtils;
+import com.blankj.utilcode.util.TimeUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
@@ -15,13 +16,23 @@ import com.xingdata.zzdpos.model.VipRechargeOrder;
 import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
 import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderAdapter;
+import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderGroupAdapter;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsRechargeAdapter;
+import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsRechargeGroupAdapter;
+import com.xingdata.zzdpos.util.StringUtil;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Action;
+import io.reactivex.schedulers.Schedulers;
+
 
 public class RechargeSearchFragment extends BaseFragment<StatisticsPresenter, FragmentOrderSearchBinding> {
-    private StatisticsRechargeAdapter mStatisticsAdapter;
+    private StatisticsRechargeGroupAdapter mStatisticsAdapter;
     private Pager<VipRechargeOrder> VipRechargeOrders;
     private int pagerNum;
     private String wd = "";
@@ -30,7 +41,7 @@ public class RechargeSearchFragment extends BaseFragment<StatisticsPresenter, Fr
     public static final int DATE = 100;
     private Long startDate;
     private Long endDate;
-
+    private String monthDate;
 
     @Override
     public int getLayoutId() {
@@ -41,7 +52,7 @@ public class RechargeSearchFragment extends BaseFragment<StatisticsPresenter, Fr
     public void initView() {
 
         if (mStatisticsAdapter == null) {
-            mStatisticsAdapter = new StatisticsRechargeAdapter(new ArrayList<>());
+            mStatisticsAdapter = new StatisticsRechargeGroupAdapter(new ArrayList<>());
             mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
             mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
         } else {
@@ -51,15 +62,18 @@ public class RechargeSearchFragment extends BaseFragment<StatisticsPresenter, Fr
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
         mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
         if (VipRechargeOrders != null) {
-            setData(VipRechargeOrders, VipRechargeOrders.isFirstPage());
+            setData(VipRechargeOrders);
         }
         mStatisticsAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                if (!mStatisticsAdapter.getData().get(position).isHeader) {
                     Intent intent = new Intent(getActivity(), StatisticsDetailActivity.class);
                     intent.putExtra(VipRechargeOrder.class.getName(), mStatisticsAdapter.getData().get(position));
                     ActivityUtils.startActivity(intent);
                 }
+
+            }
         });
 
     }
@@ -96,7 +110,7 @@ public class RechargeSearchFragment extends BaseFragment<StatisticsPresenter, Fr
      * @param pager     数据
      * @param isRefresh 是否刷新
      */
-    public void setData(Pager<VipRechargeOrder> pager, boolean isRefresh) {
+    private void setData(Pager<VipRechargeOrder> pager, boolean isRefresh) {
         if (isRefresh) {
             mStatisticsAdapter.setEnableLoadMore(true);
             mViewBinding.srlProduct.setRefreshing(false);
@@ -109,6 +123,37 @@ public class RechargeSearchFragment extends BaseFragment<StatisticsPresenter, Fr
 
     }
 
+    public void setData(Pager<VipRechargeOrder> pager) {
+
+        if (pager.isFirstPage()) {
+            monthDate = "";
+        }
+        io.reactivex.Observable.create(new ObservableOnSubscribe<Pager<VipRechargeOrder>>() {
+
+            @Override
+            public void subscribe(ObservableEmitter<Pager<VipRechargeOrder>> e) throws Exception {
+                for (int i = 0; i < pager.getList().size(); i++) {
+                    String m = TimeUtils.millis2String(pager.getList().get(i).getCreateTime(), new SimpleDateFormat(StringUtil.defaultDatePattern));
+
+                    if (!m.equals(monthDate)) {
+                        monthDate = m;
+                        pager.getList().add(i, new VipRechargeOrder(true, monthDate + ""));
+                        i++;
+                    }
+                }
+                e.onComplete();
+            }
+        }).subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread()).doOnComplete(new Action() {
+            @Override
+            public void run() throws Exception {
+                setData(pager, pager.isFirstPage());
+            }
+        }).subscribe();
+
+
+    }
+
     public void setCreateData(Pager<VipRechargeOrder> list, String wd) {
         this.VipRechargeOrders = list;
         this.wd = wd;

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

@@ -6,6 +6,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 
 import com.blankj.utilcode.util.ActivityUtils;
+import com.blankj.utilcode.util.TimeUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
@@ -16,12 +17,21 @@ import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
 import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsRechargeAdapter;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsTicketAdapter;
+import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsTicketGroupAdapter;
+import com.xingdata.zzdpos.util.StringUtil;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Action;
+import io.reactivex.schedulers.Schedulers;
+
 
 public class TicketSearchFragment extends BaseFragment<StatisticsPresenter, FragmentOrderSearchBinding> {
-    private StatisticsTicketAdapter mStatisticsAdapter;
+    private StatisticsTicketGroupAdapter mStatisticsAdapter;
     private Pager<Ticket> Tickets;
     private int pagerNum;
     private String wd = "";
@@ -30,6 +40,7 @@ public class TicketSearchFragment extends BaseFragment<StatisticsPresenter, Frag
     public static final int DATE = 100;
     private Long startDate;
     private Long endDate;
+    private String monthDate;
 
 
     @Override
@@ -41,7 +52,7 @@ public class TicketSearchFragment extends BaseFragment<StatisticsPresenter, Frag
     public void initView() {
 
         if (mStatisticsAdapter == null) {
-            mStatisticsAdapter = new StatisticsTicketAdapter(new ArrayList<>());
+            mStatisticsAdapter = new StatisticsTicketGroupAdapter(new ArrayList<>());
             mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
             mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
         } else {
@@ -51,7 +62,7 @@ public class TicketSearchFragment extends BaseFragment<StatisticsPresenter, Frag
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
         mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
         if (Tickets != null) {
-            setData(Tickets, Tickets.isFirstPage());
+            setData(Tickets);
         }
         mStatisticsAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
@@ -97,7 +108,7 @@ public class TicketSearchFragment extends BaseFragment<StatisticsPresenter, Frag
      * @param pager     数据
      * @param isRefresh 是否刷新
      */
-    public void setData(Pager<Ticket> pager, boolean isRefresh) {
+    private void setData(Pager<Ticket> pager, boolean isRefresh) {
         if (isRefresh) {
             mStatisticsAdapter.setEnableLoadMore(true);
             mViewBinding.srlProduct.setRefreshing(false);
@@ -110,6 +121,37 @@ public class TicketSearchFragment extends BaseFragment<StatisticsPresenter, Frag
 
     }
 
+    public void setData(Pager<Ticket> pager) {
+
+        if (pager.isFirstPage()) {
+            monthDate = "";
+        }
+        io.reactivex.Observable.create(new ObservableOnSubscribe<Pager<Ticket>>() {
+
+            @Override
+            public void subscribe(ObservableEmitter<Pager<Ticket>> e) throws Exception {
+                for (int i = 0; i < pager.getList().size(); i++) {
+                    String m = TimeUtils.date2String(pager.getList().get(i).getCreateTime(), new SimpleDateFormat(StringUtil.defaultDatePattern));
+
+                    if (!m.equals(monthDate)) {
+                        monthDate = m;
+                        pager.getList().add(i, new Ticket(true, monthDate + ""));
+                        i++;
+                    }
+                }
+                e.onComplete();
+            }
+        }).subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread()).doOnComplete(new Action() {
+            @Override
+            public void run() throws Exception {
+                setData(pager, pager.isFirstPage());
+            }
+        }).subscribe();
+
+
+    }
+
     public void setCreateData(Pager<Ticket> list, String wd) {
         this.Tickets = list;
         this.wd = wd;

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

@@ -93,10 +93,13 @@ public class OrderListFragment extends BaseFragment<StatisticsPresenter, Fragmen
         mStatisticsAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                if (!mStatisticsAdapter.getData().get(position).isHeader) {
                     Intent intent = new Intent(getActivity(), StatisticsDetailActivity.class);
                     intent.putExtra(Saleorder.class.getName(), mStatisticsAdapter.getData().get(position).getId());
                     ActivityUtils.startActivity(intent);
                 }
+
+            }
         });
 
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
@@ -122,7 +125,7 @@ public class OrderListFragment extends BaseFragment<StatisticsPresenter, Fragmen
      * @param pager     数据
      * @param isRefresh 是否刷新
      */
-    public void setData(Pager<Saleorder> pager, boolean isRefresh) {
+    private void setData(Pager<Saleorder> pager, boolean isRefresh) {
         if (isRefresh) {
             mStatisticsAdapter.setEnableLoadMore(true);
             mViewBinding.srlProduct.setRefreshing(false);

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

@@ -6,6 +6,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 
 import com.blankj.utilcode.util.ActivityUtils;
+import com.blankj.utilcode.util.TimeUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
@@ -17,14 +18,23 @@ import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
 import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderAdapter;
+import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderGroupAdapter;
+import com.xingdata.zzdpos.util.StringUtil;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 
 import java.util.List;
 
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Action;
+import io.reactivex.schedulers.Schedulers;
+
 
 public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, FragmentOrderSearchBinding> {
-    private StatisticsOrderAdapter mStatisticsAdapter;
+    private StatisticsOrderGroupAdapter mStatisticsAdapter;
     private Pager<Saleorder> saleorders;
     private int pagerNum;
     private String wd = "";
@@ -35,7 +45,7 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
     public static final int PAYTYPE = 101;
     private Long startDate;
     private Long endDate;
-
+    private String monthDate;
 
     @Override
     public int getLayoutId() {
@@ -46,7 +56,7 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
     public void initView() {
 
         if (mStatisticsAdapter == null) {
-            mStatisticsAdapter = new StatisticsOrderAdapter(new ArrayList<>());
+            mStatisticsAdapter = new StatisticsOrderGroupAdapter(new ArrayList<>());
             mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
             mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
         } else {
@@ -56,15 +66,18 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
         mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
         if (saleorders != null) {
-            setData(saleorders, saleorders.isFirstPage());
+            setData(saleorders);
         }
         mStatisticsAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                if (!mStatisticsAdapter.getData().get(position).isHeader) {
                     Intent intent = new Intent(getActivity(), StatisticsDetailActivity.class);
                     intent.putExtra(Saleorder.class.getName(), mStatisticsAdapter.getData().get(position).getId());
                     ActivityUtils.startActivity(intent);
                 }
+
+            }
         });
 
     }
@@ -107,7 +120,7 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
      * @param pager     数据
      * @param isRefresh 是否刷新
      */
-    public void setData(Pager<Saleorder> pager, boolean isRefresh) {
+    private void setData(Pager<Saleorder> pager, boolean isRefresh) {
         if (isRefresh) {
             mStatisticsAdapter.setEnableLoadMore(true);
             mViewBinding.srlProduct.setRefreshing(false);
@@ -120,6 +133,38 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
 
     }
 
+    public void setData(Pager<Saleorder> pager) {
+
+        if (pager.isFirstPage()) {
+            monthDate = "";
+        }
+        io.reactivex.Observable.create(new ObservableOnSubscribe<Pager<Saleorder>>() {
+
+            @Override
+            public void subscribe(ObservableEmitter<Pager<Saleorder>> e) throws Exception {
+                for (int i = 0; i < pager.getList().size(); i++) {
+                    String m = TimeUtils.millis2String(pager.getList().get(i).getCreateTime(), new SimpleDateFormat(StringUtil.defaultDatePattern));
+
+                    if (!m.equals(monthDate)) {
+                        monthDate = m;
+                        pager.getList().add(i, new Saleorder(true, monthDate + ""));
+                        i++;
+                    }
+                }
+                e.onComplete();
+            }
+        }).subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread()).doOnComplete(new Action() {
+            @Override
+            public void run() throws Exception {
+                setData(pager, pager.isFirstPage());
+            }
+        }).subscribe();
+
+
+    }
+
+
     public void setCreateData(Pager<Saleorder> list, int patType) {
         this.saleorders = list;
         this.payType = patType;

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

 package com.xingdata.zzdpos.util;
 
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
 import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
@@ -40,4 +45,81 @@ public class RecyclerViewUtil {
             }
         }
     }
+
+    public static class ListCardItemDecoration extends RecyclerView.ItemDecoration {
+        private Drawable mDividerDarwable;
+        private int mDividerHight = 1;
+        private Paint mColorPaint;
+
+
+        public final int[] ATRRS = new int[]{android.R.attr.listDivider};
+
+        public ListCardItemDecoration(Context context) {
+            final TypedArray ta = context.obtainStyledAttributes(ATRRS);
+            this.mDividerDarwable = ta.getDrawable(0);
+            ta.recycle();
+        }
+
+        /*
+         int dividerHight  分割线的线宽
+         int dividerColor  分割线的颜色
+         */
+        public ListCardItemDecoration(Context context, int dividerHight, int dividerColor) {
+            this(context);
+            mDividerHight = dividerHight;
+            mColorPaint = new Paint();
+            mColorPaint.setColor(dividerColor);
+        }
+
+
+        /*
+         int dividerHight  分割线的线宽
+         Drawable dividerDrawable  图片分割线
+         */
+        public ListCardItemDecoration(Context context, int dividerHight, Drawable dividerDrawable) {
+            this(context);
+            mDividerHight = dividerHight;
+            mDividerDarwable = dividerDrawable;
+        }
+
+        @Override
+        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+            super.getItemOffsets(outRect, view, parent, state);
+            outRect.bottom = mDividerHight + 1;
+        }
+
+        @Override
+        public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
+            super.onDraw(c, parent, state);
+            //画水平和垂直分割线
+            drawHorizontalDivider(c, parent);
+        }
+
+
+        public void drawHorizontalDivider(Canvas c, RecyclerView parent) {
+
+            final int childCount = parent.getChildCount();
+            for (int i = 0; i < childCount - 1; i++) {
+                final View child = parent.getChildAt(i);
+                RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
+
+                final int left = child.getLeft() - params.leftMargin - mDividerHight;
+                final int right = child.getRight() + params.rightMargin;
+                int top = 0;
+                int bottom = 0;
+
+
+                top = child.getBottom() + params.bottomMargin;
+                bottom = top + mDividerHight;
+                //画分割线
+                mDividerDarwable.setBounds(left, top, right, bottom);
+                mDividerDarwable.draw(c);
+                if (mColorPaint != null) {
+                    c.drawRect(left, top, right, bottom, mColorPaint);
+                }
+
+
+            }
+        }
+    }
 }
\ No newline at end of file

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

-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <!-- This is the main color -->
-    <item>
-        <shape>
-            <!--    边框颜色 -->
-            <solid android:color="@color/black_baozheng"/>
-        </shape>
-    </item>
-    <!-- 给View的上 左  右设置8dp的边框 -->
-    <item android:bottom="@dimen/view_line_L050"  android:top="@dimen/view_line_L050"
-        android:start="@dimen/view_line_L050" android:end="@dimen/view_line_L050">
-        <shape>
-            <!--     View填充颜色 -->
-            <solid android:color="@color/gray_zhouyu" />
-        </shape>
-    </item>
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-</layer-list>
+    <corners android:radius="@dimen/all_shape_radius"/>
\ No newline at end of file
+    <stroke
+        android:width="@dimen/edit_border"
+        android:color="@color/black_baozheng"/>
+
+    <solid android:color="@color/gray_zhouyu"/>
+
+</shape>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape>
+            <solid android:color="@color/gray_huanggai"/>
+        </shape>
+    </item>
+
+    <item android:bottom="@dimen/view_line_L050"  android:top="@dimen/view_line_L050">
+        <shape>
+            <solid android:color="@color/gray_zhouyu"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file

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

@@ -16,24 +16,19 @@
             android:background="@color/white_caocao"
             android:gravity="center_vertical|center_horizontal"
             android:orientation="horizontal"
+            android:paddingTop="@dimen/all_padding"
             app:layout_constraintBottom_toBottomOf="parent"
             app:tabIndicatorHeight="0dp"
-            app:tabPaddingTop="0dp"
             app:tabPaddingBottom="0dp"
             app:tabPaddingEnd="0dp"
             app:tabPaddingStart="0dp"
-            android:paddingTop="@dimen/all_padding"
+            app:tabPaddingTop="0dp"
             app:tabSelectedTextColor="@color/red_guanyu"
             app:tabTextAppearance="@android:style/TextAppearance.Holo.Small"
             app:tabTextColor="@color/black_likui">
 
         </android.support.design.widget.TabLayout>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L1"
-            android:background="@color/gray_zhouyu"
-            app:layout_constraintTop_toTopOf="@id/tab_layout" />
 
         <android.support.v4.view.ViewPager
             android:id="@+id/fragment_container"
@@ -47,7 +42,14 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="1.0">
 
+
         </android.support.v4.view.ViewPager>
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_huanggai"
+            app:layout_constraintTop_toTopOf="@id/tab_layout" />
+
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -12,11 +12,15 @@
             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"
-            android:layout_marginTop="@dimen/all_padding_left_right"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -20,6 +20,7 @@
             android:id="@+id/cl_title"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:animateLayoutChanges="true"
             android:background="@color/white_caocao"
             android:focusable="true"
             android:focusableInTouchMode="true">

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

@@ -48,23 +48,23 @@
                 android:layout="@layout/view_inventory_detail" />
         </FrameLayout>
 
-        <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_marginTop="@dimen/all_padding"
             android:background="@color/white_caocao"
             android:elevation="@dimen/view_line_L2"
+            android:gravity="center"
             android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent">
 
             <Button
                 android:id="@+id/btn_print"
                 style="@style/button_passive"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/all_padding"
-                android:layout_weight="1"
+                android:layout_width="@dimen/layout_statistics_bottom_button_width"
+                android:layout_height="@dimen/layout_statistics_bottom_button_height"
+                android:layout_marginStart="@dimen/all_margin_big_big"
                 android:stateListAnimator="@null"
                 android:text="@string/settle_print_receipt"
                 android:textSize="@dimen/all_text_size"
@@ -77,10 +77,9 @@
             <Button
                 android:id="@+id/btn_return"
                 style="@style/button_positive"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/all_padding"
-                android:layout_weight="1"
+                android:layout_width="@dimen/layout_statistics_bottom_button_width"
+                android:layout_height="@dimen/layout_statistics_bottom_button_height"
+                android:layout_marginEnd="@dimen/all_margin_big_big"
                 android:stateListAnimator="@null"
                 android:text="@string/pay_return"
                 android:textSize="@dimen/all_text_size"
@@ -88,8 +87,9 @@
                 app:layout_constraintLeft_toRightOf="@id/btn_cancel"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
+                app:layout_goneMarginStart="@dimen/all_margin_big_big"
                 tools:targetApi="lollipop" />
 
-        </LinearLayout>
+        </android.support.constraint.ConstraintLayout>
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -37,9 +37,9 @@
                 android:layout_weight="1"
                 android:drawableTop="@mipmap/icon_receivables"
                 android:gravity="center"
-                android:textSize="@dimen/all_sub_title_size"
                 android:text="@string/menu_receivables"
-                android:textColor="#FFF" />
+                android:textColor="#FFF"
+                android:textSize="@dimen/all_sub_title_size" />
 
             <TextView
                 android:id="@+id/tv_store"
@@ -49,8 +49,8 @@
                 android:drawableTop="@mipmap/icon_billing"
                 android:gravity="center"
                 android:text="@string/menu_billing"
-                android:textSize="@dimen/all_sub_title_size"
-                android:textColor="#FFF" />
+                android:textColor="#FFF"
+                android:textSize="@dimen/all_sub_title_size" />
 
 
         </LinearLayout>
@@ -76,11 +76,21 @@
             android:layout_height="0dp"
             android:layout_marginBottom="@dimen/all_padding"
             android:layout_marginTop="@dimen/all_padding"
-            android:background="@color/white_caocao"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/guideline" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_huanggai"
+            app:layout_constraintTop_toTopOf="@id/fragment_casher_recycler" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_huanggai"
+            app:layout_constraintBottom_toBottomOf="@id/fragment_casher_recycler" />
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -21,7 +21,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming" />
+            android:background="@color/gray_huanggai" />
 
         <LinearLayout
             android:id="@+id/btn_add"
@@ -44,17 +44,12 @@
                 android:textSize="@dimen/big_text_size" />
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming" />
-
 
         <TextView
             android:id="@+id/tv_count"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/gray_zhouyu"
+            android:background="@drawable/singleline_zhouyu_huanggai"
             android:paddingBottom="@dimen/all_padding"
             android:paddingStart="@dimen/all_padding_left_right"
             android:paddingTop="@dimen/all_padding"
@@ -63,6 +58,7 @@
             android:textSize="@dimen/all_text_size_low"
             android:textStyle="bold" />
 
+
         <android.support.v4.widget.SwipeRefreshLayout
             android:id="@+id/srl_product"
             android:layout_width="match_parent"
@@ -71,9 +67,9 @@
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/recycler_inventory"
-                android:background="@color/gray_zhouyu"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:background="@color/gray_zhouyu">
 
             </android.support.v7.widget.RecyclerView>
         </android.support.v4.widget.SwipeRefreshLayout>

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

@@ -18,6 +18,7 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/gray_zhouyu"
         android:orientation="vertical">
 
         <include
@@ -25,11 +26,17 @@
             layout="@layout/title_order"
             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_toBottomOf="@id/ic_title" />
+
         <TextView
             android:id="@+id/tv_title_small"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/gray_zhouyu"
+            android:background="@drawable/singleline_zhouyu_huanggai"
             android:paddingBottom="@dimen/all_padding"
             android:paddingStart="@dimen/all_padding_left_right"
             android:paddingTop="@dimen/all_padding"
@@ -39,16 +46,24 @@
             android:textStyle="bold"
             app:layout_constraintTop_toBottomOf="@id/ic_title" />
 
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/recycler_view"
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:orientation="vertical"
             app:layout_constraintBottom_toTopOf="@id/fl_cart"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_title_small">
 
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/singleline_white_gray">
+
             </android.support.v7.widget.RecyclerView>
+        </LinearLayout>
+
 
         <FrameLayout
             android:id="@+id/fl_cart"
@@ -81,8 +96,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textColor="@color/red_guanyu"
                 android:text="@{result}"
+                android:textColor="@color/red_guanyu"
                 android:textSize="@dimen/all_sub_title_size"
                 android:textStyle="bold" />
 
@@ -106,6 +121,12 @@
             app:layout_constraintTop_toBottomOf="@id/fl_cart" />
 
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_huanggai"
+            app:layout_constraintTop_toTopOf="@id/fl_cart" />
+
         <FrameLayout
             android:id="@+id/fl_logo"
             android:layout_width="wrap_content"

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

@@ -5,7 +5,6 @@
         <import type="android.view.View" />
 
 
-
     </data>
 
     <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -16,6 +15,11 @@
         android:background="@color/gray_zhouyu"
         tools:context="com.example.administrator.tangkupos.CasherFragment">
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_huanggai"
+            app:layout_constraintTop_toTopOf="parent" />
         <!-- TODO: Update blank fragmfragment_integral_indexyout -->
         <android.support.constraint.Guideline
             android:id="@+id/guideline"

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

@@ -23,6 +23,11 @@
 
         <!-- TODO: Update blank fragmfragment_integral_indexyout -->
 
+        <View
+            android:layout_alignParentTop="true"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_huanggai" />
 
         <!--<LinearLayout-->
         <!--android:id="@+id/ll_title"-->

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

@@ -11,6 +11,7 @@
         <!-- TODO: Update blank fragmfragment_integral_indexyout -->
 
 
+
         <android.support.v4.widget.SwipeRefreshLayout
             android:id="@+id/srl_product"
             android:layout_width="0dp"

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

@@ -28,6 +28,11 @@
         android:background="@color/gray_zhouyu"
         android:orientation="vertical">
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:layout_marginTop="@dimen/all_padding_left_right"
+            android:background="@color/gray_huanggai" />
 
         <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
@@ -36,11 +41,7 @@
             android:background="@drawable/singleline_white_gray"
             android:paddingBottom="@dimen/all_padding">
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/view_line_L050"
-                android:background="@color/gray_kongming"
-                app:layout_constraintTop_toTopOf="parent" />
+
 
             <com.facebook.drawee.view.SimpleDraweeView
                 android:id="@+id/img_goods"
@@ -100,13 +101,12 @@
 
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="￥"
                 android:layout_marginBottom="@dimen/view_line_L2"
+                android:text="￥"
                 android:textColor="@color/red_lvzhi"
                 android:textSize="@dimen/all_text_size_small"
                 app:layout_constraintBottom_toBottomOf="@id/tv_price"
-                app:layout_constraintEnd_toStartOf="@id/tv_price"
-            />
+                app:layout_constraintEnd_toStartOf="@id/tv_price" />
 
             <TextView
                 android:id="@+id/tv_price"
@@ -119,6 +119,11 @@
                 app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />
         </android.support.constraint.ConstraintLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_huanggai" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -150,8 +155,8 @@
             android:background="@color/white_caocao"
             android:drawablePadding="@dimen/all_padding"
             android:drawableStart="@mipmap/icon_stores"
-            android:paddingStart="@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:text="@{shopName}"
             android:textSize="@dimen/all_text_size_low" />
@@ -159,11 +164,11 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:drawablePadding="@dimen/all_padding"
             android:background="@color/white_caocao"
+            android:drawablePadding="@dimen/all_padding"
             android:drawableStart="@mipmap/icon_address"
-            android:paddingStart="@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:text="@{address}"
             android:textSize="@dimen/all_text_size_low" />
@@ -171,16 +176,20 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:drawablePadding="@dimen/all_padding"
             android:background="@color/white_caocao"
+            android:drawablePadding="@dimen/all_padding"
             android:drawableStart="@mipmap/icon_telephone"
-            android:paddingStart="@dimen/all_padding_left_right"
+            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_padding_left_right"
             android:text="@{phone}"
             android:textSize="@dimen/all_text_size_low" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_huanggai" />
     </LinearLayout>
 
 

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

@@ -10,15 +10,20 @@
         android:background="@color/gray_zhouyu"
         android:orientation="vertical">
 
-
+        <View
+            android:id="@+id/view_line"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:layout_marginTop="@dimen/padding_small"
+            android:background="@color/gray_huanggai"
+            android:visibility="gone" />
 
 
         <android.support.v4.widget.SwipeRefreshLayout
             android:id="@+id/srl_product"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@id/ll_title"
-         >
+            android:layout_below="@id/ll_title">
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/recycler_other_selcet"

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

@@ -21,7 +21,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming" />
+            android:background="@color/gray_huanggai" />
 
         <LinearLayout
             android:id="@+id/btn_add"
@@ -47,7 +47,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming" />
+            android:background="@color/gray_huanggai" />
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tab"
@@ -63,8 +63,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/all_margin"
-            android:background="@color/gray_zhouyu"
-      />
+            android:background="@drawable/singleline_zhouyu_huanggai" />
 
         <android.support.v4.view.ViewPager
             android:id="@+id/fragment_container"

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

@@ -67,12 +67,13 @@
             layout="@layout/title_order"
             app:layout_constraintTop_toTopOf="parent" />
 
+
         <android.support.constraint.ConstraintLayout
             android:id="@+id/cl_default"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/ly_title"
-            android:layout_marginTop="@dimen/all_margin"
+            android:layout_marginTop="@dimen/all_padding_left_right"
             android:background="@color/white_caocao">
 
             <TextView
@@ -220,8 +221,7 @@
                 android:textColor="@color/black"
                 android:textSize="@dimen/all_text_size"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/ll_supplier"
-                />
+                app:layout_constraintTop_toBottomOf="@id/ll_supplier" />
 
             <TextView
                 android:id="@+id/tv_shop_name"
@@ -493,7 +493,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/gray_zhouyu"
+                android:background="@drawable/singleline_zhouyu_huanggai"
                 android:padding="@dimen/all_padding_left_right"
                 android:text="定货明细"
                 android:textColor="@color/black_baozheng"
@@ -503,6 +503,19 @@
 
         </android.support.constraint.ConstraintLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:layout_below="@id/ly_title"
+            android:background="@color/gray_huanggai" />
+
+        <View
+            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:background="@color/gray_huanggai" />
+
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
@@ -554,5 +567,11 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
         </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:layout_above="@id/ll_bottom"
+            android:background="@color/gray_huanggai" />
     </RelativeLayout>
 </layout>
\ No newline at end of file

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

@@ -15,6 +15,7 @@
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/recycler"
+                android:background="@color/gray_zhouyu"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:visibility="visible">
@@ -29,7 +30,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/ll_title"
-            android:background="@color/white_caocao"
             android:gravity="center"
             android:orientation="vertical"
             android:visibility="gone">

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

@@ -11,15 +11,16 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/all_padding_left_right"
-        android:foreground="?attr/selectableItemBackground"
         android:background="@color/white_caocao"
-        android:padding="@dimen/all_padding_left_right">
+        android:elevation="@dimen/view_line_L050"
+        android:foreground="?attr/selectableItemBackground">
+
 
         <ImageView
             android:id="@+id/img"
             android:layout_width="50dp"
             android:layout_height="50dp"
+            android:layout_margin="@dimen/all_padding_left_right"
             android:src="@mipmap/img_boss"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -61,7 +62,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/singleline_white_gray"
-            android:padding="@dimen/all_padding"
+            android:paddingTop="@dimen/all_padding"
+            android:paddingEnd="@dimen/all_padding"
+            android:paddingBottom="@dimen/all_padding"
             android:text="件"
             android:textColor="@color/black"
             android:textSize="@dimen/sp_14"
@@ -72,6 +75,7 @@
             android:id="@+id/tv_num"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:padding="@dimen/all_padding"
             android:background="@drawable/singleline_white_gray"
             android:textColor="@color/black_baozheng"
             android:textSize="@dimen/all_text_size_low"
@@ -109,6 +113,7 @@
             android:id="@+id/tv_result"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/all_padding"
             android:background="@drawable/singleline_white_gray"
             android:padding="@dimen/all_padding"
             android:paddingEnd="@dimen/all_margin"
@@ -144,6 +149,7 @@
             android:id="@+id/img_inventory"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/all_padding"
             android:src="@mipmap/ic_not_consistent"
             app:layout_constraintBottom_toBottomOf="@id/tv_result"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -12,14 +12,18 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/all_padding_left_right"
-        android:background="@drawable/singleline_white_gray"
-        android:padding="@dimen/all_padding">
+        android:background="@color/white_caocao"
+        android:paddingBottom="@dimen/all_padding">
+
 
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/img_goods"
             android:layout_width="65dp"
             android:layout_height="65dp"
+            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginTop="@dimen/all_padding"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             app:placeholderImage="@mipmap/icon_goods_default" />
 
         <TextView
@@ -30,6 +34,7 @@
             android:layout_marginEnd="@dimen/all_padding_left_right"
             android:layout_marginStart="@dimen/all_padding_left_right"
             android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/img_goods"
             app:layout_constraintTop_toTopOf="@id/img_goods" />
 
@@ -58,6 +63,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:background="@drawable/frame_frame_zhouyu_bg"
             android:padding="@dimen/dp_4"
             android:text="规格"
@@ -76,8 +82,7 @@
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
             app:layout_constraintStart_toEndOf="@id/tv_rmb"
-            app:layout_constraintTop_toTopOf="@id/tv_price_hint"
-            />
+            app:layout_constraintTop_toTopOf="@id/tv_price_hint" />
 
         <TextView
             android:id="@+id/tv_rmb"
@@ -88,14 +93,14 @@
             android:textColor="@color/store_product_price"
             android:textSize="@dimen/all_text_size_small"
             app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
-            app:layout_constraintStart_toEndOf="@+id/tv_price_hint"
-        />
+            app:layout_constraintStart_toEndOf="@+id/tv_price_hint" />
 
 
         <LinearLayout
             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:gravity="center"
             android:orientation="horizontal"
             app:layout_constraintStart_toStartOf="parent"
@@ -142,7 +147,8 @@
             style="@style/other_select_smallstyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/all_padding"
+            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginTop="@dimen/dp_4"
             android:text="构成数量："
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
@@ -153,8 +159,8 @@
             style="@style/other_select_smallstyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/all_padding"
             android:layout_marginStart="@dimen/all_padding_left_right"
+            android:layout_marginTop="@dimen/all_padding"
             android:text="系统库存："
             android:textStyle="bold"
             app:layout_constraintStart_toEndOf="@id/tv_goods_price"
@@ -187,6 +193,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:background="@drawable/shape_red_round_rectangle_more_round"
             android:foreground="?android:attr/actionBarItemBackground"
             android:paddingBottom="@dimen/all_spacing"

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

@@ -7,7 +7,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="0.8dp"
-        android:background="?android:attr/selectableItemBackground"
+        android:foreground="?android:attr/selectableItemBackground"
+        android:background="@color/white_caocao"
         android:gravity="center"
         android:orientation="vertical"
         android:paddingBottom="25dp"

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

@@ -12,16 +12,9 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/all_padding_left_right"
         android:background="@drawable/singleline_white_gray"
         android:paddingBottom="@dimen/all_padding">
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/img_goods"
             android:layout_width="65dp"

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

@@ -40,20 +40,15 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/all_padding"
-        android:background="@color/white">
+        android:background="@drawable/singleline_white_gray">
 
 
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming"
-            app:layout_constraintBottom_toBottomOf="parent"/>
         <LinearLayout
             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_marginTop="@dimen/all_padding"
             android:gravity="center"
             android:padding="@dimen/dp_4"
             app:layout_constraintStart_toStartOf="parent"
@@ -91,8 +86,10 @@
             android:id="@+id/ll_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/all_padding_left_right"
             android:gravity="center"
             android:padding="@dimen/dp_4"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ll_boss">
 
             <ImageView
@@ -115,8 +112,10 @@
             android:id="@+id/ll_no"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/all_padding_left_right"
             android:gravity="center"
             android:padding="@dimen/dp_4"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ll_date">
 
             <ImageView
@@ -138,7 +137,7 @@
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/all_padding"
+            android:layout_margin="@dimen/all_margin"
             app:cardElevation="0dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ll_no">

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

@@ -4,7 +4,7 @@
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/item_statistics_height"
         android:background="@color/white_caocao"
         android:foreground="?android:attr/selectableItemBackground">
 
@@ -26,10 +26,10 @@
             android:id="@+id/tv_right_top"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/all_margin"
-            android:textStyle="bold"
+            android:layout_marginEnd="@dimen/all_text_size_small"
             android:textColor="@color/black_baozheng"
             android:textSize="@dimen/all_text_size_small"
+            android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/img_left" />
 
@@ -37,7 +37,7 @@
             android:id="@+id/tv_right_bottom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/all_padding_left_right"
+            android:layout_marginEnd="@dimen/all_text_size_small"
             android:text="本店"
             android:textSize="@dimen/all_text_size_small"
             app:layout_constraintBottom_toBottomOf="@id/img_left"

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

@@ -3,6 +3,12 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content" >
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_huanggai"
+            android:layout_alignParentBottom="true" />
+
 
         <TextView
             android:id="@+id/item_tv"

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

@@ -40,7 +40,7 @@
             android:hint="@string/statistics_order_edit_hint"
             android:inputType="number"
             android:textColor="@color/black_likui"
-            android:textColorHint="@color/gray_huanggai"
+            android:textColorHint="@color/gray_kongming"
             android:textSize="@dimen/all_text_size"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/iv_right"

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

@@ -56,15 +56,23 @@
             android:layout_marginTop="@dimen/all_margin"
             android:padding="@dimen/dp_4">
 
-            <android.support.constraint.ConstraintLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:background="@color/white_caocao"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent">
-
+            >
 
+                <TextView
+                    android:id="@+id/tv_amt_hint"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingBottom="@dimen/all_padding"
+                    android:paddingTop="@dimen/all_margin"
+                    android:text="订单金额"
+                    android:textColor="@color/black_baozheng"
+         />
                 <TextView
                     android:id="@+id/tv_amt"
                     android:layout_width="match_parent"
@@ -75,22 +83,9 @@
                     android:textColor="@color/red900"
                     android:textSize="@dimen/all_text_size_big"
                     android:textStyle="bold"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tv_amt_hint" />
+                 />
+
 
-                <TextView
-                    android:id="@+id/tv_amt_hint"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:paddingBottom="@dimen/all_padding"
-                    android:paddingTop="@dimen/all_margin"
-                    android:text="订单金额"
-                    android:textColor="@color/black_baozheng"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
 
                 <View
                     android:id="@+id/view1"
@@ -98,14 +93,14 @@
                     android:layout_height="@dimen/view_line_L1"
                     android:layout_marginTop="@dimen/all_margin"
                     android:background="@color/gray_zhouyu"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tv_amt" />
+               />
 
                 <ScrollView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:layout_constraintTop_toBottomOf="@id/view1">
+                    android:scrollbars="none"
+                    app:layout_constraintTop_toBottomOf="@id/view1"
+                    app:layout_constraintBottom_toBottomOf="parent">
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -120,13 +115,13 @@
                             android:paddingEnd="@dimen/dp_4"
                             android:paddingStart="@dimen/dp_4"
                             android:paddingTop="@dimen/dp_4"
-                            android:weightSum="2">
+                            android:weightSum="10">
 
                             <LinearLayout
 
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1"
+                                android:layout_weight="7"
                                 android:orientation="vertical">
 
                                 <TextView
@@ -198,7 +193,7 @@
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1"
+                                android:layout_weight="3"
                                 android:gravity="right"
                                 android:orientation="vertical">
 
@@ -304,6 +299,8 @@
                             android:layout_height="@dimen/view_line_L1"
                             android:background="@color/gray_zhouyu" />
 
+
+
                             <LinearLayout
                                 android:id="@+id/ll_goods_list"
                                 android:layout_width="match_parent"
@@ -319,14 +316,16 @@
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:background="@color/white_caocao"
-                                android:paddingEnd="@dimen/all_margin"
-                                android:paddingStart="@dimen/all_margin">
+                                    android:paddingEnd="@dimen/dp_4"
+                                    android:paddingStart="@dimen/dp_4">
 
                                     <TextView
                                         android:id="@+id/tv_name"
                                         android:layout_width="0dp"
                                         android:layout_height="wrap_content"
                                         android:maxLines="2"
+                                        android:paddingBottom="@dimen/dp_4"
+                                        android:paddingTop="@dimen/dp_4"
                                         android:text="品名"
                                         android:textColor="@color/black_baozheng"
                                         app:layout_constraintBottom_toBottomOf="parent"
@@ -340,6 +339,8 @@
                                         android:layout_width="0dp"
                                         android:layout_height="wrap_content"
                                         android:gravity="end"
+                                        android:paddingBottom="@dimen/dp_4"
+                                        android:paddingTop="@dimen/dp_4"
                                         android:text="数量"
                                         android:textColor="@color/black_baozheng"
                                         app:layout_constraintBottom_toBottomOf="parent"
@@ -367,6 +368,8 @@
                                         android:layout_width="0dp"
                                         android:layout_height="wrap_content"
                                         android:gravity="end"
+                                        android:paddingBottom="@dimen/dp_4"
+                                        android:paddingTop="@dimen/dp_4"
                                         android:text="单价"
                                         android:textColor="@color/black_baozheng"
                                         app:layout_constraintBottom_toBottomOf="parent"
@@ -380,6 +383,8 @@
                                         android:layout_width="0dp"
                                         android:layout_height="wrap_content"
                                         android:gravity="end"
+                                        android:paddingBottom="@dimen/dp_4"
+                                        android:paddingTop="@dimen/dp_4"
                                         android:text="小计"
                                         android:textColor="@color/black_baozheng"
                                         app:layout_constraintBottom_toBottomOf="parent"
@@ -388,6 +393,11 @@
                                         app:layout_constraintRight_toRightOf="parent"
                                         app:layout_constraintTop_toTopOf="parent" />
 
+                                    <View
+                                        android:layout_width="match_parent"
+                                        android:layout_height="@dimen/view_line_L050"
+                                        android:background="@color/gray_kongming"
+                                        app:layout_constraintBottom_toBottomOf="parent" />
                                 </android.support.constraint.ConstraintLayout>
                             </LinearLayout>
 
@@ -396,7 +406,7 @@
 
                 </ScrollView>
 
-            </android.support.constraint.ConstraintLayout>
+            </LinearLayout>
         </android.support.v7.widget.CardView>
     </FrameLayout>
 </layout>
\ No newline at end of file

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

@@ -5,6 +5,7 @@
     <dimen name="all_line_width">0.5dp</dimen>
     <dimen name="all_slight_line_width">0.5dp</dimen>
     <dimen name="all_margin">18dp</dimen>
+    <dimen name="all_margin_big_big">40dp</dimen>
     <dimen name="all_margin_big">28dp</dimen>
     <dimen name="all_spacing">6dp</dimen>
     <dimen name="all_sub_title_size">20sp</dimen>
@@ -209,7 +210,11 @@
 
     <!--商店-->
     <dimen name="store_cart_count">20dp</dimen>
-
+    <!--统计条目-->
+    <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>

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

@@ -661,7 +661,7 @@
     <string name="statistics_order_edit_hint">请输入单号/手机号</string>
     <string name="statistics_order_detail_hint">订单详情</string>
     <string name="statistics_vip_recharge_hint">充值记录</string>
-    <string name="statistics_used_ticket_hint">充值记录</string>
+    <string name="statistics_used_ticket_hint">优惠券记录</string>
     <string name="statistics_inventory_detail_hint">盘库结果</string>
     <!--商品详情POS-->
     <string name="oder_detail_date">交易时间:</string>
@@ -686,6 +686,23 @@
     <!--商品维护-->
     <string name="sku_size">规格/</string>
     <string name="skugrp_add_hint">请输入分组名称</string>
+    <string name="sku_subtitle_info">基本信息</string>
+    <string name="sku_skugrp">分组</string>
+    <string name="sku_unit">单位</string>
+    <string name="sku_price1">售价</string>
+    <string name="sku_price2">促销价</string>
+    <string name="sku_subtitle_vip">会员信息</string>
+    <string name="sku_vip_dis">会员折扣</string>
+    <string name="sku_point1">消费每满</string>
+    <string name="sku_point2">元等于1积分</string>
+
+    <string name="sku_subtitle_supplier">供货方</string>
+    <string name="sku_supplier">供货商方</string>
+    <string name="sku_cost_on">按此包装进货</string>
+    <string name="sku_cost">进价</string>
+    <string name="sku_stock_low_limit">库存下限</string>
+    <string name="sku_stock_upper_limit">库存上限</string>
+    <string name="sku_min_oder">最小订货</string>
 
 
 </resources>