From d49c73f77965a94d86b0f58993d2a2df07d3e99d Mon Sep 17 00:00:00 2001
From: mahaifeng <mahaifeng@dcloud.io>
Date: Thu, 26 Sep 2024 11:13:42 +0800
Subject: [PATCH] =?UTF-8?q?[privacy]=E6=B7=BB=E5=8A=A0=E9=9A=90=E7=A7=81?=
 =?UTF-8?q?=E6=94=BF=E7=AD=96=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.uvue                                      | 29 +++++++++++++++++--
 pages.json                                    |  7 +++++
 pages/API/dialog-page/dialog-privacytest.uvue | 29 ++++++++++---------
 pages/component/open-type/open-type.uvue      | 21 +++++++-------
 4 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/App.uvue b/App.uvue
index 831d2ac3..bd361ebd 100644
--- a/App.uvue
+++ b/App.uvue
@@ -28,7 +28,8 @@
         path: ''
       } as OnShowOptions
     },
-    onLaunch: function (res : OnLaunchOptions) {
+    onLaunch: function (res : OnLaunchOptions) {
+
       this.globalData.launchOptions = res
 
       // 自动化测试
@@ -55,7 +56,31 @@
       	}, fail(err) {
       		console.log(err);
       	}
-      })
+      })
+      // #ifdef APP
+      if (process.env.NODE_ENV === 'development') {
+        //真机运行可以去掉此注释
+         //  uni.getPrivacySetting({
+         //   success(res){
+         //      if(res.needAuthorization){
+         //        uni.openDialogPage({
+         //          url: '/pages/API/dialog-page/dialog-privacytest',
+         //        })
+         //      }
+         //   }
+         // })
+      }else {
+         uni.getPrivacySetting({
+           success(res1){
+              if(res1.needAuthorization){
+                uni.openDialogPage({
+                  url: '/pages/API/dialog-page/dialog-privacytest',
+                })
+              }
+           }
+         })
+      }
+      // #endif
     },
     onShow: function (res : OnShowOptions) {
       this.globalData.onShowOption = res
diff --git a/pages.json b/pages.json
index 165a2d8f..c22aa3eb 100644
--- a/pages.json
+++ b/pages.json
@@ -1861,6 +1861,13 @@
 				"navigationBarTitleText": "",
 				"backgroundColorContent": "#fffae8"
 			}
+		},
+		{
+		  "path" : "pages/API/dialog-page/dialog-privacytest",
+		  "style" : 
+		  {
+		    "navigationBarTitleText" : ""
+		  }
 		}
 	],
 	"globalStyle": {
diff --git a/pages/API/dialog-page/dialog-privacytest.uvue b/pages/API/dialog-page/dialog-privacytest.uvue
index 582097f4..18dc793b 100644
--- a/pages/API/dialog-page/dialog-privacytest.uvue
+++ b/pages/API/dialog-page/dialog-privacytest.uvue
@@ -1,10 +1,14 @@
 <template>
   <view class="dialog-container">
     <view class="dialog-content">
-      <text style="text-align: center;margin: 12px;font-size: 20px;"> 隐私协议弹框</text>
-      <button type="primary" style="margin-top: 12px;margin-bottom: 12px;" open-type="agreePrivacyAuthorization"
+      <text style="text-align: center;margin: 12px;font-size: 20px;"> 个人信息保护指引</text>
+      <text style="color: #333333;">欢迎使用Hello UNI APPX，我们将通过《用户服务协议》及相关个人信息处理规则帮助你了解我们如何收集、处理个人信息。
+        根据《常见类型移动互联网应用程序必要个人信息范围规定》。同意《基本功能数据处理规则》仅代表你同意使用浏览、搜索、下载等主要功能收集、处理相关必要个人信息及数据。
+        此外，为了向你提供更多丰富、优质的服务，我们可能在你使用本产品的过程中提供电商购物、财经支付等扩展功能，如果你拒绝提供，你可能无法使用相应的扩展服务，但不影响你使用我们的基础服务。我们通过《隐私政策》帮助你全面了解我们的服务及收集、处理个人信息的详细情况。
+      </text>
+      <button type="warn" style="margin-top: 12px;margin-bottom: 12px;" open-type="agreePrivacyAuthorization"
         @click="agree">同意</button>
-      <button @click="reject">拒绝</button>
+      <button @click="reject">不同意</button>
     </view>
   </view>
 </template>
@@ -15,27 +19,24 @@
 
       }
     },
-    methods: {
-      agree() {
-        // #ifdef APP-ANDROID
+    onLoad() {
+      uni.onPrivacyAuthorizationChange((callback) => {
         uni.showToast({
-          title: 'isPrivacyAgree:' + UTSAndroid.isPrivacyAgree()
+          title: 'isPrivacyAgree:' + !callback.needAuthorization
         })
+      })
+    },
+    methods: {
+      agree() {
         uni.closeDialogPage({
           dialogPage: this.$page as UniDialogPage
         })
-        // #endif
       },
       reject() {
-        // #ifdef APP-ANDROID
-        UTSAndroid.setPrivacyAgree(false)
-        uni.showToast({
-          title: 'isPrivacyAgree:' + UTSAndroid.isPrivacyAgree()
-        })
+        uni.resetPrivacyAuthorization()
         uni.closeDialogPage({
           dialogPage: this.$page as UniDialogPage
         })
-        // #endif
       }
     }
   }
diff --git a/pages/component/open-type/open-type.uvue b/pages/component/open-type/open-type.uvue
index e043d57b..9ff2f4be 100644
--- a/pages/component/open-type/open-type.uvue
+++ b/pages/component/open-type/open-type.uvue
@@ -2,7 +2,8 @@
   <!-- #ifdef APP -->
   <scroll-view style="flex:1">
   <!-- #endif -->
-    <button id="opentype"  style="margin: 12px;" type="primary" open-type="agreePrivacyAuthorization" @click="agree">agreePrivacyAuthorization</button>
+    <button id="opentype" style="margin: 12px;" type="primary"
+      open-type="agreePrivacyAuthorization">agreePrivacyAuthorization</button>
   <!-- #ifdef APP -->
   </scroll-view>
   <!-- #endif -->
@@ -16,17 +17,15 @@
         log: "",
       }
     },
+    onLoad() {
+      uni.onPrivacyAuthorizationChange((callback) => {
+        this.isAgreeRes = !callback.needAuthorization
+        uni.showToast({
+          title: 'isPrivacyAgree:' + this.isAgreeRes
+        })
+      })
+    },
     methods: {
-      agree() {
-        // #ifdef APP-ANDROID
-
-        let res = UTSAndroid.isPrivacyAgree()
-        this.isAgreeRes = res
-         uni.showToast({
-           title:'isPrivacyAgree:'+res
-         })
-        // #endif
-      }
     }
   }
 </script>
-- 
GitLab