From 8edf8fd9f5f7c29cc6302a8d46de06d391ed3657 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 16 一月 2020 13:03:57 +0800
Subject: [PATCH] 2020-01-16 Version 2.50115-B3 1.优化MQTT连接。 2.增加本地通信加密。 3.增加配置网关提示语。 4.编辑定时器增加重复名字提示 5.更新规范翻译。
---
Crabtree/SmartHome/HDL/Operation/ResponseEntity/ErrorCode.cs | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/ErrorCode.cs b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/ErrorCode.cs
index 8090ec3..80f8a95 100644
--- a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/ErrorCode.cs
+++ b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/ErrorCode.cs
@@ -7,19 +7,19 @@
//缃戠粶閿欒
public readonly static string NetworkError = "Network Error";
//鍘熷洜
- public readonly static string Reason = " Reason: ";
+ public readonly static string Reason = " Cause: ";
//璐﹀彿宸叉敞鍐岋紝婵�娲婚偖浠跺凡缁忛噸鏂板彂閫�
- public readonly static string AccountYesRegisterNoIsverify = "The account is registered and the activation email has been resent!";
+ public readonly static string AccountYesRegisterNoIsverify = "Account is registered and activation email has been resent!";
//璐﹀彿鏈縺娲�
public readonly static string NOTVERIFY = "Account is not activated!";
//璐﹀彿鎴栧瘑鐮侀敊璇�
public readonly static string USERNAMEORPWDERROR = "Account or password error!";
//璐﹀彿涓嶅瓨鍦�
- public readonly static string ACCOUNTNOEXISTS = "Account not exist!";
+ public readonly static string ACCOUNTNOEXISTS = "Account does not exist";
//鐧诲綍澶辫触锛屽師鍥犱负锛�
public readonly static string LoginFailed = "Login failed!";
//鏃犳晥鐧诲綍Token
- public readonly static string NoLogin = "LInvalid Login Token!";
+ public readonly static string NoLogin = "Invalid Login Token!";
//鍚嶇О宸插瓨鍦�
public readonly static string NameExist = "Name already exists!";
//娣诲姞澶辫触
@@ -27,49 +27,48 @@
//鎿嶄綔澶辫触
public readonly static string OperationFailed = "Operation failed!";
//鍘熷瘑鐮佸拰鏂板瘑鐮佺浉鍚�
- public readonly static string NewPasswordAndOldPasswordEqual = "The old password and the new password are the same!";
+ public readonly static string NewPasswordAndOldPasswordEqual = "New password should be different with the original one.";
//鍘熷瘑鐮侀敊璇�
public readonly static string OldPwdNoYes = "Wrong original password!";
//鍙戦�侀偖浠跺け璐�
- public readonly static string SendEmailFail = "Send mail failed!";
+ public readonly static string SendEmailFail = "Unable to send mail.";
//褰撳墠鎻愪氦HomeId涓庡綋鍓峅ldMac灏氫笉瀛樺湪缁戝畾鍏崇郴!
- public readonly static string NoBind = "There is no binding relationship between the currently submitted HomeId and the current OldMac!";
+ public readonly static string NoBind = "The HomeId just submitted is not bound with current OldMac.";
//Token 楠岃瘉澶辫触
public readonly static string HomeIdAndTokenNoConsistent = "Token verification failed!";
- //
- public readonly static string CurrentHomeExixtsGatewayBind = "The home still has a gateway binding, please untie it first!";
+ //浣忓畢杩樺瓨鍦ㄧ綉鍏崇粦瀹�,璇峰厛瑙ｇ粦瀹屽啀鎿嶄綔!
+ public readonly static string CurrentHomeExixtsGatewayBind = "The home is bound with gateway already, please unbind first.";
//浜や粯澶囦唤, 涓嶈兘鍒犻櫎!
- public readonly static string DeliveryBackNoUpdateDel = "Delivery backup, cannot be deleted!";
+ public readonly static string DeliveryBackNoUpdateDel = "Backup delivered and cannot be deleted.";
//浣忓畢鏈粦瀹氱綉鍏� 璇峰厛缁戝畾鏃犵嚎缃戝叧!
- public readonly static string HomeNoRecord = "Please bind the gateway first!";
+ public readonly static string HomeNoRecord = "Please bind gateway first!";
//浣忓畢涓嶅瓨鍦紒
- public readonly static string HomeNoExist = "Home doesn't exist!";
+ public readonly static string HomeNoExist = "Home does not exist!";
//鐢熸垚鐨凣uid宸插瓨鍦�
- public readonly static string GuidExist = "Guid Exist!";
+ public readonly static string GuidExist = "Guid already exists.";
//鍒犻櫎澶辫触
public readonly static string FailedDelete = "Failed to delete!";
//瀛愯处鍙蜂笉瀛樺湪
- public readonly static string SubAccountNoExists = "The sub account is not registered, please bind the registered sub account!";
+ public readonly static string SubAccountNoExists = "Sub accound does not exist.";
//涓嶈兘娣诲姞鑷繁涓哄瓙璐﹀彿
public readonly static string SameAccount = "Can't add yourself as a sub-account!";
//璐﹀彿宸插瓨鍦ㄦ浣忓畢
public readonly static string SubAccountExist = "Account already exists!";
//涓嶈兘缁戝畾涓昏处鍙�
- public readonly static string NoAddMainAccount = "Can't bind master account!";
+ public readonly static string NoAddMainAccount = "Can't bind main account!";
//鑾峰彇浣忓畢鐨勭綉鍏冲垪琛ㄥけ璐ワ紒
- public readonly static string FailedGetGatewaysForHome = "Failed to get list of gateways for home!";
-
+ public readonly static string FailedGetGatewaysForHome = "Unable to get gateway list for home!";
//姝ょ綉鍏冲凡缁戝畾鍒颁竴涓綇鎵�锛岃鍦ㄧ粦瀹氬埌鍙︿竴涓綇鎵�涔嬪墠灏嗗叾閲嶇疆銆傛垨鑰呴暱鎸夌綉鍏虫寜閿�3S锛屽彉鎴愮孩鐏父浜紝鐒跺悗閲嶈瘯锛�
- public readonly static string UnableToBindGateway = "This gateway is already bound to one residence, please reset it before binding to another residence.Or long press the gateway button 3S, the red light is always on, and then try again!";
+ public readonly static string UnableToBindGateway = "This gateway has been bound to one residence, please unbind or reset before binding to another residence. (Press gateway button for 3s and the red light keeps on, then retry.)";
//缃戝叧鍥轰欢鐗堟湰杩囦綆锛岃鍏堝崌绾э紒
- public readonly static string GatewayVersionLow = "The gateway firmware version is too low, please upgrade first!";
+ public readonly static string GatewayVersionLow = "Please update firmware first.";
//璇峰厛缁戝畾鏃犵嚎缃戝叧 2020-01-11
- public readonly static string BindGatewayFirst = "Please bind the gateway first!";
+ public readonly static string BindGatewayFirst = "Please bind wireless gateway first.";
//鎮ㄧ殑甯愭埛宸插湪鍙︿竴鍙拌澶囦娇鐢ㄨ繙绋嬭繛鎺ョ櫥褰曪紒
public readonly static string LoginInAnotherDevice = "Your account is signed in with a remote connection on another device!";
- //鎮ㄥ苟涓嶅叿鏈夋鍒嗕韩鑰呮浣忓畢鐨勫畬鍏ㄦ帶鍒舵潈闄�!
+ //鎮ㄥ苟涓嶅叿鏈夋鍒嗕韩浣忓畢鐨勫畬鍏ㄦ帶鍒舵潈闄�!
public readonly static string InsufficientAuthority = "You don't have full control over this sharer's home!";
- //瀵嗙爜閿欒鎴栬�呯綉鍏宠鍏跺畠浣忓畢缁戝畾锛屼笌缃戝叧閫氳澶辫触! 璇烽暱鎸夌綉鍏虫寜閽�3S锛岃繘鍏ョ孩鐏父浜紝鐒跺悗閲嶆柊鎼滅储锛�
- public readonly static string GatewayPasswordError = "The password is wrong or the gateway is bound by another home, communication with the gateway failed! Please long press the gateway button 3S, the red light is always on, and then search again!";
+ //缃戝叧琚叾瀹冧綇瀹呯粦瀹氾紝涓庣綉鍏抽�氳澶辫触! 璇烽暱鎸夌綉鍏虫寜閽�3S锛岃繘鍏ョ孩鐏父浜紝鐒跺悗閲嶆柊鎼滅储锛�
+ public readonly static string GatewayPasswordError = "Failed to communicate with gateway, as the gateway has already been bound to another residence. Please press the gateway button for 3s, and search again when the red light keeps on.";
}
}
--
Gitblit v1.8.0