提交页面修改;

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

@@ -67,8 +67,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
             return false;
         });
 
-        mViewBinding.btnScan.setOnClickListener(view -> PermissionUtils.permission
-                (PermissionConstants.CAMERA)
+        mViewBinding.btnScan.setOnClickListener(view -> PermissionUtils.permission(PermissionConstants.CAMERA)
                 .callback(new PermissionUtils.FullCallback() {
                     @Override
                     public void onGranted(List<String> permissionsGranted) {
@@ -76,12 +75,10 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
                     }
 
                     @Override
-                    public void onDenied(List<String> permissionsDeniedForever, List<String>
-                            permissionsDenied) {
+                    public void onDenied(List<String> permissionsDeniedForever, List<String> permissionsDenied) {
                     }
                 })
                 .request());
-
         mScanFragment.setOnScanCompletedListener(barcode -> mPresenter.scanComplete(barcode));
     }
 

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

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

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

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

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

@@ -68,7 +68,6 @@
                     style="@style/searchBarEditor"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_marginEnd="@dimen/all_spacing"
                     android:layout_weight="1"
                     android:hint="@string/store_search_hint"
                     android:inputType="text"
@@ -79,10 +78,12 @@
                     android:id="@+id/btn_scan"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/all_spacing"
                     android:background="@color/transparent"
                     android:contentDescription="@string/store_scan"
                     android:foreground="?android:attr/actionBarItemBackground"
-                    android:src="@mipmap/but_sweep_yard" />
+                    android:src="@mipmap/but_sweep_yard"
+                    android:visibility="@{titleMode>1?View.GONE:View.VISIBLE}" />
             </LinearLayout>
 
             <TextView

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

@@ -19,7 +19,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginEnd="@dimen/all_margin"
                 android:layout_marginStart="@dimen/all_margin"
-                android:background="@drawable/shape_gray_r1"
+                android:background="@drawable/shape_black_b2"
                 android:gravity="center_vertical"
                 android:padding="@dimen/all_spacing">
 

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

@@ -41,7 +41,7 @@
                     android:layout_marginTop="@dimen/all_margin"
                     android:gravity="center"
                     android:text="@{payResult?@string/settle_pay_succ:@string/settle_pay_fail}"
-                    android:textColor="@color/black_likui"
+                    android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/all_sub_title_size"
                     android:textStyle="bold" />
 
@@ -68,7 +68,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/settle_pay_time"
-                        android:textColor="@color/black_zhangfei"
+                        android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/all_body_size" />
 
                     <TextView
@@ -93,7 +93,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/settle_pay_type"
-                        android:textColor="@color/black_zhangfei"
+                        android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/all_body_size" />
 
                     <TextView
@@ -117,7 +117,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/settle_pay_count"
-                        android:textColor="@color/black_zhangfei"
+                        android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/all_body_size" />
 
                     <TextView
@@ -141,7 +141,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/settle_pay_order_amt"
-                        android:textColor="@color/black_zhangfei"
+                        android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/all_body_size" />
 
                     <TextView

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

@@ -18,87 +18,74 @@
         android:background="@color/gray_zhouyu"
         android:orientation="vertical">
 
-        <LinearLayout
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="@color/white_caocao"
-            android:gravity="center"
-            android:paddingEnd="@dimen/all_margin"
-            android:paddingStart="@dimen/all_margin">
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/tv_search"
                 style="@style/searchBarEditor"
                 android:layout_width="match_parent"
+                android:layout_gravity="center"
+                android:layout_marginEnd="@dimen/all_margin"
+                android:layout_marginStart="@dimen/all_margin"
                 android:gravity="center_vertical"
                 android:text="@string/store_search_hint"
                 android:textColor="@color/black_likui" />
-        </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/all_line_width"
+                android:layout_gravity="bottom"
+                android:background="@color/gray_huanggai" />
+        </FrameLayout>
 
 
-        <FrameLayout
+        <LinearLayout
             android:id="@+id/ll_ms"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="@color/white_caocao"
-            android:orientation="vertical"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="@dimen/all_margin"
+            android:layout_marginStart="@dimen/all_margin"
+            android:layout_marginTop="@dimen/all_margin"
+            android:background="@drawable/shape_black_b1"
+            android:foreground="?attr/selectableItemBackground"
+            android:gravity="center_vertical"
+            android:padding="@dimen/all_spacing"
             android:visibility="@{msCount>0 ?View.VISIBLE:View.GONE}">
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/all_line_width"
-                android:layout_gravity="top"
-                android:background="@color/gray_kongming" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:id="@+id/tv_ms_type"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginEnd="@dimen/all_margin"
-                android:layout_marginStart="@dimen/all_margin"
-                android:background="@drawable/shape_gray_r1"
-                android:foreground="?attr/selectableItemBackground"
-                android:gravity="center_vertical"
-                android:padding="@dimen/all_spacing">
-
-                <TextView
-                    android:id="@+id/tv_ms_type"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingBottom="@dimen/all_shape_radius"
-                    android:paddingEnd="@dimen/all_spacing"
-                    android:paddingStart="@dimen/all_spacing"
-                    android:paddingTop="@dimen/all_shape_radius"
-                    android:textColor="@color/white_caocao" />
-
-                <TextView
-                    android:id="@+id/tv_ms_dis"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/all_spacing"
-                    android:layout_weight="1"
-                    android:singleLine="true"
-                    android:textColor="@color/black_baozheng" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/all_spacing"
-                    android:layout_marginStart="@dimen/all_spacing"
-                    android:drawableEnd="@mipmap/but_unfurled"
-                    android:drawablePadding="@dimen/all_spacing"
-                    android:text="@{msCount +@string/store_ms_count}"
-                    android:textColor="@color/black_baozheng" />
-
-            </LinearLayout>
+                android:paddingBottom="@dimen/all_shape_radius"
+                android:paddingEnd="@dimen/all_spacing"
+                android:paddingStart="@dimen/all_spacing"
+                android:paddingTop="@dimen/all_shape_radius"
+                android:textColor="@color/white_caocao" />
 
-        </FrameLayout>
+            <TextView
+                android:id="@+id/tv_ms_dis"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/all_spacing"
+                android:layout_weight="1"
+                android:singleLine="true"
+                android:textColor="@color/black_baozheng" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/all_line_width"
-            android:layout_gravity="bottom"
-            android:background="@color/gray_huanggai" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/all_spacing"
+                android:layout_marginStart="@dimen/all_spacing"
+                android:drawableEnd="@mipmap/but_unfurled"
+                android:drawablePadding="@dimen/all_spacing"
+                android:text="@{msCount +@string/store_ms_count}"
+                android:textColor="@color/black_baozheng" />
+        </LinearLayout>
 
         <View
             android:layout_width="match_parent"

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

@@ -22,8 +22,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/all_spacing"
-            android:textColor="@color/black_likui"
-            android:textSize="@dimen/all_body_size" />
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_text_size" />
 
     </LinearLayout>
 </layout>

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

@@ -21,8 +21,8 @@
 
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/iv_pic"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
             app:failureImage="@mipmap/icon_goods_default"
             app:placeholderImage="@mipmap/icon_goods_default"
             app:roundedCornerRadius="@dimen/all_shape_radius" />
@@ -43,8 +43,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/all_spacing"
-            app:layout_constraintBottom_toBottomOf="@id/iv_pic"
-            app:layout_constraintLeft_toLeftOf="@id/tv_name">
+            app:layout_constraintLeft_toLeftOf="@id/tv_name"
+            app:layout_constraintTop_toBottomOf="@id/tv_name">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -67,11 +67,10 @@
             android:id="@+id/ll_count"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/all_spacing"
             android:animateLayoutChanges="true"
             android:gravity="center"
             app:layout_constraintRight_toRightOf="@id/tv_name"
-            app:layout_constraintTop_toBottomOf="@id/tv_name">
+            app:layout_constraintTop_toBottomOf="@id/ll_price">
 
             <ImageView
                 android:id="@+id/iv_reduce"
@@ -112,7 +111,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/iv_pic" />
+            app:layout_constraintTop_toBottomOf="@id/ll_count" />
 
     </android.support.constraint.ConstraintLayout>