Merge branch 'main' into main

NervJS · Jun 19, 2024 · 721f6e6 · 721f6e6
2 parents 179a963 + a8ac196
commit 721f6e6
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 200 deletions.
diff --git a/examples/mini-program-example/src/pages/api/device/wifi/index.tsx b/examples/mini-program-example/src/pages/api/device/wifi/index.tsx
@@ -160,6 +160,7 @@ export default class Index extends React.Component {
           password: 'lwh123456',
         },
         func: (apiIndex, data) => {
+          TestConsole.consoleTest('connectWifi')
           Taro.connectWifi({
             ...data,
             success: (res) => {

diff --git a/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json b/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json
@@ -667,13 +667,7 @@
         "tcpNoDelay": true
       }
     },
-    "connectWifi": {
-      "object": {
-        "SSID": true,
-        "password": true,
-        "BSSID": true
-      }
-    },
+    "connectWifi": false,
     "console": {
       "debug": true,
       "error": true,
@@ -1237,7 +1231,7 @@
       }
     },
     "getWeRunData": false,
-    "getWifiList": true,
+    "getWifiList": false,
     "getWindowInfo": {
       "return": {
         "pixelRatio": true,
@@ -1331,13 +1325,7 @@
       }
     },
     "navigateToBookshelf": false,
-    "navigateToMiniProgram": {
-      "object": {
-        "appId": true,
-        "path": true,
-        "extraData": true
-      }
-    },
+    "navigateToMiniProgram": false,
     "nextTick": true,
     "notifyBLECharacteristicValueChange": {
       "object": {
@@ -1979,7 +1967,7 @@
         "resultJSONSignature": true
       }
     },
-    "startWifi": true,
+    "startWifi": false,
     "stopAccelerometer": true,
     "stopBackgroundAudio": false,
     "stopBeaconDiscovery": false,
@@ -1994,7 +1982,7 @@
     "stopPullDownRefresh": true,
     "stopRecord": false,
     "stopVoice": false,
-    "stopWifi": true,
+    "stopWifi": false,
     "subscribeService": false,
     "subscribeVoIPVideoMembers": false,
     "switchTab": {

diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/device/wifi/connectWifi.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/device/wifi/connectWifi.ts
diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/device/wifi/getWifiList.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/device/wifi/getWifiList.ts
diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/device/wifi/index.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/device/wifi/index.ts
@@ -1,14 +1,10 @@
-export * from './connectWifi'
 export * from './getConnectedWifi'
-export * from './getWifiList'
 export * from './offGetWifiList'
 export * from './offWifiConnected'
 export * from './offWifiConnectedWithPartialInfo'
 export * from './onGetWifiList'
 export * from './onWifiConnected'
 export * from './onWifiConnectedWithPartialInfo'
-export * from './startWifi'
-export * from './stopWifi'
 
 /**
  * Wifi 信息(native 返回)

diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/device/wifi/startWifi.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/device/wifi/startWifi.ts
diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/device/wifi/stopWifi.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/device/wifi/stopWifi.ts