Merge branch 'master' of http://114.115.147.140:3000/yf_lj/bigDataApp

# Conflicts:
#	unpackage/cache/wgt/__UNI__DBA6730/app-service.js
#	unpackage/dist/build/app-plus/app-service.js

manifest.json

@@ -1,175 +1,175 @@
 {
-    "name" : "云飞智控",
-    "appid" : "__UNI__DBA6730",
-    "description" : "",
-    "versionName" : "1.5.8",
-    "versionCode" : 158,
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "softinput" : {
-            "mode" : "adjustPan",
-            "softinputMode" : "adjustResize"
-        },
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "compatible" : {
-            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
-        },
-        /* 模块配置 */
-        "modules" : {
-            "Webview-x5" : {},
-            "Maps" : {},
-            "VideoPlayer" : {},
-            "LivePusher" : {},
-            "Geolocation" : {},
-            "Camera" : {}
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<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\"/>"
-                ],
-                "abiFilters" : [ "armeabi-v7a", "x86" ]
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "geolocation" : {
-                    "amap" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "25716a10d462140d75820fd9f5b342a5",
-                        "appkey_android" : "25716a10d462140d75820fd9f5b342a5"
-                    }
-                },
-                "maps" : {
-                    "amap" : {
-                        "appkey_ios" : "25716a10d462140d75820fd9f5b342a5",
-                        "appkey_android" : "25716a10d462140d75820fd9f5b342a5"
-                    }
-                },
-                "ad" : {}
-            },
-            "icons" : {
-                "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"
-                },
-                "ios" : {
-                    "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"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.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@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            }
-        }
+  "name": "云飞智控",
+  "appid": "__UNI__DBA6730",
+  "description": "",
+  "versionName": "1.6.0",
+  "versionCode": 160,
+  "transformPx": false,
+  /* 5+App特有相关 */
+  "app-plus": {
+    "softinput": {
+      "mode": "adjustPan",
+      "softinputMode": "adjustResize"
     },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wx1cabf67f460e3a14",
-        "setting" : {
-            "urlCheck" : false,
-            "minified" : true,
-            "postcss" : false,
-            "es6" : true
-        },
-        "usingComponents" : true
+    "usingComponents": true,
+    "nvueCompiler": "uni-app",
+    "compilerVersion": 3,
+    "splashscreen": {
+      "alwaysShowBeforeRender": true,
+      "waiting": true,
+      "autoclose": true,
+      "delay": 0
     },
-    "mp-alipay" : {
-        "usingComponents" : true
+    "compatible": {
+      "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
     },
-    "mp-baidu" : {
-        "usingComponents" : true
+    /* 模块配置 */
+    "modules": {
+      "Webview-x5": {},
+      "Maps": {},
+      "VideoPlayer": {},
+      "LivePusher": {},
+      "Geolocation": {},
+      "Camera": {}
     },
-    "mp-toutiao" : {
-        "usingComponents" : true
+    /* 应用发布信息 */
+    "distribute": {
+      /* android打包配置 */
+      "android": {
+        "permissions": [
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<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\"/>"
+        ],
+        "abiFilters": ["armeabi-v7a", "x86"]
+      },
+      /* ios打包配置 */
+      "ios": {
+        "dSYMs": false
+      },
+      /* SDK配置 */
+      "sdkConfigs": {
+        "geolocation": {
+          "amap": {
+            "__platform__": ["ios", "android"],
+            "appkey_ios": "25716a10d462140d75820fd9f5b342a5",
+            "appkey_android": "25716a10d462140d75820fd9f5b342a5"
+          }
+        },
+        "maps": {
+          "amap": {
+            "appkey_ios": "25716a10d462140d75820fd9f5b342a5",
+            "appkey_android": "25716a10d462140d75820fd9f5b342a5"
+          }
+        },
+        "ad": {}
+      },
+      "icons": {
+        "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"
+        },
+        "ios": {
+          "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"
+          },
+          "iphone": {
+            "app@2x": "unpackage/res/icons/120x120.png",
+            "app@3x": "unpackage/res/icons/180x180.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@2x": "unpackage/res/icons/80x80.png",
+            "spotlight@3x": "unpackage/res/icons/120x120.png"
+          }
+        }
+      }
+    }
+  },
+  /* 快应用特有相关 */
+  "quickapp": {},
+  /* 小程序特有相关 */
+  "mp-weixin": {
+    "appid": "wx1cabf67f460e3a14",
+    "setting": {
+      "urlCheck": false,
+      "minified": true,
+      "postcss": false,
+      "es6": true
     },
-    "uniStatistics" : {
-        "enable" : false
+    "usingComponents": true
+  },
+  "mp-alipay": {
+    "usingComponents": true
+  },
+  "mp-baidu": {
+    "usingComponents": true
+  },
+  "mp-toutiao": {
+    "usingComponents": true
+  },
+  "uniStatistics": {
+    "enable": false
+  },
+  "h5": {
+    "devServer": {
+      "port": 8000,
+      "disableHostCheck": true,
+      "proxy": {
+        "/ksy": {
+          "target": "http://114.115.147.140:8002",
+          "changeOrigin": true,
+          "ws": true,
+          "pathRewrite": {
+            "^/ksy": "ksy"
+          }
+        }
+      }
     },
-    "h5" : {
-        "devServer" : {
-            "port" : 8000,
-            "disableHostCheck" : true,
-            "proxy" : {
-                "/ksy" : {
-                    "target" : "http://114.115.147.140:8002",
-                    "changeOrigin" : true,
-                    "ws" : true,
-                    "pathRewrite" : {
-                        "^/ksy" : "ksy"
-                    }
-                }
-            }
-        },
-        "template" : "static/tempalate.html",
-        "sdkConfigs" : {
-            "maps" : {
-                "qqmap" : {
-                    "key" : "XGQBZ-MSGW6-KNDSO-MVOIJ-OM6LO-JXBKB"
-                }
-            }
+    "template": "static/tempalate.html",
+    "sdkConfigs": {
+      "maps": {
+        "qqmap": {
+          "key": "XGQBZ-MSGW6-KNDSO-MVOIJ-OM6LO-JXBKB"
         }
+      }
     }
+  }
 }
 // "sdkConfigs" : {
 //     "maps" : {
@@ -178,4 +178,3 @@
 //         }
 //     }
 // }
-

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/998a1130-3755-11ee-994c-bb598de021c8
+https://ide.dcloud.net.cn/build/download/78510550-382c-11ee-8a44-1f74891c0cd1