冲突合并

This commit is contained in:
BianLzhaoMin 2024-11-07 08:49:20 +08:00
parent b4ec9297e9
commit 3a52601293
1 changed files with 249 additions and 257 deletions

View File

@ -1,41 +1,41 @@
{ {
"name" : "作业管控智慧平台", "name": "作业管控智慧平台",
"appid" : "__UNI__5A28908", "appid": "__UNI__5A28908",
"description" : "作业管控智慧平台", "description": "作业管控智慧平台",
"versionName" : "1.0.11", "versionName": "1.0.11",
"versionCode" : 111, "versionCode": 111,
"transformPx" : false, "transformPx": false,
"app-plus" : { "app-plus": {
"runmode" : "liberate", "runmode": "liberate",
"compatible" : { "compatible": {
"ignoreVersion" : true "ignoreVersion": true
}, },
"popGesture" : "none", "popGesture": "none",
"useragent" : { "useragent": {
"value" : "Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Html5Plus/1.0 (Immersed/20) uni-app", "value": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Html5Plus/1.0 (Immersed/20) uni-app",
"concatenate" : true //true false "concatenate": true //true false
}, },
"usingComponents" : true, "usingComponents": true,
"nvueCompiler" : "uni-app", "nvueCompiler": "uni-app",
"nvueStyleCompiler" : "uni-app", "nvueStyleCompiler": "uni-app",
"compilerVersion" : 3, "compilerVersion": 3,
"nvueLaunchMode" : "fast", "nvueLaunchMode": "fast",
"splashscreen" : { "splashscreen": {
"alwaysShowBeforeRender" : true, "alwaysShowBeforeRender": true,
"waiting" : true, "waiting": true,
"autoclose" : true, "autoclose": true,
"delay" : 0 "delay": 0
}, },
"modules" : { "modules": {
"Camera" : {}, "Camera": {},
"VideoPlayer" : {}, "VideoPlayer": {},
"Barcode" : {}, "Barcode": {},
"FaceID" : {}, "FaceID": {},
"Geolocation" : {} "Geolocation": {}
}, },
"distribute" : { "distribute": {
"android" : { "android": {
"permissions" : [ "permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@ -54,213 +54,205 @@
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>" "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>"
], ],
"schemes" : "blob" "schemes": "blob"
}, },
"ios" : { "ios": {
"permissions" : { "permissions": {
"WRITE_EXTERNAL_STORAGE" : { "WRITE_EXTERNAL_STORAGE": {
"description" : "允许应用保存文件到外部存储", "description": "允许应用保存文件到外部存储",
"permission" : "YES" "permission": "YES"
}, },
"READ_EXTERNAL_STORAGE" : { "READ_EXTERNAL_STORAGE": {
"description" : "允许应用从外部存储读取文件", "description": "允许应用从外部存储读取文件",
"permission" : "YES" "permission": "YES"
} }
}, },
"urlschemewhitelist" : [ "baidumap", "iosamap" ], "urlschemewhitelist": ["baidumap", "iosamap"],
"dSYMs" : false, "dSYMs": false,
"privacyDescription" : { "privacyDescription": {
"NSAppleMusicUsageDescription" : "库该应用需要访问你的媒体资料,以便为你编辑个人信息", "NSAppleMusicUsageDescription": "库该应用需要访问你的媒体资料,以便为你编辑个人信息",
"NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册,以便为你编辑个人信息,更新头像设置", "NSPhotoLibraryUsageDescription": "该应用需要读取你的相册,以便为你编辑个人信息,更新头像设置",
"NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册,以便为你编辑个人信息,更新头像设置", "NSPhotoLibraryAddUsageDescription": "该应用需要读取你的相册,以便为你编辑个人信息,更新头像设置",
"NSCameraUsageDescription" : "该应用需要你的相机,以便你拍摄上传个人信息,更新头像设置,验证是否为本人", "NSCameraUsageDescription": "该应用需要你的相机,以便你拍摄上传个人信息,更新头像设置,验证是否为本人",
"NSMicrophoneUsageDescription" : "", "NSMicrophoneUsageDescription": "",
"NSLocationWhenInUseUsageDescription" : "该应用需要你的位置信息,以便为你编辑个人信息", "NSLocationWhenInUseUsageDescription": "该应用需要你的位置信息,以便为你编辑个人信息",
"NSLocationAlwaysUsageDescription" : "该应用需要你的位置信息,以便为你编辑个人信息", "NSLocationAlwaysUsageDescription": "该应用需要你的位置信息,以便为你编辑个人信息",
"NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要你的位置信息,以便为你编辑个人信息", "NSLocationAlwaysAndWhenInUseUsageDescription": "该应用需要你的位置信息,以便为你编辑个人信息",
"NSCalendarsUsageDescription" : "该应用需要你的日历,以便为你编辑个人信息", "NSCalendarsUsageDescription": "该应用需要你的日历,以便为你编辑个人信息",
"NSContactsUsageDescription" : "", "NSContactsUsageDescription": "",
"NSLocalNetworkUsageDescription" : "该应用需要你的网络,以便为你编辑个人信息" "NSLocalNetworkUsageDescription": "该应用需要你的网络,以便为你编辑个人信息"
}, },
"idfa" : false "idfa": false
}, },
"sdkConfigs" : { "sdkConfigs": {
"ad" : {}, "ad": {},
"geolocation" : { "geolocation": {
"system" : { "system": {
"__platform__" : [ "ios", "android" ] "__platform__": ["ios", "android"]
<<<<<<< HEAD
}, },
"baidu" : { "baidu": {
"__platform__" : [ "android" ], "__platform__": ["android"],
"appkey_ios" : "", "appkey_ios": "",
"appkey_android" : "MCuOO39EDhdgg9vvkEE2eOyba201oQOF" "appkey_android": "MCuOO39EDhdgg9vvkEE2eOyba201oQOF"
} }
}, },
"maps" : { "maps": {
"baidu" : { "baidu": {
======= "appkey_ios": "",
} "appkey_android": ""
},
"maps" : {
"amap" : {
"name" : "",
>>>>>>> dev-sy-10-10
"appkey_ios" : "",
"appkey_android" : ""
} }
} }
}, },
"orientation" : [ "portrait-primary" ], "orientation": ["portrait-primary"],
"icons" : { "icons": {
"ios" : { "ios": {
"iphone" : { "iphone": {
"app@2x" : "unpackage/res/icons/120x120.png", "app@2x": "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png", "app@3x": "unpackage/res/icons/180x180.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png", "spotlight@2x": "unpackage/res/icons/80x80.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x": "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png", "notification@3x": "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x": "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png", "settings@3x": "unpackage/res/icons/87x87.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png" "spotlight@3x": "unpackage/res/icons/120x120.png"
}, },
"appstore" : "unpackage/res/icons/1024x1024.png", "appstore": "unpackage/res/icons/1024x1024.png",
"ipad" : { "ipad": {
"app" : "unpackage/res/icons/76x76.png", "app": "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png", "app@2x": "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png", "notification": "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x": "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png", "proapp@2x": "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png", "settings": "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x": "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png", "spotlight": "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png" "spotlight@2x": "unpackage/res/icons/80x80.png"
} }
}, },
"android" : { "android": {
"hdpi" : "unpackage/res/icons/72x72.png", "hdpi": "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png", "xhdpi": "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png", "xxhdpi": "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png" "xxxhdpi": "unpackage/res/icons/192x192.png"
} }
}, },
"splashscreen" : { "splashscreen": {
"iosStyle" : "common" "iosStyle": "common"
} }
}, },
"uniStatistics" : { "uniStatistics": {
"enable" : true "enable": true
} }
}, },
"quickapp" : {}, "quickapp": {},
"quickapp-native" : { "quickapp-native": {
"icon" : "/static/logo.png", "icon": "/static/logo.png",
"package" : "com.example.demo", "package": "com.example.demo",
"features" : [ "features": [
{ {
"name" : "system.clipboard" "name": "system.clipboard"
} }
] ]
}, },
"quickapp-webview" : { "quickapp-webview": {
"icon" : "/static/logo.png", "icon": "/static/logo.png",
"package" : "com.example.demo", "package": "com.example.demo",
"minPlatformVersion" : 1070, "minPlatformVersion": 1070,
"versionName" : "1.0.0", "versionName": "1.0.0",
"versionCode" : 100 "versionCode": 100
}, },
"mp-weixin" : { "mp-weixin": {
"appid" : "", "appid": "",
"setting" : { "setting": {
"urlCheck" : false "urlCheck": false
}, },
"usingComponents" : true, "usingComponents": true,
"permission" : { "permission": {
"scope.userLocation" : { "scope.userLocation": {
"desc" : "演示定位能力" "desc": "演示定位能力"
} }
}, },
"uniStatistics" : { "uniStatistics": {
"enable" : true "enable": true
} }
}, },
"mp-alipay" : { "mp-alipay": {
"usingComponents" : true, "usingComponents": true,
"uniStatistics" : { "uniStatistics": {
"enable" : true "enable": true
} }
}, },
"mp-baidu" : { "mp-baidu": {
"usingComponents" : true, "usingComponents": true,
"uniStatistics" : { "uniStatistics": {
"enable" : true "enable": true
}, },
"dynamicLib" : { "dynamicLib": {
"editorLib" : { "editorLib": {
"provider" : "swan-editor" "provider": "swan-editor"
} }
} }
}, },
"mp-toutiao" : { "mp-toutiao": {
"usingComponents" : true, "usingComponents": true,
"uniStatistics" : { "uniStatistics": {
"enable" : true "enable": true
} }
}, },
"mp-jd" : { "mp-jd": {
"usingComponents" : true, "usingComponents": true,
"uniStatistics" : { "uniStatistics": {
"enable" : true "enable": true
} }
}, },
"h5" : { "h5": {
"template" : "template.h5.html", "template": "template.h5.html",
"router" : { "router": {
"mode" : "history", "mode": "history",
"base" : "" "base": ""
}, },
"sdkConfigs" : { "sdkConfigs": {
"maps" : { "maps": {
"qqmap" : { "qqmap": {
"key" : "TKUBZ-D24AF-GJ4JY-JDVM2-IBYKK-KEBCU" "key": "TKUBZ-D24AF-GJ4JY-JDVM2-IBYKK-KEBCU"
} }
} }
}, },
"async" : { "async": {
"timeout" : 20000 "timeout": 20000
}, },
"uniStatistics" : { "uniStatistics": {
"enable" : true "enable": true
} }
}, },
"vueVersion" : "2", "vueVersion": "2",
"mp-kuaishou" : { "mp-kuaishou": {
"uniStatistics" : { "uniStatistics": {
"enable" : true "enable": true
} }
}, },
"mp-lark" : { "mp-lark": {
"uniStatistics" : { "uniStatistics": {
"enable" : true "enable": true
} }
}, },
"mp-qq" : { "mp-qq": {
"uniStatistics" : { "uniStatistics": {
"enable" : true "enable": true
} }
}, },
"quickapp-webview-huawei" : { "quickapp-webview-huawei": {
"uniStatistics" : { "uniStatistics": {
"enable" : true "enable": true
} }
}, },
"quickapp-webview-union" : { "quickapp-webview-union": {
"uniStatistics" : { "uniStatistics": {
"enable" : true "enable": true
} }
}, },
"uniStatistics" : { "uniStatistics": {
"version" : "2", "version": "2",
"enable" : true "enable": true
} }
} }