From 07ae06fa30f6054ce99e02667b008e6342fef16c Mon Sep 17 00:00:00 2001
From: jia <jmessage@163.com>
Date: Thu, 19 Sep 2024 21:53:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=93=9D=E7=89=99=E8=BF=9E=E6=8E=A5=E6=9C=89?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E4=BC=9A=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties                                           | 4 ++--
 .../com/ifish/activity/newbind/NewBindDeviceActivity.java   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e0bdf7d5a..3765239c3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,5 +26,5 @@ android.enableJetifier=true
 android.useAndroidX=true
 android.useDeprecatedNdk=true
 
-versionCode=49
-versionName=4.11.9
\ No newline at end of file
+versionCode=50
+versionName=4.11.10
\ No newline at end of file
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 abeeeff41..d0696d97e 100644
--- a/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java
@@ -777,8 +777,6 @@ public class NewBindDeviceActivity extends AppCompatActivity {
             @Override
             public void onStartConnect() {
                 setMessage("开始连接蓝牙设备");
-
-//                ToastUtil.show(NewBindDeviceActivity.this,"开始连接蓝牙设备");
             }
 
             @Override
@@ -1358,8 +1356,10 @@ public class NewBindDeviceActivity extends AppCompatActivity {
     }
 
     protected void setMessage(String msg) {
-        if (myProgressDialogCancelble == null) {
+        if (myProgressDialogCancelble != null) {
             myProgressDialogCancelble.setMessage(msg);
+        }else {
+            showProgressDialogCancelble(msg);
         }
     }