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); } }