Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL

JLChen

2020-11-23 eb51679c618d5027070fbd6f3c0519f0f17e7d7d

 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs

@@ -279,12 +279,12 @@
                {
                    if (optionType == "7")
                    {
                        MainPage.GoLoginPage( UserInfo.Current);
                        MainPage.GoLoginPage(MainPage.LoginUser);
                    }
                    else
                    {
                        Action<string> action = (pw) => {
                            var resultObj = new HttpServerRequest().LoginByPassword( UserInfo.Current.accountString, pw);
                            var resultObj = new HttpServerRequest().LoginByPassword(MainPage.LoginUser.accountString, pw);
                            if (resultObj.Code == StateCode.SUCCESS)
                            {
                                OnAppConfig.Instance.appUnlockPasswrod = "";
@@ -296,7 +296,7 @@
                            else
                            {
                                //登录失败
                                IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
                                IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Login, resultObj.Code);
                            }

                        };