diff --git a/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java b/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
index b6e6159..6521754 100644
--- a/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
@@ -9,9 +9,13 @@ import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.text.InputType;
 import android.text.TextUtils;
+import android.text.method.PasswordTransformationMethod;
 import android.util.Log;
 import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
 
 import com.ckkj.water.ConstantUtil;
 import com.ckkj.water.R;
@@ -46,6 +50,8 @@ public class SelectWifiActivity extends BaseActivity<DeviceResetWifiBinding, Dev
     implements DeviceContract.DeviceView {
 
     private static final long BLE_CONNECT_TIMEOUT = 40 * 1000L;
+    //当前密码显示/隐藏
+    private boolean isPasswordVisible = false;
 
     private WifiListAdapter wifiListAdapter;
     //100 来自设备添加，   200 来自设备信息
@@ -166,6 +172,7 @@ public class SelectWifiActivity extends BaseActivity<DeviceResetWifiBinding, Dev
         setClick(viewBinding.includedTitle.imgBack);
         setClick(viewBinding.tvSelectWifi);
         setClick(viewBinding.tvNext);
+        setClick(viewBinding.imgPsdShowHide);
     }
 
     private void setClick(View view) {
@@ -210,9 +217,38 @@ public class SelectWifiActivity extends BaseActivity<DeviceResetWifiBinding, Dev
                     finish();
                 }
                 break;
+
+            case R.id.img_psd_show_hide:
+                togglePasswordVisibility();
+                break;
         }
     }
 
