全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs

@@ -75,7 +75,6 @@
                    }

                    //密码错误，请重新输入

                    pswControl.SetErrorMsg(Language.StringByID(R.MyInternationalizationString.uOldPsswordIsError));

                    pswControl.ResetControlInfo(i_PasswordText, false);

                    return;

                }

                //重置剩余密码次数