修改会员充值

app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/fragment/VipLevelEditFragment.java

@@ -33,7 +33,7 @@ public class VipLevelEditFragment extends BaseFragment<LevelPresenter, FragmentV
             pop();
         });
         if (mLevel != null) {
-            mViewBinding.infoTitle.tvTitle.setText("修改会员");
+            mViewBinding.infoTitle.tvTitle.setText("等级编辑");
             mViewBinding.levelName.setText(mLevel.getVipLevelName());
             mViewBinding.levelDiscont.setText(String.valueOf(mLevel.getVipDefDiscount()));
             mViewBinding.updateMoney.setText( ConvertUtil.fenToYuanNoZero(mLevel.getVipUpgradeAmtTp()));

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

@@ -28,8 +28,8 @@ public final class SystemUtil {
      * @return 设备型号
      */
     public static String getDeviceModel() {
-//        return DeviceUtils.getModel();
-        return "AECRC10";
+        return DeviceUtils.getModel();
+//        return "AECRC10";
     }
 
 
@@ -57,8 +57,8 @@ public final class SystemUtil {
                 e.printStackTrace();
             }
         }
-//        return deviceSN;
-        return "548496";
+        return deviceSN;
+//        return "548496";
     }
 
     /**

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

@@ -75,7 +75,6 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:layout_marginRight="@dimen/all_margin_left"
                     android:background="@color/line_bg" />
 
                 <LinearLayout
@@ -106,11 +105,7 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:background="@mipmap/img_grade" />
+
         </LinearLayout>
 
         <View

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

@@ -2,12 +2,16 @@
 <layout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
-
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -78,4 +82,9 @@
             </LinearLayout>
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/line_bg" />
+    </LinearLayout>
 </layout>
\ No newline at end of file

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

@@ -73,7 +73,10 @@
                     android:textColor="@color/black_likui" />
             </LinearLayout>
         </LinearLayout>
-
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/line_bg" />
 
     </LinearLayout>
 

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

@@ -2,6 +2,11 @@
 <layout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
@@ -11,25 +16,33 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:orientation="vertical">
+
                 <TextView
-                android:text="张小萌"
                     android:id="@+id/vip_name"
                     style="@style/default_blacktext_bigstyle"
                     android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:text="张小萌" />
+
                 <TextView
-                android:text="13311556556"
                     android:id="@+id/vip_mobile"
                     style="@style/default_blacktext_smallstyle"
                     android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:text="13311556556" />
             </LinearLayout>
+
             <TextView
-            android:text="85折"
                 android:id="@+id/vipDiscount"
                 style="@style/default_blacktext_smallstyle"
                 android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:text="85折" />
+        </LinearLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/line_bg" />
     </LinearLayout>
 
 </layout>
\ No newline at end of file