UI

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/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,9 +162,9 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
         if (pager.isLastPage()) mInventoryAdapter.loadMoreEnd(isRefresh);
         else mInventoryAdapter.loadMoreComplete();
 
-        if (mInventoryAdapter.getData().size()==0){
+        if (mInventoryAdapter.getData().size() == 0) {
             mViewBinding.tvCount.setVisibility(View.GONE);
-        }else {
+        } else {
             mViewBinding.tvCount.setVisibility(View.VISIBLE);
         }
 
@@ -173,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,6 +87,11 @@ 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);
+        }
 
     }
 

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,10 +89,10 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
      * @param isRefresh 是否刷新
      */
     public void setData(List<Psb> psbList, boolean isRefresh) {
-         if (mReplenishmentAdapter==null){
-             this.psbArrayList=psbList;
-             return;
-         }
+        if (mReplenishmentAdapter == null) {
+            this.psbArrayList = psbList;
+            return;
+        }
 
         if (isRefresh) {
             mReplenishmentAdapter.setEnableLoadMore(true);
@@ -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/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>
\ No newline at end of file
+    <corners android:radius="@dimen/all_shape_radius"/>
+    <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/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/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_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
@@ -35,7 +36,7 @@
             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"
@@ -45,28 +46,24 @@
             android:textStyle="bold"
             app:layout_constraintTop_toBottomOf="@id/ic_title" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_huanggai"
-            app:layout_constraintTop_toBottomOf="@id/tv_title_small" />
-
-        <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.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>
 
-        <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_cart"
@@ -124,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_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

@@ -11,9 +11,12 @@
         android:orientation="vertical">
 
         <View
+            android:id="@+id/view_line"
             android:layout_width="match_parent"
             android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_huanggai" />
+            android:layout_marginTop="@dimen/padding_small"
+            android:background="@color/gray_huanggai"
+            android:visibility="gone" />
 
 
         <android.support.v4.widget.SwipeRefreshLayout

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

@@ -58,16 +58,12 @@
 
 
         </android.support.design.widget.TabLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_huanggai" />
+
 
         <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/item_inventory.xml

@@ -12,15 +12,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/white_caocao"
+        android:elevation="@dimen/view_line_L050"
         android:foreground="?attr/selectableItemBackground">
 
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/all_padding_left_right"
-            android:background="@drawable/singleline_zhouyu_huanggai"
-            app:layout_constraintTop_toBottomOf="@id/tv_date" />
-
         <ImageView
             android:id="@+id/img"
             android:layout_width="50dp"
@@ -67,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"
@@ -78,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"
@@ -115,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"
@@ -150,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,8 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/all_padding_left_right"
-        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_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" />
 
         <LinearLayout
             android:id="@+id/ll_boss"