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

AP连网逻辑优化

This commit is contained in:
Lihongda 2024-02-23 03:07:30 +08:00
parent 8b227aa7f7
commit cdd48de227
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
iFish7/src/main/java/com/ifish/activity/BindTwoDeviceActivity.java
View File

@ -101,7 +101,7 @@ public class BindTwoDeviceActivity extends BaseActivity {
return; return;
} }
} }
intent.setClass(BindTwoDeviceActivity.this, NewBindDeviceChoiceActivity.class); intent.setClass(BindTwoDeviceActivity.this, NewBindDeviceActivity.class);
intent.putExtra("devicetype", "camera"); intent.putExtra("devicetype", "camera");
intent.putExtra("title", "连接摄像头"); intent.putExtra("title", "连接摄像头");
startActivity(intent); startActivity(intent);
@ -131,7 +131,7 @@ public class BindTwoDeviceActivity extends BaseActivity {
return; return;
} }
} }
intent.setClass(BindTwoDeviceActivity.this, NewBindDeviceActivity.class); intent.setClass(BindTwoDeviceActivity.this, BindDeviceChoiceActivity.class);
intent.putExtra("title", "连接水族箱"); intent.putExtra("title", "连接水族箱");
startActivity(intent); startActivity(intent);
AnimationUtil.startAnimation(BindTwoDeviceActivity.this); AnimationUtil.startAnimation(BindTwoDeviceActivity.this);

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

@ -103,6 +103,7 @@ public class CheckWifiUtil {
return false; return false;
} }
wifipwd = wifipwd.trim();
if (TextUtils.isEmpty(wifipwd)) { if (TextUtils.isEmpty(wifipwd)) {
ToastUtil.show(activity.getApplicationContext(), "请输入路由器密码"); ToastUtil.show(activity.getApplicationContext(), "请输入路由器密码");
return false; return false;

4
iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java
View File

@ -250,8 +250,6 @@ public class NewBindDeviceActivity extends AppCompatActivity {
ToastUtil.show(NewBindDeviceActivity.this, "开始SmartConfig连网..."); ToastUtil.show(NewBindDeviceActivity.this, "开始SmartConfig连网...");
break; break;
case APConnect: case APConnect:
// 处理APConnect逻辑
ToastUtil.show(NewBindDeviceActivity.this, "开始AP连网...");
//一系列判断逻辑 //一系列判断逻辑
boolean canConnect = checkWifiUtil.checkWifiCanUse(this, tvWifiName.getText().toString(), tvWifiPwd.getText().toString()); boolean canConnect = checkWifiUtil.checkWifiCanUse(this, tvWifiName.getText().toString(), tvWifiPwd.getText().toString());
if (canConnect) { if (canConnect) {
@ -260,6 +258,8 @@ public class NewBindDeviceActivity extends AppCompatActivity {
} }
break; break;
case AirKiss: case AirKiss:
//一系列判断逻辑
boolean canConnectAirKiss = checkWifiUtil.checkWifiCanUse(this, tvWifiName.getText().toString(), tvWifiPwd.getText().toString());
// 处理AirKiss逻辑 // 处理AirKiss逻辑
ToastUtil.show(NewBindDeviceActivity.this, "开始AirKiss连网..."); ToastUtil.show(NewBindDeviceActivity.this, "开始AirKiss连网...");
break; break;