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

接入SmartConfig连网

This commit is contained in:
Lihongda 2024-02-23 04:07:03 +08:00
parent cdd48de227
commit c3fcea2b0a
6 changed files with 80 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -24,7 +24,7 @@ allprojects {
jcenter()
mavenCentral()
maven {url 'https://dl.google.com/dl/android/maven2/'}
maven { url 'http://developer.huawei.com/repo/' }
maven { url 'https://developer.huawei.com/repo/' }
maven { url 'https://jitpack.io' }
maven {
url 'http://maven.aliyun.com/nexus/content/repositories/releases/'

15
iFish7/src/main/java/com/ifish/activity/BindCameraActivity.java
View File

@ -94,6 +94,9 @@ public class BindCameraActivity extends BaseActivity {
init();
regFilter();
// testBindCamera();
//判断是否是从新页面跳转来的,声波sdk还没初始化成功，不能直接开始调用checkNewBindType连网
// checkNewBindType();
}
private void testBindCamera() {
@ -407,4 +410,16 @@ public class BindCameraActivity extends BaseActivity {
}
}
/**
* 如果是从新的界面来的，则直接使用密码开始连接
*/
public void checkNewBindType(){
String pwd = getIntent().getStringExtra("wifiPassword");
if (!TextUtils.isEmpty(pwd)){
et_wifipsw.setText(pwd);
connection();
}
}
}

15
iFish7/src/main/java/com/ifish/activity/BindTankActivity.java
View File

@ -104,6 +104,9 @@ public class BindTankActivity extends BaseActivity {
initListener();
init();
// testBindDevice();
//判断是否是从新页面跳转来的
checkNewBindType();
}
private class EsptouchAsyncTask2 extends AsyncTask<String, Void, IEsptouchResult> {
@ -822,4 +825,16 @@ public class BindTankActivity extends BaseActivity {
}
};
/**
* 如果是从新的界面来的，则直接使用密码开始连接
*/
public void checkNewBindType(){
String pwd = getIntent().getStringExtra("wifiPassword");
if (!TextUtils.isEmpty(pwd)){
et_wifipsw.setText(pwd);
connection();
}
}
}

16
iFish7/src/main/java/com/ifish/activity/BindTankPetActivity.java
View File

@ -100,6 +100,9 @@ public class BindTankPetActivity extends BaseActivity {
initListener();
init();
// testBindDevice();
//判断是否是从新页面跳转来的
checkNewBindType();
}
private class EsptouchAsyncTask2 extends AsyncTask<String, Void, IEsptouchResult> {
@ -850,4 +853,17 @@ public class BindTankPetActivity extends BaseActivity {
}
};
/**
* 如果是从新的界面来的，则直接使用密码开始连接
*/
public void checkNewBindType(){
String pwd = getIntent().getStringExtra("wifiPassword");
if (!TextUtils.isEmpty(pwd)){
et_wifipsw.setText(pwd);
connection();
}
}
}

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

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

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

@ -13,8 +13,13 @@ import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity;
import com.ifish.activity.BindCameraActivity;
import com.ifish.activity.BindDeviceChoiceActivity;
import com.ifish.activity.BindTankActivity;
import com.ifish.activity.BindTankPetActivity;
import com.ifish.activity.R;
import com.ifish.basebean.ConnectMessageEvent;
import com.ifish.utils.AnimationUtil;
import com.ifish.utils.KVUtil;
import com.ifish.utils.ToastUtil;
import com.ifish.utils.WifiAdmin;
@ -244,22 +249,40 @@ public class NewBindDeviceActivity extends AppCompatActivity {
*/
public void connectDevice() {
//根据选择的连网类型跳转不同的逻辑
String pwd = tvWifiPwd.getText().toString();
//一系列判断逻辑
boolean canConnect = checkWifiUtil.checkWifiCanUse(this, tvWifiName.getText().toString(), pwd);
if (!canConnect) {
return;
}
switch (curConnectType) {
case SmartConfig:
// 处理SmartConfig逻辑
Intent intent = new Intent();
String devicetype = getIntent().getStringExtra("devicetype");
if ("camera".equals(devicetype)) {
intent.setClass(NewBindDeviceActivity.this, BindCameraActivity.class);
} else if ("pet".equals(devicetype)) {
intent.setClass(NewBindDeviceActivity.this, BindTankPetActivity.class);
} else {
intent.setClass(NewBindDeviceActivity.this, BindTankActivity.class);
}
String title = getIntent().getStringExtra("title");
if ("连接热流器".equals(title)) {
intent.putExtra("title", "连接热流器");
}
//新页面跳转
intent.putExtra("wifiPassword",pwd);
ToastUtil.show(NewBindDeviceActivity.this, "开始SmartConfig连网...");
startActivity(intent);
AnimationUtil.startAnimation(NewBindDeviceActivity.this);
finish();
break;
case APConnect:
//一系列判断逻辑
boolean canConnect = checkWifiUtil.checkWifiCanUse(this, tvWifiName.getText().toString(), tvWifiPwd.getText().toString());
if (canConnect) {
//开始AP连接
checkAPLayout();
}
//开始AP连接
checkAPLayout();
break;
case AirKiss:
//一系列判断逻辑
boolean canConnectAirKiss = checkWifiUtil.checkWifiCanUse(this, tvWifiName.getText().toString(), tvWifiPwd.getText().toString());
// 处理AirKiss逻辑
ToastUtil.show(NewBindDeviceActivity.this, "开始AirKiss连网...");
break;