From f9f9b0030fdd2691632569b7dcad9d0ddca5e4cf Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 09:28:54 +0800
Subject: [PATCH] 2020-12-23 1.调整mqtt挤下线，跑ui线程。2.LoadEvent_CheckLinkStatus方法调整
---
HDL_ON/Common/R.cs | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
old mode 100755
new mode 100644
index 0a834b8..e1987e7
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -3,15 +3,17 @@
namespace HDL_ON
{
public static class StringId
- {
- public const int Reading = 407;
- public const int MeetingGuests = 406;
- public const int Cozy = 405;
- public const int QuickAdjustment = 404;
- public const int ColorTemperature = 403;
+ {
+ public const int Reading = 407;
+ public const int MeetingGuests = 406;
+ public const int Cozy = 405;
+ public const int QuickAdjustment = 404;
+ public const int ColorTemperature = 403;
public const int Retry = 402;
public const int QRCodeIsInvalid = 401;
public const int WellComBackHome = 400;
+ public const int FadeSpeed = 379;
+ public const int FadeTime = 378;
public const int WholeZone = 377;
public const int CannotEnterSpecialCharacters = 376;
public const int GatewayOfflineCannotCreateScene = 375;
@@ -155,7 +157,7 @@
public const int EditNickname = 237;
public const int NicknameCannotBeEmpty = 236;
public const int CreateScene = 235;
- public const int PermissionToUse = 234;
+ public const int MemberPermissionManagement = 234;
public const int Nickname = 233;
public const int MemberManagement = 232;
public const int OtherArea = 231;
@@ -521,7 +523,16 @@
public const int timeMode = 7068;
public const int logicnull = 7069;
public const int secnenull = 7070;
-
+ public const int setStartTime = 7071;
+ public const int setEndTime = 7072;
+ public const int unlikeTime = 7073;
+ public const int startTimeLessThanEndTime = 7074;
+ public const int conditioncNull = 7075;
+ public const int targetNull = 7076;
+ public const int timeNoSet = 7077;
+ public const int conditioncNullOrtargetNull = 7078;
+ public const int gatewayNotOnline = 7079;
+
@@ -723,7 +734,7 @@
/// </summary>
public const int LogWithAccountAndPassword = 9048;
/// <summary>
- /// 瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
+ /// 瀵嗙爜閿欒娆℃暟杩囧锛岃处鍙疯閿佸畾锛�
/// </summary>
public const int AccountLoginLock = 9049;
/// <summary>
@@ -750,8 +761,38 @@
/// 缁樺埗鎵嬪娍楠岃瘉
/// </summary>
public const int GestureVerification = 9055;
-
-
+ /// <summary>
+ /// 骞�
+ /// </summary>
+ public const int Years = 9056;
+ /// <summary>
+ /// 鏃犲尯鍩熷姛鑳�
+ /// </summary>
+ public const int NoAreaFunction = 9057;
+ /// <summary>
+ /// 鏄惁闇�瑕佷繚瀛�
+ /// </summary>
+ public const int IfNeedToSave = 9058;
+ /// <summary>
+ /// 鏆傛棤鍒嗕韩
+ /// </summary>
+ public const int NoShare = 9059;
+ /// <summary>
+ /// 浣跨敤鏉冮檺
+ /// </summary>
+ public const int PermissionToUse = 9060;
+ /// <summary>
+ /// 浣跨敤鏉冮檺
+ /// </summary>
+ public const int PleaseTryToForgetPassword = 9061;
+ /// <summary>
+ /// 鏌ョ湅
+ /// </summary>
+ public const int LookOver = 9062;
+ /// <summary>
+ /// 杩樻湁{0}娆℃満浼氥��
+ /// </summary>
+ public const int AFewMoreChances = 9063;
#region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
/// <summary>
--
Gitblit v1.8.0