Merge branch 'develop_account_password' into 'release'

feat: 1，注册页面根据类型限制输入格式 2，删除锁无需再次验证登录密码

See merge request StarlockTeam/app-starlock!205

lib/login/register/starLock_register_xhj_page.dart

@@ -135,6 +135,17 @@ class _StarLockRegisterPageState extends State<StarLockRegisterXHJPage> {
   Widget middleTFWidget() {
     return Column(
       children: <Widget>[
+        // Obx(() => LoginInput(
+        //         controller: state.phoneOrEmailController,
+        //         onchangeAction: (v) {
+        //           logic.checkNext(state.phoneOrEmailController);
+        //         },
+        //         leftWidget: SizedBox(),
+        //         label: state.isIphoneType.value ? '请输入手机号'.tr : '请输入邮箱'.tr,
+        //         keyboardType: TextInputType.number,
+        //         inputFormatters: <TextInputFormatter>[
+        //           LengthLimitingTextInputFormatter(30),
+        //         ])),
         Obx(() => LoginInput(
                 controller: state.phoneOrEmailController,
                 onchangeAction: (v) {
@@ -142,9 +153,18 @@ class _StarLockRegisterPageState extends State<StarLockRegisterXHJPage> {
                 },
                 leftWidget: SizedBox(),
                 label: state.isIphoneType.value ? '请输入手机号'.tr : '请输入邮箱'.tr,
-                keyboardType: TextInputType.number,
+                keyboardType: state.isIphoneType.value
+                    ? TextInputType.number
+                    : TextInputType.emailAddress,
                 inputFormatters: <TextInputFormatter>[
                   LengthLimitingTextInputFormatter(30),
+                  // 根据注册类型添加输入限制
+                  if (state.isIphoneType.value)
+                    FilteringTextInputFormatter.digitsOnly // 手机号只能输入数字
+                  else
+                    // 邮箱：只允许字母、数字、@、.、_、-
+                    FilteringTextInputFormatter.allow(
+                        RegExp(r'[a-zA-Z0-9@._-]'))
                 ])),
         LoginInput(
             controller: state.pwdController,

lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart

@@ -563,8 +563,9 @@ class LockSetLogic extends BaseGetXController {
           .showIosTipWithContentDialog('删除锁后，所有信息都会一起删除，确定删除锁吗？'.tr, () {
         // 删除锁
         state.showTipView.resetGetController();
-        state.showTipView.showTFViewAlertDialog(
-            state.passwordTF, '请输入登录密码'.tr, '请输入登录密码'.tr, checkLoginPassword);
+        factoryDataResetAction();
+        // state.showTipView.showTFViewAlertDialog(
+        //     state.passwordTF, '请输入登录密码'.tr, '请输入登录密码'.tr, checkLoginPassword);
       });
     } else if (state.lockBasicInfo.value.keyRight == 1) {
       // 授权管理员弹框提示