diff --git a/gradle.properties b/gradle.properties index ca6d77066..6380d1dd4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,4 +27,5 @@ android.useAndroidX=true android.useDeprecatedNdk=true versionCode=57 -versionName=4.11.17 \ No newline at end of file +versionName=4.11.11 +#versionName=4.11.17.2 \ No newline at end of file diff --git a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java index 20a5adc90..9512f7baa 100644 --- a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java @@ -317,6 +317,7 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { // i.putExtra("title",title); i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 AppRoute.newToStart(HotSpotConnentDeviceActivity.this,i,deviceObj); + ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功"); AnimationUtil.startAnimation(HotSpotConnentDeviceActivity.this); EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0); diff --git a/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java b/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java index 85ebe835a..a83b896b3 100644 --- a/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java +++ b/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java @@ -538,8 +538,9 @@ public class AirKissUtil { // i.putExtra("mac",device_mac); // i.putExtra("title",title); i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 - AppRoute.newToStart(curActivity,i,deviceObj); ToastUtil.show(curActivity, "绑定设备成功"); + AppRoute.newToStart(curActivity,i,deviceObj); + AnimationUtil.startAnimation(curActivity); curActivity.finish(); L.i("===================绑定设备成功=" + device_mac); @@ -606,10 +607,11 @@ public class AirKissUtil { Commons.HAVE_DEVICE = true;//改变判断是否绑定的变量 Commons.IS_CAMERA = false; sp.putBoolean(Commons.LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); + ToastUtil.show(curActivity, "绑定设备成功"); Intent i = new Intent(); i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 AppRoute.newToStart(curActivity,i,deviceObj); - ToastUtil.show(curActivity, "绑定设备成功"); + curActivity.finish(); L.i("===================绑定设备成功=" + device_mac); break; diff --git a/iFish7/src/main/java/com/ifish/activity/newbind/CheckWifiUtil.java b/iFish7/src/main/java/com/ifish/activity/newbind/CheckWifiUtil.java index 4b2c4dab5..27fc76c7c 100644 --- a/iFish7/src/main/java/com/ifish/activity/newbind/CheckWifiUtil.java +++ b/iFish7/src/main/java/com/ifish/activity/newbind/CheckWifiUtil.java @@ -145,7 +145,7 @@ public class CheckWifiUtil { // return; // } - if (is5G) { + if (is5G && !isBlue) { //既是2.4G也是5G ToastUtil.show(activity.getApplicationContext(), "仅支持2.4G Wi-Fi网络,不支持2.4G和5G双频共存的网络,请重新选择"); return false;