fix: 修复设备配网成功没有自动退出配网模式

2026-07-23 07:33:53 +08:00 · 2026-04-24 14:35:34 +08:00
parent f5ce755fea
commit a92d6ccdfb
2 changed files with 94 additions and 89 deletions
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
-import { useToast } from 'wot-design-uni'
 import { t } from '@/i18n'
+import { toast } from '@/utils/toast'

 // 类型定义
 interface WiFiNetwork {
@@ -19,9 +19,6 @@ interface Props {

 const props = defineProps<Props>()

-// Toast 实例
-const toast = useToast()
-
 // 响应式数据
 const configuring = ref(false)

@@ -45,7 +42,7 @@ async function checkESP32Connection() {
    return response.statusCode === 200
  }
  catch (error) {
-    console.log(t('deviceConfig.esp32ConnectionCheckFailed') + ':', error)
+    console.log(`${t('deviceConfig.esp32ConnectionCheckFailed')}:`, error)
    return false
  }
 }
@@ -58,12 +55,12 @@ async function submitConfig() {
  // 检查ESP32连接
  const connected = await checkESP32Connection()
  if (!connected) {
-      toast.error(t('deviceConfig.connectXiaozhiHotspot'))
-      return
-    }
+    toast.error(t('deviceConfig.connectXiaozhiHotspot'))
+    return
+  }

  configuring.value = true
-    console.log(t('deviceConfig.startWifiConfig') + ':', props.selectedNetwork.ssid)
+  console.log(`${t('deviceConfig.startWifiConfig')}:`, props.selectedNetwork.ssid)

  try {
    const response = await uni.request({
@@ -83,6 +80,14 @@ async function submitConfig() {

    if (response.statusCode === 200 && (response.data as any)?.success) {
      toast.success(`${t('deviceConfig.configSuccess')}！${t('deviceConfig.deviceWillConnectTo')} ${props.selectedNetwork.ssid}，${t('deviceConfig.deviceWillRestart')}。${t('deviceConfig.pleaseDisconnectXiaozhiHotspot')}`)
+      // 设备退出配网模式
+      setTimeout(() => {
+        uni.request({
+          url: 'http://192.168.4.1/exit',
+          method: 'POST',
+          timeout: 15000,
+        })
+      }, 1500)
    }
    else {
      const errorMsg = (response.data as any)?.error || t('deviceConfig.configFailed')
@@ -90,8 +95,8 @@ async function submitConfig() {
    }
  }
  catch (error) {
-    console.error(t('deviceConfig.wifiConfigFailed') + ':', error)
-      toast.error(`${t('deviceConfig.configFailed')}，${t('deviceConfig.pleaseCheckNetworkConnection')}`)
+    console.error(`${t('deviceConfig.wifiConfigFailed')}:`, error)
+    toast.error(`${t('deviceConfig.configFailed')}，${t('deviceConfig.pleaseCheckNetworkConnection')}`)
  }
  finally {
    configuring.value = false
@@ -134,9 +139,9 @@ async function submitConfig() {

    <!-- 使用说明 -->
    <view class="help-section">
-        <view class="help-title">
-          {{ t('deviceConfig.wifiConfigInstructions') }}
-        </view>
+      <view class="help-title">
+        {{ t('deviceConfig.wifiConfigInstructions') }}
+      </view>
      <view class="help-content">
        <text class="help-item">
          1. {{ t('deviceConfig.phoneConnectXiaozhiHotspot') }} (xiaozhi-XXXXXX)
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, defineEmits, defineExpose, onMounted, ref } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { useToast } from 'wot-design-uni'
 import { t } from '@/i18n'

@@ -71,9 +71,9 @@ async function checkESP32Connection() {
 // 扫描WiFi网络
 async function scanWifi() {
  if (!isConnectedToESP32.value) {
-      toast.error(t('deviceConfig.connectXiaozhiHotspot'))
-      return
-    }
+    toast.error(t('deviceConfig.connectXiaozhiHotspot'))
+    return
+  }

  scanning.value = true
  console.log('开始扫描WiFi网络')
@@ -85,7 +85,7 @@ async function scanWifi() {
      timeout: 10000,
    })

-    console.log(t('deviceConfig.wifiScanResponse') + ':', response)
+    console.log(`${t('deviceConfig.wifiScanResponse')}:`, response)

    if (response.statusCode === 200 && response.data) {
      const data = response.data as any
@@ -121,8 +121,8 @@ async function scanWifi() {
    }
  }
  catch (error) {
-    console.error(t('deviceConfig.wifiScanFailed') + ':', error)
-      toast.error(t('deviceConfig.scanFailedCheckConnection'))
+    console.error(`${t('deviceConfig.wifiScanFailed')}:`, error)
+    toast.error(t('deviceConfig.scanFailedCheckConnection'))
  }
  finally {
    scanning.value = false
@@ -135,9 +135,9 @@ async function showNetworkSelector() {
  await checkESP32Connection()

  if (!isConnectedToESP32.value) {
-      toast.error(t('deviceConfig.connectXiaozhiHotspot'))
-      return
-    }
+    toast.error(t('deviceConfig.connectXiaozhiHotspot'))
+    return
+  }

  selectorExpanded.value = true

@@ -223,73 +223,73 @@ onMounted(() => {
    <!-- Xiaozhi连接状态 -->
    <view v-if="props.autoConnect" class="connection-status">
      <view v-if="!isConnectedToESP32" class="status-warning">
-          <view class="status-content">
-            <text class="warning-text">
-              {{ t('deviceConfig.connectXiaozhiHotspot') }} (xiaozhi-XXXXXX)
-            </text>
-            <wd-button
-              size="small"
-              type="primary"
-              :loading="checkingConnection"
-              @click="checkESP32Connection"
-            >
-              {{ checkingConnection ? t('deviceConfig.checking') : t('deviceConfig.reCheck') }}
-            </wd-button>
-          </view>
+        <view class="status-content">
+          <text class="warning-text">
+            {{ t('deviceConfig.connectXiaozhiHotspot') }} (xiaozhi-XXXXXX)
+          </text>
+          <wd-button
+            size="small"
+            type="primary"
+            :loading="checkingConnection"
+            @click="checkESP32Connection"
+          >
+            {{ checkingConnection ? t('deviceConfig.checking') : t('deviceConfig.reCheck') }}
+          </wd-button>
        </view>
+      </view>
      <view v-else class="status-success">
-          <view class="status-content">
-            <text class="success-text">
-              {{ t('deviceConfig.connectedXiaozhiHotspot') }}
-            </text>
-            <wd-button
-              size="small"
-              :loading="checkingConnection"
-              @click="checkESP32Connection"
-            >
-              {{ checkingConnection ? t('deviceConfig.checking') : t('deviceConfig.refreshStatus') }}
-            </wd-button>
-          </view>
+        <view class="status-content">
+          <text class="success-text">
+            {{ t('deviceConfig.connectedXiaozhiHotspot') }}
+          </text>
+          <wd-button
+            size="small"
+            :loading="checkingConnection"
+            @click="checkESP32Connection"
+          >
+            {{ checkingConnection ? t('deviceConfig.checking') : t('deviceConfig.refreshStatus') }}
+          </wd-button>
        </view>
+      </view>
    </view>

    <!-- WiFi网络选择器 -->
    <view class="network-selector">
-        <view class="selector-item" @click="showNetworkSelector">
-          <text class="selector-label">
-            {{ t('deviceConfig.wifiNetwork') }}
-          </text>
-          <text class="selector-value">
-            {{ networkDisplayText }}
-          </text>
-          <wd-icon name="arrow-right" custom-class="arrow-icon" />
-        </view>
+      <view class="selector-item" @click="showNetworkSelector">
+        <text class="selector-label">
+          {{ t('deviceConfig.wifiNetwork') }}
+        </text>
+        <text class="selector-value">
+          {{ networkDisplayText }}
+        </text>
+        <wd-icon name="arrow-right" custom-class="arrow-icon" />
      </view>
+    </view>

    <!-- 展开的网络列表 -->
    <view v-if="selectorExpanded" class="network-list-overlay">
      <view class="network-list-container">
        <view class="list-header">
-            <text class="list-title">
-              {{ t('deviceConfig.selectWifiNetwork') }}
-            </text>
-            <view class="list-actions">
-              <wd-button
-                type="primary"
-                size="small"
-                :loading="scanning"
-                @click="scanWifi"
-              >
-                {{ scanning ? t('deviceConfig.scanning') : t('deviceConfig.refreshScan') }}
-              </wd-button>
-              <wd-button
-                size="small"
-                @click="selectorExpanded = false"
-              >
-                {{ t('deviceConfig.cancel') }}
-              </wd-button>
-            </view>
+          <text class="list-title">
+            {{ t('deviceConfig.selectWifiNetwork') }}
+          </text>
+          <view class="list-actions">
+            <wd-button
+              type="primary"
+              size="small"
+              :loading="scanning"
+              @click="scanWifi"
+            >
+              {{ scanning ? t('deviceConfig.scanning') : t('deviceConfig.refreshScan') }}
+            </wd-button>
+            <wd-button
+              size="small"
+              @click="selectorExpanded = false"
+            >
+              {{ t('deviceConfig.cancel') }}
+            </wd-button>
          </view>
+        </view>

        <view class="network-list">
          <view v-if="wifiNetworks.length === 0 && !scanning" class="empty-state">
@@ -323,7 +323,7 @@ onMounted(() => {
              </view>
              <view class="wifi-security">
                <text class="security-icon">
-                  {{ network.authmode === 0 ? t('deviceConfig.open') : t('deviceConfig.encrypted') }}
+                  {{ network.authmode === 0 ? t('deviceConfig.open') : t('deviceConfig.encryptedNetwork') }}
                </text>
              </view>
            </view>
@@ -335,17 +335,17 @@ onMounted(() => {
    <!-- 密码输入 -->
    <view v-if="selectedNetwork && selectedNetwork.authmode > 0" class="password-section">
      <view class="password-item">
-          <text class="password-label">
-            {{ t('deviceConfig.wifiPassword') }}
-          </text>
-          <wd-input
-            v-model="password"
-            :placeholder="t('deviceConfig.enterWifiPassword')"
-            show-password
-            clearable
-            @input="onPasswordChange"
-          />
-        </view>
+        <text class="password-label">
+          {{ t('deviceConfig.wifiPassword') }}
+        </text>
+        <wd-input
+          v-model="password"
+          :placeholder="t('deviceConfig.enterWifiPassword')"
+          show-password
+          clearable
+          @input="onPasswordChange"
+        />
+      </view>
    </view>
  </view>
 </template>