2020-11-24 1.优化登录界面失败提示。

JLChen

2020-11-24 4c17caa61bc3b0a05a2b303bccdfedfbf3853f6d

2020-11-24 1.优化登录界面失败提示。

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,13 +1,14 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpServerRequest.cs">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_Android/Assets/Language.ini">
    <Files>
      <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI1-Login/RegisterPage.cs" Line="58" Column="35" />
      <File FileName="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" Line="611" Column="46" />
      <File FileName="HDL_ON/UI/UI1-Login/SelectServerDialog.cs" Line="43" Column="100" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="1029" Column="1" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="868" Column="42" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="1140" Column="2" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI0-Public/WebViewDialog.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI1-Login/SelectServerDialog.cs" Line="60" Column="39" />
      <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="22" Column="7" />
      <File FileName="HDL-ON_Android/Assets/Language.ini" Line="467" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -16,9 +17,7 @@
            <Node name="HDL_ON" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="DAL" expanded="True">
                <Node name="Server" expanded="True">
                  <Node name="HttpServerRequest.cs" selected="True" />
                </Node>
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="CSS" expanded="True" />
@@ -34,6 +33,12 @@
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="Assets" expanded="True">
                <Node name="Language.ini" selected="True" />
              </Node>
              <Node name="Properties" expanded="True" />
            </Node>
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Resources" expanded="True">
@@ -53,7 +58,7 @@
    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.364c4b3158493098" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>

 HDL-ON_Android/Assets/Language.ini

@@ -13,6 +13,12 @@
14=Register
42=Network anomaly

10001=Failed to request the server, please try again later!
10002=System maintenance, please try again later!
10003=Login failed, please add a home first!
10004=Account already exists


[Chinese]
1=登录
2=手机号登录
@@ -301,8 +307,8 @@
285=绑定手机号
286=绑定手机成功
287=绑定手机失败
288=手机号修改
289=解绑手机号
288=修改绑定手机
289=解除手机绑定
290=读取历史数据失败
291=暂无已收藏的场景
292=关于ON
@@ -371,6 +377,11 @@
355=关于
356=版本号
357=此功能暂未开放！
358=电话:
359=邮箱:
360=面板场景
361=未添加
362=全选

5000=音乐
5001=组合
@@ -421,3 +432,35 @@
5046=调节音量
5047=你手机暂未安装"QQ音乐"{\r\n}请前往手机商场安装

9000=请使用新的手机账号登录APP
9001=请使用新的邮箱账号登录APP
9002=登录手机修改完成
9003=登录手机绑定完成
9004=登录邮箱修改完成
9005=登录邮箱绑定完成
9006=验证码可能会延迟，请再等一会
9007=再等一会
9008=返回
9009=不愿意透露姓名的用户
9010=新密码
9011=再次输入新密码
9012=同意
9013=用户协议
9014=隐私政策
9015=和
9016=请先阅读并同意《用户协议》和《隐私政策》
9017=确认退出登录？
9018=请选择国家/区域
9019=立即更新
9020=以后再说
9021=国家/地区



10000=无效登录密钥，请重新登录！
10001=请求服务器失败，请稍后再试！
10002=系统维护中,请稍后再试!
10003=登录失败，请先添加住宅！
10004=账号已存在
10005=验证码发送频繁，请稍后再试！
10006=签名错误

 HDL_ON/DAL/Server/HttpServerRequestµÄ¸±±¾.cs

File was deleted

 HDL_ON/UI/UI1-Login/LoginPageBLL.cs

@@ -93,6 +93,7 @@
                        if (result.Code != StateCode.SUCCESS)
                        {
                            IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
                            ShowBtnAccountViewBottomLineError();
                            return;
                        }
                        else
@@ -319,8 +320,8 @@

                //if (btnGetVerificationCode.Parent != null)
                //{
                    //btnGetVerificationCode.RemoveFromParent();
                    btnGetVerificationCode.Visible = false;
                //btnGetVerificationCode.RemoveFromParent();
                btnGetVerificationCode.Visible = false;
                //}
                //隐藏密码
                etPassword.SecureTextEntry = true;
@@ -351,8 +352,8 @@
                    btnPasswordIcon.IsSelected = false;
                    //if (btnGetVerificationCode.Parent != null)
                    //{
                        //btnGetVerificationCode.RemoveFromParent();
                        btnGetVerificationCode.Visible = false;
                    //btnGetVerificationCode.RemoveFromParent();
                    btnGetVerificationCode.Visible = false;
                    //}
                    //隐藏密码
                    etPassword.SecureTextEntry = true;
