Browse Source

config: manifest; bugfix: ios permition

able99 4 years ago
parent
commit
4276882e9c
2 changed files with 35 additions and 33 deletions
  1. 21 20
      manifest.json
  2. 14 13
      utils/permission.js

+ 21 - 20
manifest.json

@@ -30,25 +30,26 @@
                     "<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_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
                     "<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_CONTACTS\"/>",
                     "<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.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
-            "ios" : {},
+            "ios" : {
+                "idfa" : false,
+                "privacyDescription" : {
+                    "NSCameraUsageDescription" : "讲解和自助采摘需要访问您的摄像头",
+                    "NSMicrophoneUsageDescription" : "讲解和自助采摘需要访问您的麦克风"
+                }
+            },
             /* ios打包配置 */
             "sdkConfigs" : {
                 "ad" : {},
@@ -56,19 +57,19 @@
                     "weixin" : {
                         "__platform__" : [ "android" ],
                         "appid" : "wx53db61c69b2e1ed1",
-                        "UniversalLinks" : ""
+                        "UniversalLinks" : "https://www.qianjiadi.com/merchant/"
                     }
                 },
                 "oauth" : {
                     "weixin" : {
                         "appid" : "wx53db61c69b2e1ed1",
                         "appsecret" : "944e2b205734646479c0b76be6cdbd90",
-                        "UniversalLinks" : ""
+                        "UniversalLinks" : "https://www.qianjiadi.com/merchant/"
                     }
                 }
             },
             "splashscreen" : {
-                "androidStyle" : "default",
+                "androidStyle" : "common",
                 "iosStyle" : "common"
             },
             "icons" : {
@@ -105,17 +106,17 @@
             }
         },
         "nativePlugins" : {
-            "JhliveApp" : {
+            "JH-JhliveApp" : {
                 "__plugin_info__" : {
-                    "name" : "JhliveApp",
-                    "description" : "示例插件",
-                    "platforms" : "Android",
-                    "url" : "",
-                    "android_package_name" : "",
-                    "ios_bundle_id" : "",
-                    "isCloud" : false,
-                    "bought" : -1,
-                    "pid" : "",
+                    "name" : "吉亨直播插件",
+                    "description" : "腾讯ios、安卓直播插件",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=3810",
+                    "android_package_name" : "uni.D204FA0",
+                    "ios_bundle_id" : "com.qianjiadi.merchant",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "3810",
                     "parameters" : {}
                 }
             }
@@ -141,7 +142,7 @@
             "mode" : "history",
             "base" : "./"
         },
-        "title" : "cereshop",
+        "title" : "merchant",
         "domain" : "39.100.102.234",
         "devServer" : {
             "port" : 8081

+ 14 - 13
utils/permission.js

@@ -295,19 +295,20 @@ function checkAndRequestPermission(permissionIds) {
 		});
 		// #endif
 		// #ifdef APP-PLUS||APP-NVUE
-		if(isIos) {
-			permissionIds = {
-				'scope.camera': 'camera',
-				'scope.record': 'record',
-			}[permissionIds];
-			console.log(TAGLOG, 'ios', permissionIds);
-			let res = judgeIosPermission(permissionIds);
-			console.log(TAGLOG, 'ios', res);
-			if(res){
-				resolve(true);
-			}else{
-				reject();
-			}
+		if(isIos) {
+			resolve(true);
+			// permissionIds = {
+			// 	'scope.camera': 'camera',
+			// 	'scope.record': 'record',
+			// }[permissionIds];
+			// console.log(TAGLOG, 'ios', permissionIds);
+			// let res = judgeIosPermission(permissionIds);
+			// console.log(TAGLOG, 'ios', res);
+			// if(res){
+			// 	resolve(true);
+			// }else{
+			// 	reject();
+			// }
 		}else {
 			permissionIds = {
 				'scope.camera': 'android.permission.CAMERA',