From f0f63edda354eaf18895f0b92ff6d308bd778176 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 07 十二月 2020 11:01:12 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/Common/R.cs | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index e02ec28..3a80665 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -479,7 +479,18 @@
public const int delAutomation = 7049;
public const int addSceneLogic = 7050;
public const int delayLogic = 7051;
-
+ public const int saveFail = 7052;
+ public const int delFail = 7053;
+ public const int stop= 7054;
+ public const int brightnesLogic= 7055;
+ public const int percentum = 7056;
+ public const int modeLogic = 7057;
+ public const int coolLogic= 7058;
+ public const int heatingLogic = 7059;
+ public const int autoLogic = 7060;
+ public const int dehumidifyLogic = 7061;
+
+
#region LE鏂板
/// <summary>
@@ -638,6 +649,34 @@
/// 甯歌闂
/// </summary>
public const int CommonQuestion = 9038;
+ /// <summary>
+ /// 鍒嗕韩涓庡姛鑳�
+ /// </summary>
+ public const int SharingAndFunctionality = 9039;
+ /// <summary>
+ /// 鎶ヨ绫�
+ /// </summary>
+ public const int AlarmType = 9040;
+ /// <summary>
+ /// 绯荤粺淇℃伅
+ /// </summary>
+ public const int SystemMessage = 9041;
+ /// <summary>
+ /// 淇℃伅涓績
+ /// </summary>
+ public const int MessageCenter = 9042;
+ /// <summary>
+ /// 璇ヨ处鍙峰凡鍦ㄥ叾瀹冭澶囩櫥褰曘��
+ /// </summary>
+ public const int LoggedOnOtherDevices = 9043;
+ /// <summary>
+ /// 涓婁紶鎴愬姛
+ /// </summary>
+ public const int UploadSuccessfully = 9044;
+ /// <summary>
+ /// 涓婁紶澶辫触
+ /// </summary>
+ public const int UploadFailed = 9045;
#region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
--
Gitblit v1.8.0