root
/
iFish7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提示type删除

This commit is contained in:
jia 2024-11-30 21:56:54 +08:00
parent c96c5cca6f
commit b1483ec5da
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gradle.properties
View File

@ -27,4 +27,5 @@ android.useAndroidX=true
android.useDeprecatedNdk=true android.useDeprecatedNdk=true
versionCode=57 versionCode=57
versionName=4.11.17 versionName=4.11.11
#versionName=4.11.17.2

1
iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java
View File

@ -317,6 +317,7 @@ public class HotSpotConnentDeviceActivity extends BaseActivity {
// i.putExtra("title",title); // i.putExtra("title",title);
i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验
AppRoute.newToStart(HotSpotConnentDeviceActivity.this,i,deviceObj); AppRoute.newToStart(HotSpotConnentDeviceActivity.this,i,deviceObj);
ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功");
AnimationUtil.startAnimation(HotSpotConnentDeviceActivity.this); AnimationUtil.startAnimation(HotSpotConnentDeviceActivity.this);
EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0); EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0);

6
iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java
View File

@ -538,8 +538,9 @@ public class AirKissUtil {
// i.putExtra("mac",device_mac); // i.putExtra("mac",device_mac);
// i.putExtra("title",title); // i.putExtra("title",title);
i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验
AppRoute.newToStart(curActivity,i,deviceObj);
ToastUtil.show(curActivity, "绑定设备成功"); ToastUtil.show(curActivity, "绑定设备成功");
AppRoute.newToStart(curActivity,i,deviceObj);
AnimationUtil.startAnimation(curActivity); AnimationUtil.startAnimation(curActivity);
curActivity.finish(); curActivity.finish();
L.i("===================绑定设备成功=" + device_mac); L.i("===================绑定设备成功=" + device_mac);
@ -606,10 +607,11 @@ public class AirKissUtil {
Commons.HAVE_DEVICE = true;//改变判断是否绑定的变量 Commons.HAVE_DEVICE = true;//改变判断是否绑定的变量
Commons.IS_CAMERA = false; Commons.IS_CAMERA = false;
sp.putBoolean(Commons.LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); sp.putBoolean(Commons.LoginSPKey.IS_CAMERA, Commons.IS_CAMERA);
ToastUtil.show(curActivity, "绑定设备成功");
Intent i = new Intent(); Intent i = new Intent();
i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验
AppRoute.newToStart(curActivity,i,deviceObj); AppRoute.newToStart(curActivity,i,deviceObj);
ToastUtil.show(curActivity, "绑定设备成功");
curActivity.finish(); curActivity.finish();
L.i("===================绑定设备成功=" + device_mac); L.i("===================绑定设备成功=" + device_mac);
break; break;

2
iFish7/src/main/java/com/ifish/activity/newbind/CheckWifiUtil.java
View File

@ -145,7 +145,7 @@ public class CheckWifiUtil {
// return; // return;
// } // }
if (is5G) { if (is5G && !isBlue) {
//既是2.4G也是5G //既是2.4G也是5G
ToastUtil.show(activity.getApplicationContext(), "仅支持2.4G Wi-Fi网络，不支持2.4G和5G双频共存的网络，请重新选择"); ToastUtil.show(activity.getApplicationContext(), "仅支持2.4G Wi-Fi网络，不支持2.4G和5G双频共存的网络，请重新选择");
return false; return false;