JLChen
2020-12-19 57675dec9563b46704bdfa02bf306ca6bfcd7be7
2020-12-19 1.修改登录锁定提示
5个文件已修改
57 ■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Language.ini 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Language.ini 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/R.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/LoginPageBLL.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,10 +1,8 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/UdpSocket.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_Android/Application.cs">
    <Files>
      <File FileName="HDL-ON_Android/Application.cs" Line="340" Column="10" IsPinned="True" />
      <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="403" Column="54" />
      <File FileName="HDL_ON/DAL/DriverLayer/UdpSocket.cs" Line="67" Column="15" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -13,15 +11,32 @@
            <Node name="HDL_ON" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="DAL" expanded="True">
                <Node name="DriverLayer" expanded="True">
                  <Node name="UdpSocket.cs" selected="True" />
                </Node>
                <Node name="Mqtt" expanded="True" />
                <Node name="DriverLayer" expanded="True" />
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="UI" expanded="True" />
              <Node name="UI" expanded="True">
                <Node name="UI0-Public" expanded="True" />
                <Node name="UI1-Login" expanded="True" />
                <Node name="UI2" expanded="True">
                  <Node name="3-Intelligence" expanded="True" />
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="AboutOn" expanded="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True" />
            <Node name="HDL-ON_iOS" expanded="True" />
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="Assets" expanded="True" />
              <Node name="libs" expanded="True" />
              <Node name="Other" expanded="True" />
              <Node name="Properties" expanded="True" />
              <Node name="Resources" expanded="True" />
              <Node name="Application.cs" selected="True" />
            </Node>
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Other" expanded="True" />
              <Node name="Resources" expanded="True" />
            </Node>
          </Node>
        </State>
      </Pad>
HDL-ON_Android/Assets/Language.ini
old mode 100755 new mode 100644
@@ -584,7 +584,7 @@
9046=修改成功!
9047=您的密码已经修改生效,请重新登录
9048=使用账号密码登录
9049=密码连续输错次数已达到10次,用户已被锁定,请次日0点后再登陆
9049=密码错误超过10次,账号被锁定!
9050=验证面容ID
9051=保存用户头像失败
9052=推送注册正常
@@ -596,6 +596,7 @@
9058=是否需要保存
9059=暂无分享
9060=使用权限
9061=请通过忘记密码找回密码或次日0点后再登陆.
10000=无效登录密钥,请重新登录!
10001=请求服务器失败,请稍后再试!
HDL-ON_iOS/Resources/Language.ini
old mode 100755 new mode 100644
@@ -585,7 +585,7 @@
9046=修改成功!
9047=您的密码已经修改生效,请重新登录
9048=使用账号密码登录
9049=密码连续输错次数已达到10次,用户已被锁定,请次日0点后再登陆
9049=密码错误超过10次,账号被锁定!
9050=验证面容ID
9051=保存用户头像失败
9052=推送注册正常
@@ -597,6 +597,7 @@
9058=是否需要保存
9059=暂无分享
9060=使用权限
9061=请通过忘记密码找回密码或次日0点后再登陆.
10000=无效登录密钥,请重新登录!
10001=请求服务器失败,请稍后再试!
HDL_ON/Common/R.cs
old mode 100755 new mode 100644
@@ -779,6 +779,10 @@
        /// 使用权限
        /// </summary>
        public const int PermissionToUse = 9060;
        /// <summary>
        /// 使用权限
        /// </summary>
        public const int PleaseTryToForgetPassword = 9061;
        #region 网络请求响应错误提示信息
HDL_ON/UI/UI1-Login/LoginPageBLL.cs
old mode 100755 new mode 100644
@@ -735,6 +735,8 @@
                //账号或者密码错误
                Application.RunOnMainThread(() =>
                {
                    waitPage.Hide();
                    if (loginResult.Code == "10008")
                    {
                        //用户名或密码错误
@@ -752,10 +754,16 @@
                        btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                        btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                    }
                    waitPage.Hide();
                    else if (loginResult.Code == "10019")
                    {
                        var tipStr = Language.StringByID(StringId.AccountLoginLock) + "\r\n" + Language.StringByID(StringId.PleaseTryToForgetPassword);
                        Utlis.ShowTip(tipStr);
                        return;
                    }
                    IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
                });
                IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
            }
            return result;
        }