Procházet zdrojové kódy

feature: 解决图片报错的问题

Damon před 8 měsíci
rodič
revize
43c63eb7da
3 změnil soubory, kde provedl 59 přidání a 33 odebrání
  1. 28 6
      .idea/workspace.xml
  2. 17 12
      devices/bt_helper.js
  3. 14 15
      pages/connectBle/connectBle.js

+ 28 - 6
.idea/workspace.xml

@@ -4,12 +4,10 @@
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="420a40af-e4b9-41e7-b569-424cfc67e65d" name="Changes" comment="feature: 整理数据">
-      <change beforePath="$PROJECT_DIR$/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/app.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/devices/ble_manager.js" beforeDir="false" afterPath="$PROJECT_DIR$/devices/ble_manager.js" afterDir="false" />
+    <list default="true" id="420a40af-e4b9-41e7-b569-424cfc67e65d" name="Changes" comment="feature: 处理外部类与内部类的问题">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/devices/bt_helper.js" beforeDir="false" afterPath="$PROJECT_DIR$/devices/bt_helper.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/connectBle/connectBle.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/connectBle/connectBle.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project.private.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/project.private.config.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -160,7 +158,28 @@
       <option name="project" value="LOCAL" />
       <updated>1732867831888</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="feature: 整理">
+      <created>1733125786724</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1733125786724</updated>
+    </task>
+    <task id="LOCAL-00014" summary="feature: 添加测试蓝牙类">
+      <created>1733125810415</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1733125810415</updated>
+    </task>
+    <task id="LOCAL-00015" summary="feature: 处理外部类与内部类的问题">
+      <created>1733126619647</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1733126619647</updated>
+    </task>
+    <option name="localTasksCounter" value="16" />
     <servers />
   </component>
   <component name="Vcs.Log.History.Properties">
@@ -232,6 +251,9 @@
     <MESSAGE value="feature: 加入登录界面路由" />
     <MESSAGE value="feature: 处理几个异常跳转问题" />
     <MESSAGE value="feature: 整理数据" />
-    <option name="LAST_COMMIT_MESSAGE" value="feature: 整理数据" />
+    <MESSAGE value="feature: 整理" />
+    <MESSAGE value="feature: 添加测试蓝牙类" />
+    <MESSAGE value="feature: 处理外部类与内部类的问题" />
+    <option name="LAST_COMMIT_MESSAGE" value="feature: 处理外部类与内部类的问题" />
   </component>
 </project>

+ 17 - 12
devices/bt_helper.js

@@ -446,29 +446,34 @@ class BtHelper {
 
   async initBluetooth(callback) {
     var that = this;
+    ///是否已打开蓝牙
     var adpter = await that.bleManager.initBluetoothAdapter((res) => {
+      console.log("gadsfeqwrqwerqr==00=" + JSON.stringify(res));
       if (!res) {
         wx.showToast({
           title: '请开启蓝牙功能',
-          icon: 'none'
+          icon: 'none',
         })
         if (callback) {
           callback(false, false)
         }
         return
       }
-    });
 
-    that.bleManager.checkBluetoothPermission(function (per) {
-      if (!per) {
-        wx.showToast({
-          title: '没有蓝牙权限',
-          icon: 'none'
-        })
-      }
-      if (callback) {
-        callback(adpter, per)
-      }
+      ///获取蓝牙权限
+      that.bleManager.checkBluetoothPermission(function (per) {
+        console.log("gadsfeqwrqwerqr==111=" + per);
+        if (!per) {
+          wx.showToast({
+            title: '没有蓝牙权限',
+            icon: 'none',
+          });
+          return;
+        }
+        if (callback) {
+          callback(adpter, per)
+        }
+      });
     });
   }
 

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 14 - 15
pages/connectBle/connectBle.js