@@ -568,7 +569,7 @@
                {
                    btnLogin.IsSelected = false;
                }
                if (Regex.IsMatch(account, @"^[1]+\d{10}") )//&& account.Length == 11)
                if (Regex.IsMatch(account, @"^[1]+\d{10}"))//&& account.Length == 11)
                {
                    btnGetVerificationCode.IsSelected = true;
                    btnGetVerificationCode.TextColor = CSS_Color.MainBackgroundColor;
@@ -610,6 +611,7 @@
                        if (result.Code != StateCode.SUCCESS)
                        {
                            IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
                            ShowBtnAccountViewBottomLineError();
                            return;
                        }
                        else
@@ -621,7 +623,7 @@

                    //登录
                    var loginResult = LoadMethod_Login();
                    if( !string.IsNullOrEmpty (verAccount))//验证登录账号
                    if (!string.IsNullOrEmpty(verAccount))//验证登录账号
                    {
                        Application.RunOnMainThread(() =>
                        {
@@ -657,7 +659,7 @@
                                OnAppConfig.Instance.RefreshUserConfig();
                                DB_ResidenceData.InitRoomFunction();
                            }
                            if ( UserInfo.Current.userEmailInfo == "464027401@qq.com")
                            if (UserInfo.Current.userEmailInfo == "464027401@qq.com")
                            {
                                DB_ResidenceData.residenceData.floors.Add(new Floor() { name = "1F", sid = "09888" });
                                var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "09888", backgroundImage = "Classification/Room/Roombg.png" };
@@ -932,8 +934,8 @@
                        {
                            //2020-11-13 å¾…确认
                            //获取住宅失败，重新标记为未登录状态
                             UserInfo.Current.lastTime = DateTime.MinValue;
                             UserInfo.Current.SaveUserInfo();
                            UserInfo.Current.lastTime = DateTime.MinValue;
                            UserInfo.Current.SaveUserInfo();
                            //登录失败，请先添加住宅！
                            Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.FailedGetHomeList));
                        }
@@ -1011,54 +1013,30 @@
            //登录失败
            else
            {
                //2020-11-13 å¾…修改
                string tipStr = "Sever erorr";
                switch (loginResult.Code)
                {
                    case "ValidCodeAndPhoneNoEqual":
                        tipStr = Language.StringByID(StringId.VerificationCodeError);
                        Application.RunOnMainThread(() =>
                        {
                            btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                            btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                        });
                        break;
                    case "USERNAMEORPWDERROR":
                        tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
                        Application.RunOnMainThread(() =>
                        {
                            btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                            btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                        });
                        break;
                    case "ACCOUNTNOEXISTS":
                        tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
                        Application.RunOnMainThread(() =>
                        {
                            btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                            btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                        });
                        break;
                    case "NoRecord":
                        tipStr = Language.StringByID(StringId.PlsGetTheVerificationCode);
                        break;
                    case "Self:Net_Error":
                        tipStr = Language.StringByID(StringId.NetworkAnomaly);
                        break;
                }
                //账号或者密码错误
                Application.RunOnMainThread(() =>
                {
                    waitPage.Hide();
                    //提示原因
                    var tip = new Tip()
                    if (loginResult.Code == "10008")
                    {
                        Text = tipStr,
                        CloseTime = 1,
                        Direction = AMPopTipDirection.None
                    };
                    tip.Show(bodyView);
                        //用户名或密码错误
                        btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                        btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                    }
                    else if (loginResult.Code == "10010")
                    {
                        //用户不存在
                        btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                        btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                    }
                    else if (loginResult.Code == "14")
                    {
                        btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                        btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                    }
                    waitPage.Hide();
                });

                IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
            }
            return result;
        }
@@ -1073,7 +1051,8 @@
            if (responsePack == StateCode.SUCCESS)
            {
                //2020-11-13 å¾…确认，没有住宅，不算登录成功
                if ( UserInfo.Current.regionList != null &&  UserInfo.Current.regionList.Count > 0){
                if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
                {
                    result = true;
                }
                //result = true;
@@ -1144,5 +1123,18 @@

            };
        }

        /// <summary>
        /// ç”¨æˆ·ä¸å­˜åœ¨
        /// </summary>
        void ShowBtnAccountViewBottomLineError()
        {
            Application.RunOnMainThread(() =>
            {
                //用户不存在
                btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
            });
        }
    }
}