From 57675dec9563b46704bdfa02bf306ca6bfcd7be7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 19 十二月 2020 19:03:10 +0800
Subject: [PATCH] 2020-12-19 1.修改登录锁定提示
---
HDL-ON_iOS/Resources/Language.ini | 3 ++-
HDL-ON_Android/Assets/Language.ini | 3 ++-
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 12 ++++++++++--
HDL_ON/Common/R.cs | 4 ++++
.vs/HDL_APP_Project/xs/UserPrefs.xml | 35 +++++++++++++++++++++++++----------
5 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 63a0a19..dc9ad60 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.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>
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
old mode 100755
new mode 100644
index 70ed926..f672d5f
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -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=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
old mode 100755
new mode 100644
index 3c62817..357e121
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -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=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
old mode 100755
new mode 100644
index c1448e6..4ff284e
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -779,6 +779,10 @@
/// 浣跨敤鏉冮檺
/// </summary>
public const int PermissionToUse = 9060;
+ /// <summary>
+ /// 浣跨敤鏉冮檺
+ /// </summary>
+ public const int PleaseTryToForgetPassword = 9061;
#region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
old mode 100755
new mode 100644
index a2d2bb8..eb24336
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -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;
}
--
Gitblit v1.8.0