1.0.3发版 添加支付底部话术和首页弹窗话述

position/app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.mints.xunmi"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 3
-        versionName "1.0.2"
+        versionCode 4
+        versionName "1.0.3"
         flavorDimensions "default"
 
         // dex突破65535的限制

position/app/src/main/java/com/mints/xunmi/mvp/model/VipBean.java

@@ -7,6 +7,16 @@ public class VipBean implements Serializable {
 
     private List<ListBean> list;
 
+    private String content;
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
     public List<ListBean> getList() {
         return list;
     }

position/app/src/main/java/com/mints/xunmi/ui/activitys/Vip2Activity.kt

@@ -98,6 +98,13 @@ class Vip2Activity : BaseActivity()
             if (data != null && data.list != null && data.list.size > 0) {
                 vipList = data.list
                 tvVip2Cash.text = "${vipList!![0].price}元"
+
+                if (!TextUtils.isEmpty(data.content)) {
+                    tvVipContent.visibility = View.VISIBLE
+                    tvVipContent.text = data.content
+                } else {
+                    tvVipContent.visibility = View.GONE
+                }
             }
         }
     }

position/app/src/main/java/com/mints/xunmi/ui/activitys/Vip3Activity.kt

@@ -98,6 +98,14 @@ class Vip3Activity : BaseActivity()
         if (!isFinishing()) {
             if (data != null && data.list != null && data.list.size > 0) {
                 vipList = data.list
+
+                if (!TextUtils.isEmpty(data.content)) {
+                    tvVipContent.visibility = View.VISIBLE
+                    tvVipContent.text = data.content
+                } else {
+                    tvVipContent.visibility = View.GONE
+                }
+
                 initRvView()
             }
         }

position/app/src/main/res/layout/activity_vip2.xml

@@ -236,5 +236,14 @@
             android:textColor="@color/black"
             android:textSize="14sp" />
     </LinearLayout>
+    <TextView
+        android:id="@+id/tvVipContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="30pt"
+        android:layout_marginTop="20pt"
+        android:layout_marginRight="30pt"
+        android:textColor="@color/black"
+        android:textSize="14sp" />
 </LinearLayout>
 

position/app/src/main/res/layout/activity_vip3.xml

@@ -95,5 +95,15 @@
                 android:textColor="@color/graygai"
                 android:textSize="14sp" />
         </LinearLayout>
+
+        <TextView
+            android:id="@+id/tvVipContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="30pt"
+            android:layout_marginTop="10pt"
+            android:layout_marginRight="30pt"
+            android:textColor="@color/graygai"
+            android:textSize="14sp" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

position/app/src/main/res/layout/dialog_power.xml

@@ -38,7 +38,7 @@
                     android:layout_marginLeft="16dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginRight="16dp"
-                    android:text="我们依据最新的法律,向您说明寻蜜软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
+                    android:text="本APP需要双方安装并加好友授权同意，APP付费方即可时刻关注对方的位置信息。我们依据最新的法律,向您说明寻蜜软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
                     android:textColor="@color/black"
                     android:textSize="14sp" />