From 8916de38960ffda9a9f9bf09ace9000f40de828d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 13 一月 2021 11:26:32 +0800
Subject: [PATCH] 2021-01-13 1.增加备份错误码翻译字段。
---
Crabtree/SmartHome/HDL/Operation/ResponseEntity/API.cs | 20 +++++-----
Crabtree/SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs | 12 ++++++
Crabtree/SmartHome/UI/SimpleControl/R.cs | 10 ++++-
Crabtree/ON/Assets/Language.ini | 3 +
Crabtree/ON.Ios/Resources/Language.ini | 3 +
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 31 ++++++---------
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs | 8 ++--
7 files changed, 50 insertions(+), 37 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 669f033..e2ee744 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,35 +1,28 @@
-锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
- <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.4b65c4650918" />
- <MonoDevelop.Ide.Workbench ActiveDocument="ON/Application.cs">
+锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
+ <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs">
<Files>
- <File FileName="SmartHome/HDL/Operation/ResponseEntity/API.cs" Line="92" Column="34" />
- <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="831" Column="82" />
- <File FileName="SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" Line="778" Column="60" />
- <File FileName="ON/Application.cs" Line="327" Column="28" />
- <File FileName="ON.Ios/AppDelegate.cs" Line="283" Column="20" />
+ <File FileName="SmartHome/HDL/Operation/MyEnum.cs" Line="1510" Column="9" />
+ <File FileName="SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs" Line="16" Column="20" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" Line="85" Column="54" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="SmartHome" expanded="True">
- <Node name="ON.Droid" expanded="True">
- <Node name="Application.cs" selected="True" />
- </Node>
- <Node name="ON.Ios" expanded="True" />
<Node name="Shared" expanded="True">
- <Node name="DLL" expanded="True" />
<Node name="HDL" expanded="True">
<Node name="Common" expanded="True">
<Node name="HttpUtil" expanded="True" />
</Node>
- <Node name="Operation" expanded="True">
- <Node name="ResponseEntity" expanded="True" />
- </Node>
+ <Node name="Operation" expanded="True" />
</Node>
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
- <Node name="Guide" expanded="True" />
+ <Node name="Register" expanded="True">
+ <Node name="AccountLogin.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
@@ -47,8 +40,8 @@
<String>IosService/IosService.csproj</String>
<String>DroidService/DroidService.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
+ <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/Crabtree/ON.Ios/Resources/Language.ini b/Crabtree/ON.Ios/Resources/Language.ini
index 722b2ba..84eda34 100644
--- a/Crabtree/ON.Ios/Resources/Language.ini
+++ b/Crabtree/ON.Ios/Resources/Language.ini
@@ -1104,7 +1104,8 @@
20053=Gateway searched successfully, enable local connection.
20054=Gateway cannot be searched locally.
20055=Added successfully
-
+20056=The backup folder does not exist.
+20057=The backup file does not exist.
[Chinese]
1=浣犲ソ
diff --git a/Crabtree/ON/Assets/Language.ini b/Crabtree/ON/Assets/Language.ini
index 9976ab6..4ac04b4 100644
--- a/Crabtree/ON/Assets/Language.ini
+++ b/Crabtree/ON/Assets/Language.ini
@@ -1104,7 +1104,8 @@
20053=Gateway searched successfully, enable local connection.
20054=Gateway cannot be searched locally.
20055=Added successfully
-
+20056=The backup folder does not exist.
+20057=The backup file does not exist.
[Chinese]
1=浣犲ソ
diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs
index c86f5b8..498bebc 100644
--- a/Crabtree/SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs
+++ b/Crabtree/SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs
@@ -175,6 +175,18 @@
//鑷姩鍖栧凡瀛樺湪
stateCodeDic ["14502"] = MyInternationalizationString.AutomationAlreadyExists;
+ //-------------------澶囦唤妯″潡-------------------
+ //澶囨敞鍚嶇О宸茬粡瀛樺湪,璇锋洿鎹㈠悗閲嶈瘯锛佹枃浠跺す鍚嶇О宸茬粡瀛樺湪
+ stateCodeDic ["10601"] = SimpleControl.R.MyInternationalizationString.FileNamehasExisted;
+ //澶囦唤鏂囦欢澶逛笉瀛樺湪
+ stateCodeDic ["10602"] = SimpleControl.R.MyInternationalizationString.FolderNoExist;
+ //澶囦唤鏂囦欢涓嶅瓨鍦�
+ stateCodeDic ["10603"] = SimpleControl.R.MyInternationalizationString.FileNoExist;
+ //澶囦唤澶辫触
+ stateCodeDic ["10607"] = SimpleControl.R.MyInternationalizationString.FailedToBackupFile;
+
+
+
//*********璁惧*********
//璁惧鐩爣閲嶅
stateCodeDic ["10801"] = MyInternationalizationString.DuplicateDeviceTarget;
diff --git a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/API.cs b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/API.cs
index 0cda94d..2943454 100644
--- a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/API.cs
+++ b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/API.cs
@@ -250,18 +250,18 @@
#endregion
#region EmqMqtt 閮ㄥ垎
//***************************EmqMqtt 閮ㄥ垎********************************
- public static string API_EmqMqtt = "/EmqMqtt/";
+ //public static string API_EmqMqtt = "/EmqMqtt/";
- /// <summary>
- /// 5.03 鑾峰彇鍒嗕韩鑰匨qtt杩滅▼鎺у埗淇℃伅(Emq鐗堟湰)
- /// </summary>
- public static string ShareMemberConnMqttInfo = API_EmqMqtt + "ShareMemberConnMqttInfo";
+ ///// <summary>
+ ///// 5.03 鑾峰彇鍒嗕韩鑰匨qtt杩滅▼鎺у埗淇℃伅(Emq鐗堟湰)
+ ///// </summary>
+ //public static string ShareMemberConnMqttInfo = API_EmqMqtt + "ShareMemberConnMqttInfo";
- /// <summary>
- /// 瀹㈡埛绔幏鍙栬繛鎺ヤ簯绔疢qtt淇℃伅
- /// Connection
- /// </summary>
- public static string GetConnMqttInfo = API_EmqMqtt + "GetConnMqttInfo";
+ ///// <summary>
+ ///// 瀹㈡埛绔幏鍙栬繛鎺ヤ簯绔疢qtt淇℃伅
+ ///// Connection
+ ///// </summary>
+ //public static string GetConnMqttInfo = API_EmqMqtt + "GetConnMqttInfo";
#endregion
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
index 30b722b..5a7ee6f 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
@@ -79,10 +79,10 @@
//etAccount.Text = "721343314@qq.com";
//etAccount.Text = "crabtreel12019@gmail.com";
//etAccount.Text = "2791308028@qq.com";
- //etAccount.Text = "551775569@qq.com";
+ etAccount.Text = "551775569@qq.com";
//etAccount.Text = "18824864143";
- etAccount.Text = "cjl@hdlchina.com.cn";
+ //etAccount.Text = "cjl@hdlchina.com.cn";
#endif
accountView.AddChidren (etAccount);
@@ -135,8 +135,8 @@
Text = password,
};
#if DEBUG
- etPasswrod.Text = "123456";
- //etPasswrod.Text = "123456-Aa";
+ //etPasswrod.Text = "123456";
+ etPasswrod.Text = "123456-Aa";
#endif
passwrodView.AddChidren (etPasswrod);
diff --git a/Crabtree/SmartHome/UI/SimpleControl/R.cs b/Crabtree/SmartHome/UI/SimpleControl/R.cs
index 1540c22..6953c90 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/R.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/R.cs
@@ -1179,8 +1179,14 @@
/// 娣诲姞鎴愬姛
/// </summary>
public const int AddedSuccessfully = 20055;
-
-
+ /// <summary>
+ /// 澶囦唤鏂囦欢澶逛笉瀛樺湪
+ /// </summary>
+ public const int FolderNoExist = 20056;
+ /// <summary>
+ /// 鏂囦欢涓嶅瓨鍦�
+ /// </summary>
+ public const int FileNoExist = 20057;
--
Gitblit v1.8.0