diff --git a/Assets/Res/language/language.json b/Assets/Res/language/language.json
index 50d1831..c140024 100644
--- a/Assets/Res/language/language.json
+++ b/Assets/Res/language/language.json
@@ -1461,8 +1461,8 @@
   },
   {
     "key": "100293",
-    "zh": "WiFi模式下暂不支持该操作，请连接蓝牙",
-    "en": "WiFi mode does not support this operation. Please connect to Bluetooth."
+    "zh": "此操作需连接蓝牙，请先连接设备",
+    "en": "This operation requires Bluetooth. Please connect the device first."
   },
   {
     "key": "100294",
diff --git a/Assets/Res/ui/homepage/homePage.prefab b/Assets/Res/ui/homepage/homePage.prefab
index 680432e..ad510ef 100644
--- a/Assets/Res/ui/homepage/homePage.prefab
+++ b/Assets/Res/ui/homepage/homePage.prefab
@@ -12250,6 +12250,7 @@ GameObject:
   - component: {fileID: 2694354456058885249}
   - component: {fileID: 2803115028597785363}
   - component: {fileID: 6875467864910341000}
+  - component: {fileID: 3154916087926047375}
   m_Layer: 5
   m_Name: wifiicon
   m_TagString: Untagged
@@ -12315,6 +12316,62 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3154916087926047375
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6303258875673689167}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6875467864910341000}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 4800202286877235330}
+        m_TargetAssemblyTypeName: Kill.UI.Pages.HomePageCtrl, Assembly-CSharp
+        m_MethodName: EnterWifiPage
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &6312034908498236314
 GameObject:
   m_ObjectHideFlags: 0
@@ -15141,6 +15198,8 @@ MonoBehaviour:
   lastRecordTimeTexts: {fileID: 4944089606572496900}
   homePageChartsCtrl: {fileID: 5245081173948339102}
   tipPoint: {fileID: 81902936719861509}
+  setWifiPage: {fileID: 8038532572982553104, guid: e7ef5081212dfe9469c40678baa2b0ac,
+    type: 3}
 --- !u!1 &8115864904787809625
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/UI/Pages/DeviceInfoPage/SetWifiPage.cs b/Assets/Scripts/UI/Pages/DeviceInfoPage/SetWifiPage.cs
index acd30bb..d052d81 100644
--- a/Assets/Scripts/UI/Pages/DeviceInfoPage/SetWifiPage.cs
+++ b/Assets/Scripts/UI/Pages/DeviceInfoPage/SetWifiPage.cs
@@ -16,7 +16,8 @@ namespace Kill.UI.Pages
         public Button confirmButton;
         public Button backButton;
         Action<string> callback;
-        public void Init(Action<string> wifiInfoCallback)
+        int comefrom=0;
+        public void Init(Action<string> wifiInfoCallback,int comefrom=0)
         {
             callback = wifiInfoCallback;
             UIManager.Instance.RegisterBackAction(Back);
@@ -35,7 +36,8 @@ namespace Kill.UI.Pages
         }
         public void Back()
         {
-            UIManager.Instance.RegisterBackAction(GetComponentInParent<DeviceInfoPage>().Back);
+            if(comefrom==0)
+                UIManager.Instance.RegisterBackAction(GetComponentInParent<DeviceInfoPage>().Back);
             Destroy(gameObject);
         }
 
diff --git a/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs b/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs
index 8fb201e..6122b85 100644
--- a/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs
+++ b/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs
@@ -1595,7 +1595,7 @@ namespace Kill.UI.Pages
 
             while (!stopPolling && selectedDevice != null)
             {
-                await System.Threading.Tasks.Task.Delay(30000);
+                await System.Threading.Tasks.Task.Delay(10000);
 
                 if (stopPolling || selectedDevice == null)
                     break;
@@ -1780,6 +1780,20 @@ namespace Kill.UI.Pages
             // 失败时 SendBleCommandByWifiAsync 已显示 Toast "100292"
         }
 
+        public SetWifiPage setWifiPage;
+        public void EnterWifiPage()
+        {
+             // WiFi模式下不支持设置WiFi
+            if (!DataManager.Instance.hasBluetooth)
+            {
+                ToastUI.Show("100293");
+                return;
+            }
+            SetWifiPage wifiPage=Instantiate(setWifiPage, transform);
+            wifiPage.gameObject.SetActive(true);
+            wifiPage.Init(null);
+        }
+
     }