Browse Source

增加个人信息收集清单以及第三方sdk共享清单

zk 1 year ago
parent
commit
d036bcf169

+ 2 - 0
app/src/main/java/com/datarecovery/master/data/consts/Constants.java

@@ -15,6 +15,8 @@ public class Constants {
 
     public static final String USER_AGREEMENT = "http://cdn.myaskai.cn/manyue/static/wjsjhfds-manyue-clause.html";
 
+    public static final String USER_INFO_LIST = "https://cdn.myaskai.cn/manyue/wjsjhfds/user_inifo_list.html";
+    public static final String THREE_SDK_LIST = "https://cdn.myaskai.cn/manyue/wjsjhfds/sdk_list.html";
 
     public static final int PAYMENT_WAY_WECHAT = 1;
     public static final int PAYMENT_WAY_WECHAT_SCAN = 2;

+ 2 - 0
app/src/main/java/com/datarecovery/master/module/about/AboutActivity.java

@@ -90,6 +90,8 @@ public class AboutActivity extends BaseActivity<ActivityAboutBinding> {
                 times++;
             }
         });
+        binding.setInformationListClick(v -> BrowserActivity.start(this, Constants.USER_INFO_LIST));
+        binding.setSdkSharingListClick(v -> BrowserActivity.start(this, Constants.THREE_SDK_LIST));
     }
 
     @Override

+ 42 - 58
app/src/main/res/layout/activity_about.xml

@@ -12,6 +12,14 @@
         <variable
             name="privacyAgreementClick"
             type="android.view.View.OnClickListener" />
+
+        <variable
+            name="informationListClick"
+            type="android.view.View.OnClickListener" />
+
+        <variable
+            name="sdkSharingListClick"
+            type="android.view.View.OnClickListener" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -71,6 +79,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/app_common_page_horizontal_padding"
+            android:paddingVertical="6dp"
             android:text="@string/version_title"
             android:textColor="@color/common_txt_color"
             android:textSize="14sp"
@@ -89,66 +98,41 @@
             app:layout_constraintTop_toTopOf="@+id/tv_version_title"
             tools:text="1.0.0" />
 
-
-        <TextView
-            android:id="@+id/tv_user_agreement"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/app_common_page_horizontal_padding"
-            android:layout_marginTop="16dp"
-            android:text="@string/about_user_agreement"
-            android:textColor="@color/common_txt_color"
-            android:textSize="14sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_version_title" />
-
-        <ImageView
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginEnd="@dimen/app_common_page_horizontal_padding"
-            android:src="@drawable/icon_setting_arrow"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_user_agreement"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tv_user_agreement"
-            app:layout_constraintWidth_percent="0.0555555555555556" />
-
-        <View
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:onClick="@{userAgreementClick}"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_user_agreement"
-            app:layout_constraintTop_toTopOf="@+id/tv_user_agreement" />
-
-        <TextView
-            android:id="@+id/tv_privacy_agreement"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/app_common_page_horizontal_padding"
-            android:layout_marginTop="16dp"
-            android:text="@string/about_privacy_agreement"
-            android:textColor="@color/common_txt_color"
-            android:textSize="14sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_user_agreement" />
-
-        <ImageView
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginEnd="@dimen/app_common_page_horizontal_padding"
-            android:src="@drawable/icon_setting_arrow"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_privacy_agreement"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tv_privacy_agreement"
-            app:layout_constraintWidth_percent="0.0555555555555556" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:onClick="@{privacyAgreementClick}"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_privacy_agreement"
-            app:layout_constraintTop_toTopOf="@+id/tv_privacy_agreement" />
+            android:orientation="vertical"
+            app:layout_constraintTop_toBottomOf="@+id/tv_version_title">
+
+            <include
+                itemName="@{@string/about_user_agreement}"
+                layout="@layout/layout_item_about"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:onClick="@{userAgreementClick}" />
+
+            <include
+                itemName="@{@string/about_privacy_agreement}"
+                layout="@layout/layout_item_about"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:onClick="@{privacyAgreementClick}" />
+
+            <include
+                itemName="@{@string/about_personal_information_list}"
+                layout="@layout/layout_item_about"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:onClick="@{informationListClick}" />
+
+            <include
+                itemName="@{@string/about_sdk_sharing_list}"
+                layout="@layout/layout_item_about"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:onClick="@{sdkSharingListClick}" />
+
+        </LinearLayout>
 
 
         <View

+ 47 - 0
app/src/main/res/layout/layout_item_about.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="itemName"
+            type="String" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_ripple_common_mask"
+        android:paddingVertical="6dp">
+
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/app_common_page_horizontal_padding"
+            android:text="@{itemName}"
+            android:textColor="@color/common_txt_color"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@string/mine_about" />
+
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginEnd="@dimen/app_common_page_horizontal_padding"
+            android:src="@drawable/icon_setting_arrow"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_name"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tv_name"
+            app:layout_constraintWidth_percent="0.0555555555555556" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

+ 2 - 0
app/src/main/res/values/strings.xml

@@ -216,4 +216,6 @@
     <string name="member_has_this_permission">已有该服务,不可重复购买</string>
     <string name="no_customer_service">暂未配置</string>
     <string name="about_record_number">App服务备案号:皖ICP备2023011908号-8A</string>
+    <string name="about_personal_information_list">个人信息收集清单</string>
+    <string name="about_sdk_sharing_list">第三方SDK共享清单</string>
 </resources>