Damon 8 mesi fa
parent
commit
354e907330
5 ha cambiato i file con 777 aggiunte e 683 eliminazioni
  1. 18 2
      app.json
  2. 1 0
      devices/ble_manager.js
  3. 727 655
      devices/bt_helper.js
  4. 24 26
      pages/connectBle/connectBle.js
  5. 7 0
      project.private.config.json

+ 18 - 2
app.json

@@ -18,7 +18,8 @@
     "pages/connectBle/connectBle",
     "pages/deviceDetail/detail",
     "pages/piano/wallpaper/wallpaper",
-    "pages/ota/ota"
+    "pages/ota/ota",
+    "pages/blueDemos/blueDemos"
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -38,5 +39,20 @@
   "sitemapLocation": "sitemap.json",
   "requiredPrivateInfos": [
     "getFuzzyLocation"
-  ]
+  ],
+  "deviceOrientation": "portrait",
+  "permission": {
+    "scope.userLocation": {
+      "desc": "你的旧版本的位置信息将用于小程序位置接口的效果展示"
+    },
+    "scope.userFuzzyLocation": {
+      "desc": "你的模糊位置信息将用于小程序位置接口的效果展示"
+    },
+    "scope.bluetooth": {
+      "desc": "需要蓝牙进行连接手柄"
+    },
+    "scope.userInfo": {
+      "desc": "需要用户同意授权隐私信息,确保蓝牙功能可用"
+    }
+  }
 }

+ 1 - 0
devices/ble_manager.js

@@ -368,6 +368,7 @@ class bleManager {
         });
         return newDevices
     }
+
     isNotEmpty(name) {
         let isNot = (name !== '' &&
             (name.startsWith("MW_") ||

File diff suppressed because it is too large
+ 727 - 655
devices/bt_helper.js


File diff suppressed because it is too large
+ 24 - 26
pages/connectBle/connectBle.js


+ 7 - 0
project.private.config.json

@@ -9,6 +9,13 @@
     "miniprogram": {
       "list": [
         {
+          "name": "pages/blueDemos/blueDemos",
+          "pathName": "pages/blueDemos/blueDemos",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pages/indexes/indexes",
           "pathName": "pages/indexes/indexes",
           "query": "",