新增功能需求代码

src/minotefinal/minote2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Wed May 24 13:18:42 CST 2023
+#Fri May 26 15:53:18 CST 2023
 base.0=C\:\\Users\\Lenovo\\Desktop\\minotefinal\\minote2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex

src/minotefinal/minote2/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java

@@ -962,14 +962,20 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         positive.setOnClickListener(v -> {//设置确定按钮的接收器
             hideSoftInput(etPwd);//点击确定后收起软键盘
             String Password = etPwd.getText().toString();
-            if (!TextUtils.isEmpty(Password)) {//输入不为空
+            String regex = "[a-zA-Z0-9]{5,8}";
-                //Toast.makeText(getApplicationContext(), Password, Toast.LENGTH_SHORT).show();
+            if(Password.matches(regex)){
-                //加到数据库里
+                if (!TextUtils.isEmpty(Password)) {//输入不为空
-                mWorkingNote.setmPwd(Password);
+                    //Toast.makeText(getApplicationContext(), Password, Toast.LENGTH_SHORT).show();
-                mWorkingNote.setPrivateType(mWorkingNote.getPrivateMode() == 0 ?//改workingnote的mPrivateMode的值，对应上文的界面设置
+                    //加到数据库里
-                       TextNote.MODE_PRIVATE_TYPE : 0);
+                    mWorkingNote.setmPwd(Password);
-                //saveNote();
+                    mWorkingNote.setPrivateType(mWorkingNote.getPrivateMode() == 0 ?//改workingnote的mPrivateMode的值，对应上文的界面设置
+                            TextNote.MODE_PRIVATE_TYPE : 0);
+                    //saveNote();
+                }
+            }else{
+                Toast.makeText(getApplicationContext(),"密码设置错误，字母或数字5-8位",Toast.LENGTH_LONG).show();
             }
+
             dialog.dismiss();//撤销对话框
         });
         if (TextUtils.isEmpty(etPwd.getText())) {//如果为空，则不能选择确定按钮