From 15978205aa7e4aeca8af3d3d34a80a85f0265f63 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 14 十二月 2020 10:42:52 +0800
Subject: [PATCH] 2020-12-14 1.密码锁定错误码处理
---
HDL-ON_iOS/Resources/Language.ini | 1 +
HDL-ON_Android/Assets/Language.ini | 1 +
HDL_ON/Common/R.cs | 5 ++++-
.vs/HDL_APP_Project/xs/UserPrefs.xml | 17 +++++++++++------
HDL_ON/DAL/Server/IMessageCommon.cs | 2 ++
5 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 99bc05d..43a0752 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,6 +1,12 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/IMessageCommon.cs">
+ <Files>
+ <File FileName="HDL_ON/Common/R.cs" Line="715" Column="42" />
+ <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="572" Column="19" />
+ <File FileName="HDL-ON_Android/Assets/Language.ini" Line="566" Column="37" />
+ <File FileName="HDL_ON/DAL/Server/IMessageCommon.cs" Line="103" Column="58" />
+ </Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -9,13 +15,13 @@
<Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
<Node name="Mqtt" expanded="True" />
- <Node name="Server" expanded="True" />
+ <Node name="Server" expanded="True">
+ <Node name="IMessageCommon.cs" selected="True" />
+ </Node>
</Node>
<Node name="Entity" expanded="True">
<Node name="Function" expanded="True" />
- <Node name="ResponseEntity" expanded="True">
- <Node name="RegionInfoRes.cs" selected="True" />
- </Node>
+ <Node name="ResponseEntity" expanded="True" />
</Node>
<Node name="UI" expanded="True">
<Node name="UI1-Login" expanded="True" />
@@ -38,7 +44,6 @@
</Node>
</Node>
<Node name="HDL-ON_iOS" expanded="True">
- <Node name="Other" expanded="True" />
<Node name="Resources" expanded="True" />
</Node>
</Node>
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 0ca9301..265f166 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -563,6 +563,7 @@
9046=淇敼鎴愬姛!
9047=鎮ㄧ殑瀵嗙爜宸茬粡淇敼鐢熸晥锛岃閲嶆柊鐧诲綍
9048=浣跨敤璐﹀彿瀵嗙爜鐧诲綍
+9049=瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 6135dff..821af88 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -565,6 +565,7 @@
9046=淇敼鎴愬姛!
9047=鎮ㄧ殑瀵嗙爜宸茬粡淇敼鐢熸晥锛岃閲嶆柊鐧诲綍
9048=浣跨敤璐﹀彿瀵嗙爜鐧诲綍
+9049=瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index aa32558..62a3a56 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -709,7 +709,10 @@
/// 浣跨敤璐﹀彿瀵嗙爜鐧诲綍
/// </summary>
public const int LogWithAccountAndPassword = 9048;
-
+ /// <summary>
+ /// 瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
+ /// </summary>
+ public const int AccountLoginLock = 9049;
#region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
/// <summary>
diff --git a/HDL_ON/DAL/Server/IMessageCommon.cs b/HDL_ON/DAL/Server/IMessageCommon.cs
index f96ee70..038ae9f 100644
--- a/HDL_ON/DAL/Server/IMessageCommon.cs
+++ b/HDL_ON/DAL/Server/IMessageCommon.cs
@@ -107,6 +107,8 @@
//stateCodeDic["10017"] = StringId.10017;
////绉熸埛涓嶅瓨鍦�
//stateCodeDic["10018"] = StringId.10018;
+ //瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
+ stateCodeDic["10019"] = StringId.AccountLoginLock;
////鏋氫妇绫诲瀷閿欒
//stateCodeDic["11003"] = StringId.11003;
--
Gitblit v1.8.0