+    private void togglePasswordVisibility() {
+        EditText etPassword = viewBinding.etInputPsd;
+        ImageView ivToggle = viewBinding.imgPsdShowHide;
+
+        if (etPassword == null || ivToggle == null) {
+            return;
+        }
+
+        if (isPasswordVisible) {
+            // 隐藏密码
+            etPassword.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+            etPassword.setTransformationMethod(PasswordTransformationMethod.getInstance());
+            ivToggle.setImageResource(R.mipmap.icon_psd_hide);
+        } else {
+            // 显示密码
+            etPassword.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
+            etPassword.setTransformationMethod(null);
+            ivToggle.setImageResource(R.mipmap.icon_psd_show);
+        }
+
+        // 保持光标位置
+        etPassword.setSelection(etPassword.getText().length());
+        isPasswordVisible = !isPasswordVisible;
+    }
+
     private void goToDeviceConnect(String wifiPassword) {
         if (espProvisionManager == null) {
             initEspProvision();
diff --git a/app/src/main/java/com/ckkj/water/plan/WaterConfigFragment.java b/app/src/main/java/com/ckkj/water/plan/WaterConfigFragment.java
index a991786..87f3946 100644
--- a/app/src/main/java/com/ckkj/water/plan/WaterConfigFragment.java
+++ b/app/src/main/java/com/ckkj/water/plan/WaterConfigFragment.java
@@ -564,6 +564,10 @@ public class WaterConfigFragment extends BaseFragment<WaterConfigFragmentLayoutC
 
                     @Override
                     public void onConfirmClisk(String content) {
+                        if(TextUtils.isEmpty(content)){
+                            ToastUtil.showShort(mContext, getString(R.string.input_water_plan_time_error));
+                            return;
+                        }
                         if (Integer.parseInt(content) <= 0) {
                             ToastUtil.showShort(mContext, getString(R.string.input_water_plan_time_error));
                             return;
diff --git a/app/src/main/res/layout/device_reset_wifi.xml b/app/src/main/res/layout/device_reset_wifi.xml
index 15734c5..91813e7 100644
--- a/app/src/main/res/layout/device_reset_wifi.xml
+++ b/app/src/main/res/layout/device_reset_wifi.xml
@@ -91,14 +91,22 @@
                     android:src="@mipmap/icon_phone_code"/>
                 <EditText
                     android:id="@+id/et_input_psd"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="8"
                     android:layout_marginLeft="@dimen/dp_5"
                     android:background="@null"
+                    android:inputType="textPassword"
                     android:textSize="14sp"
                     android:textColorHint="@color/textPrimaryColor"
                     android:textColor="@color/textPrimaryColor"
                     android:hint="@string/input_wifi_psd_tip"/>
+                <ImageView
+                    android:id="@+id/img_psd_show_hide"
+                    android:layout_width="24dp"
+                    android:layout_height="20dp"
+                    android:layout_weight="0.5"
+                    android:src="@mipmap/icon_psd_hide"/>
             </LinearLayout>
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/login_layout.xml b/app/src/main/res/layout/login_layout.xml
index 02df8f4..b6af538 100644
--- a/app/src/main/res/layout/login_layout.xml
+++ b/app/src/main/res/layout/login_layout.xml
@@ -106,6 +106,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginLeft="5dp"
+                    android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
                     android:background="@null"
                     android:textSize="14sp"
                     android:textColor="@color/color_222222"
@@ -133,6 +134,7 @@
                     android:layout_weight="2"
                     android:layout_marginLeft="5dp"
                     android:background="@null"
+                    android:inputType="number"
                     android:textSize="14sp"
                     android:textColor="@color/color_222222"
                     android:hint="@string/hint_input_verifi"/>
@@ -178,7 +180,7 @@
                 <ImageView
                     android:id="@+id/img_psd_show_hide"
                     android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_height="20dp"
                     android:layout_weight="0.5"
                     android:src="@mipmap/icon_psd_hide"/>
             </LinearLayout>
diff --git a/app/src/main/res/layout/register_layout.xml b/app/src/main/res/layout/register_layout.xml
index bd6a8fd..5953940 100644
--- a/app/src/main/res/layout/register_layout.xml
+++ b/app/src/main/res/layout/register_layout.xml
@@ -43,6 +43,7 @@
             android:layout_height="match_parent"
             android:layout_marginLeft="@dimen/dp_5"
             android:background="@null"
+            android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
             android:textSize="14sp"
             android:textColor="@color/text_hint_theme_color"
             android:textColorHint="@color/text_hint_theme_color"
@@ -70,6 +71,7 @@
             android:layout_weight="2"
             android:layout_marginLeft="@dimen/dp_5"
             android:background="@null"
+            android:inputType="number"
             android:textSize="14sp"
             android:textColor="@color/text_hint_theme_color"
             android:textColorHint="@color/text_hint_theme_color"
@@ -112,11 +114,11 @@
             android:textSize="14sp"
             android:textColor="@color/text_hint_theme_color"
             android:textColorHint="@color/text_hint_theme_color"
-            android:hint="@string/hint_input_psd"/>
+            android:hint="@string/hint_input_new_psd"/>
         <ImageView
             android:id="@+id/img_psd_show_hide"
             android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_height="20dp"
             android:layout_weight="0.5"
             android:src="@mipmap/icon_psd_hide"/>
     </LinearLayout>
@@ -146,11 +148,11 @@
             android:textSize="14sp"
             android:textColor="@color/text_hint_theme_color"
             android:textColorHint="@color/text_hint_theme_color"
-            android:hint="@string/hint_input_psd_agin"/>
+            android:hint="@string/hint_input_new_psd_agin"/>
         <ImageView
             android:id="@+id/img_psd_show_hide_agin"
             android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_height="20dp"
             android:layout_weight="0.5"
             android:src="@mipmap/icon_psd_hide"/>
     </LinearLayout>
diff --git a/app/src/main/res/layout/reset_psd_layout.xml b/app/src/main/res/layout/reset_psd_layout.xml
index d183bcf..109cb08 100644
--- a/app/src/main/res/layout/reset_psd_layout.xml
+++ b/app/src/main/res/layout/reset_psd_layout.xml
@@ -33,6 +33,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_5"
             android:background="@null"
+            android:inputType="textPassword"
             android:textSize="14sp"
             android:textColor="@color/text_hint_theme_color"
             android:textColorHint="@color/text_hint_theme_color"
@@ -58,6 +59,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_5"
             android:background="@null"
+            android:inputType="textPassword"
             android:textSize="14sp"
             android:textColor="@color/text_hint_theme_color"
             android:textColorHint="@color/text_hint_theme_color"
@@ -84,6 +86,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_5"
             android:background="@null"
+            android:inputType="textPassword"
             android:textSize="14sp"
             android:textColor="@color/text_hint_theme_color"
             android:textColorHint="@color/text_hint_theme_color"