隐私政策弹框更新

manifest.json

@@ -41,31 +41,19 @@
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_COMPONENT_ENABLED_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.DISABLE_KEYGUARD\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.INSTALL_LOCATION_PROVIDER\"/>",
                     "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
-                    "<uses-permission android:name=\"android.permission.INSTALL_SHORTCUT\"/>",
                     "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.UPDATE_DEVICE_STATS\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                "targetSdkVersion" : 30
+                "targetSdkVersion" : 30,
+                "excludePermissions" : []
             },
             /* ios打包配置 */
             "ios" : {
@@ -119,6 +107,9 @@
                         "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
+            },
+            "splashscreen" : {
+                "useOriginalMsgbox" : true
             }
         },
         "uniStatistics" : {

manifest.json.rej

@@ -1,12 +0,0 @@
-diff a/manifest.json b/manifest.json	(rejected hunks)
-@@ -2,8 +2,8 @@
-     "name" : "云飞智控",
-     "appid" : "__UNI__DBA6730",
-     "description" : "",
--    "versionName" : "1.5.7",
--    "versionCode" : 157,
-+    "versionName" : "1.5.8",
-+    "versionCode" : 158,
-     "transformPx" : false,
-     /* 5+App特有相关 */
-     "app-plus" : {

pages/login/login.vue

@@ -97,7 +97,7 @@
 	export default {
 		data() {
 			return {
-				tipshow: true,
+				tipshow: false,
 				isAgree: false,
 				checked: false,
 				formdata: {
@@ -119,16 +119,20 @@
 		},
 		onLoad() {},
 		onShow() {
-			uni.getStorage({
-				key: 'showTip',
-				success: (res) => {
-					if (res.data) {
-						this.tipshow = !res.data;
-					} else {
-						this.tipshow = true;
-					}
-				}
-			})
+			// plus.runtime.disagreePrivacy();
+			if(!plus.runtime.isAgreePrivacy) {
+				this.tipshow = true;
+			}
+			// uni.getStorage({
+			// 	key: 'showTip',
+			// 	success: (res) => {
+			// 		if (res.data) {
+			// 			this.tipshow = !res.data;
+			// 		} else {
+			// 			this.tipshow = true;
+			// 		}
+			// 	}
+			// })
 			uni.getStorage({
 				key: 'user_pass',
 				success: (res) => {
@@ -168,12 +172,14 @@
 			},
 			agreeTip() {
 				this.tipshow = false;
-				uni.setStorage({
-					key: "showTip",
-					data: true,
-				})
+				plus.runtime.agreePrivacy();
+				// uni.setStorage({
+				// 	key: "showTip",
+				// 	data: true,
+				// })
 			},
 			quitApp() {
+				plus.runtime.disagreePrivacy();
 				plus.runtime.quit();
 			},
 			checkboxChange(e) {
@@ -302,7 +308,7 @@
 				if(!this.isAgree) {
 					uni.showToast({
 						title: "请先阅读并同意服务协议、隐私协议",
-						icon: "error"
+						icon: "none"
 					})
 					return
 				}