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

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

 ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddNewForm.cs

@@ -66,8 +66,6 @@
                    string msg = this.CheckPassword(firstPsw, pssword);

                    if (msg != string.Empty)

                    {

                        //请重复输入新胁迫密码

                        pswControl.ResetControlInfo(Language.StringByID(R.MyInternationalizationString.uPleaseRepeatInputNewCoercePassword));

                        //设置错误信息

                        pswControl.SetErrorMsg(msg);

                        return;