diff --git a/iFish7/src/main/java/com/ifish/activity/BindTwoDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/BindTwoDeviceActivity.java
index e51441ada..1d5f292af 100644
--- a/iFish7/src/main/java/com/ifish/activity/BindTwoDeviceActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/BindTwoDeviceActivity.java
@@ -101,7 +101,7 @@ public class BindTwoDeviceActivity extends BaseActivity {
                         return;
                     }
                 }
-                intent.setClass(BindTwoDeviceActivity.this, NewBindDeviceChoiceActivity.class);
+                intent.setClass(BindTwoDeviceActivity.this, NewBindDeviceActivity.class);
                 intent.putExtra("devicetype", "camera");
                 intent.putExtra("title", "连接摄像头");
                 startActivity(intent);
@@ -131,7 +131,7 @@ public class BindTwoDeviceActivity extends BaseActivity {
                         return;
                     }
                 }
-                intent.setClass(BindTwoDeviceActivity.this, NewBindDeviceActivity.class);
+                intent.setClass(BindTwoDeviceActivity.this, BindDeviceChoiceActivity.class);
                 intent.putExtra("title", "连接水族箱");
                 startActivity(intent);
                 AnimationUtil.startAnimation(BindTwoDeviceActivity.this);
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 e2fc487ed..c473927ef 100644
--- a/iFish7/src/main/java/com/ifish/activity/newbind/CheckWifiUtil.java
+++ b/iFish7/src/main/java/com/ifish/activity/newbind/CheckWifiUtil.java
@@ -103,6 +103,7 @@ public class CheckWifiUtil {
             return false;
         }
 
+        wifipwd = wifipwd.trim();
         if (TextUtils.isEmpty(wifipwd)) {
             ToastUtil.show(activity.getApplicationContext(), "请输入路由器密码");
             return false;
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 05b7ca8db..9ecc74be9 100644
--- a/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java
@@ -250,8 +250,6 @@ public class NewBindDeviceActivity extends AppCompatActivity {
                 ToastUtil.show(NewBindDeviceActivity.this, "开始SmartConfig连网...");
                 break;
             case APConnect:
-                // 处理APConnect逻辑
-                ToastUtil.show(NewBindDeviceActivity.this, "开始AP连网...");
                 //一系列判断逻辑
                 boolean canConnect = checkWifiUtil.checkWifiCanUse(this, tvWifiName.getText().toString(), tvWifiPwd.getText().toString());
                 if (canConnect) {
@@ -260,6 +258,8 @@ public class NewBindDeviceActivity extends AppCompatActivity {
                 }
                 break;
             case AirKiss:
+                //一系列判断逻辑
+                boolean canConnectAirKiss = checkWifiUtil.checkWifiCanUse(this, tvWifiName.getText().toString(), tvWifiPwd.getText().toString());
                 // 处理AirKiss逻辑
                 ToastUtil.show(NewBindDeviceActivity.this, "开始AirKiss连网...");
                 break;