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