From bc2b17e963cde3d5f53070e3fe48b857412367ee Mon Sep 17 00:00:00 2001
From: Lihongda <963140097@qq.com>
Date: Fri, 8 Mar 2024 23:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84AP=E7=BB=91=E5=AE=9A=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ifish/activity/HotSpotConnentDeviceActivity.java  | 1 +
 .../com/ifish/activity/newbind/NewBindDeviceActivity.java | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java
index 2279228a1..4519ef53f 100644
--- a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java
@@ -678,6 +678,7 @@ public class HotSpotConnentDeviceActivity extends BaseActivity {
                     break;
                 case NetWork.Fail:
                     ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备失败 请重试");
+                    EventBus.getDefault().post(new ConnectMessageEvent(-1, "fail"));
                     finish();
                     break;
                 case NetWork.DEVICETYPEERROR:
diff --git a/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java
index ffe469969..ecccba6d4 100644
--- a/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java
@@ -342,6 +342,14 @@ public class NewBindDeviceActivity extends AppCompatActivity {
     }
 
     public void onEventMainThread(ConnectMessageEvent event) {
+        if (event.getId() == -1){
+            //绑定失败
+            if (curConnectType == ConnectType.APConnect){
+                showProgress(false);
+                tvApConnectDevice.setVisibility(View.VISIBLE);
+                return;
+            }
+        }
         finish();
     }