UI

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

@@ -85,7 +85,7 @@ public class RecyclerViewUtil {
         @Override
         public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
             super.getItemOffsets(outRect, view, parent, state);
-            outRect.bottom = mDividerHight + 1;
+            outRect.top = mDividerHight + 20;
         }
 
         @Override
@@ -109,7 +109,7 @@ public class RecyclerViewUtil {
                 int bottom = 0;
 
 
-                top = child.getBottom() + params.bottomMargin;
+                top = child.getTop() - params.topMargin;
                 bottom = top + mDividerHight;
                 //画分割线
                 mDividerDarwable.setBounds(left, top, right, bottom);

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

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

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

@@ -74,14 +74,10 @@
             android:id="@+id/fragment_casher_recycler"
             android:layout_width="0dp"
             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" />
-
-
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -45,34 +45,41 @@
         </LinearLayout>
 
 
-        <TextView
-            android:id="@+id/tv_count"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/singleline_zhouyu_huanggai"
-            android:paddingBottom="@dimen/all_padding"
-            android:paddingStart="@dimen/all_padding_left_right"
-            android:paddingTop="@dimen/all_padding"
-            android:text="共0人次盘库记录"
-            android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/all_text_size_low"
-            android:textStyle="bold" />
+            android:layout_height="match_parent">
 
 
             <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/tv_count"
+                android:layout_marginTop="@dimen/Minus_padding_left_right">
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/recycler_inventory"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                android:background="@color/gray_zhouyu">
+                    android:background="@color/gray_zhouyu"></android.support.v7.widget.RecyclerView>
 
-            </android.support.v7.widget.RecyclerView>
             </android.support.v4.widget.SwipeRefreshLayout>
 
+            <TextView
+                android:id="@+id/tv_count"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/singleline_zhouyu_huanggai"
+                android:paddingBottom="@dimen/all_padding"
+                android:paddingStart="@dimen/all_padding_left_right"
+                android:paddingTop="@dimen/all_padding"
+                android:text="共0人次盘库记录"
+                android:textColor="@color/black_baozheng"
+                android:textSize="@dimen/all_text_size_low"
+                android:textStyle="bold" />
+
+        </RelativeLayout>
+
+
     </LinearLayout>
 </layout>
\ No newline at end of file

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

@@ -144,7 +144,7 @@
                 android:layout_marginTop="@dimen/all_spacing"
                 android:contentDescription="@string/store_cart"
                 android:foreground="?attr/actionBarItemBackground"
-                android:src="@mipmap/shopping_cart" />
+                android:src="@mipmap/inventory_cart" />
 
             <TextView
                 android:layout_width="@dimen/store_cart_count"

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

@@ -51,7 +51,7 @@
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tab"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:tabMinWidth="150dp"
             app:tabTextColor="@color/black_baozheng">
@@ -62,8 +62,8 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="@dimen/all_margin"
-            android:background="@drawable/singleline_zhouyu_huanggai" />
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_huanggai" />
 
         <android.support.v4.view.ViewPager
             android:id="@+id/fragment_container"

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

@@ -15,9 +15,9 @@
 
             <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:background="@color/gray_zhouyu"
                 android:visibility="visible">
 
 

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

@@ -17,11 +17,12 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:orientation="horizontal">
+
             <include
                 android:id="@+id/title_search"
                 layout="@layout/title_search"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1" />
 
         </LinearLayout>

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

@@ -11,8 +11,8 @@
         android:background="@color/white_caocao"
         android:gravity="center"
         android:orientation="vertical"
-        android:paddingBottom="25dp"
-        android:paddingTop="25dp">
+        android:paddingBottom="23.5dp"
+        android:paddingTop="23.5dp">
 
         <ImageView
             android:id="@+id/img"

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

@@ -45,12 +45,14 @@
 
         <TextView
             android:id="@+id/tv_left_top"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/all_padding_left_right"
+            android:paddingEnd="@dimen/all_padding"
             android:text="1231231244124124"
             android:textColor="@color/black_baozheng"
             android:textSize="@dimen/all_text_size"
+            app:layout_constraintEnd_toStartOf="@id/tv_right_top"
             app:layout_constraintStart_toEndOf="@id/img_left"
             app:layout_constraintTop_toTopOf="@id/img_left" />
 

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

@@ -13,22 +13,26 @@
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
-            <ImageView
-                android:layout_width="50dp"
+
+            <ImageButton
                 android:id="@+id/onBack"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:background="@mipmap/go_back" />
+                android:background="@color/transparent"
+                android:padding="@dimen/all_padding"
+                android:src="@mipmap/go_back" />
 
             <EditText
-                style="@style/editText"
                 android:id="@+id/serchEditText"
+                style="@style/searchBarEditor"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="0dp"
-                android:background="@color/gray_kongming"
-                android:layout_weight="1"
-                android:imeOptions="actionSearch"
-                android:hint="请输入手机号或会员姓名" />
+                android:layout_height="30dp"
+                android:layout_marginEnd="@dimen/all_padding"
+                android:drawablePadding="@dimen/all_padding"
+                android:hint="请输入手机号或会员姓名"
+                android:inputType="number"
+                android:textColor="@color/black_likui"
+                android:textSize="@dimen/all_text_size_low" />
 
         </LinearLayout>
     </LinearLayout>

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

@@ -53,14 +53,17 @@
             android:layout_marginBottom="@dimen/all_margin"
             android:layout_marginEnd="@dimen/all_padding_left_right"
             android:layout_marginStart="@dimen/all_padding_left_right"
-            android:layout_marginTop="@dimen/all_margin"
-            android:padding="@dimen/dp_4">
+            android:layout_marginTop="@dimen/all_margin">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white_caocao"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:paddingBottom="@dimen/dp_4"
+                android:paddingEnd="@dimen/all_padding_left_right"
+                android:paddingStart="@dimen/all_padding_left_right"
+                android:paddingTop="@dimen/dp_4">
 
                 <TextView
                     android:id="@+id/tv_amt_hint"

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

@@ -28,13 +28,16 @@
             android:layout_marginBottom="@dimen/all_margin"
             android:layout_marginEnd="@dimen/all_padding_left_right"
             android:layout_marginStart="@dimen/all_padding_left_right"
-            android:layout_marginTop="@dimen/all_margin"
-            android:padding="@dimen/dp_4">
+            android:layout_marginTop="@dimen/all_margin">
 
             <android.support.constraint.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white_caocao"
+                android:paddingBottom="@dimen/dp_4"
+                android:paddingEnd="@dimen/all_padding_left_right"
+                android:paddingStart="@dimen/all_padding_left_right"
+                android:paddingTop="@dimen/dp_4"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent">

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

@@ -46,13 +46,16 @@
             android:layout_marginBottom="@dimen/all_margin"
             android:layout_marginEnd="@dimen/all_padding_left_right"
             android:layout_marginStart="@dimen/all_padding_left_right"
-            android:layout_marginTop="@dimen/all_margin"
-            android:padding="@dimen/dp_4">
+            android:layout_marginTop="@dimen/all_margin">
 
             <android.support.constraint.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white_caocao"
+                android:paddingBottom="@dimen/dp_4"
+                android:paddingEnd="@dimen/all_padding_left_right"
+                android:paddingStart="@dimen/all_padding_left_right"
+                android:paddingTop="@dimen/dp_4"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent">

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

@@ -24,6 +24,7 @@
     <dimen name="all_title_size">26sp</dimen>
     <dimen name="all_padding">10dp</dimen>
     <dimen name="all_padding_left_right">16dp</dimen>
+    <dimen name="Minus_padding_left_right">-17dp</dimen>
     <dimen name="all_text_size_big">22sp</dimen>
     <dimen name="all_text_size_big_big">30sp</dimen>
     <dimen name="all_text_size_super_big">25sp</dimen>