From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/R.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index c7cb925..1d3c336 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -379,7 +379,7 @@
public readonly static int Sunrisesunset = 5134;
public readonly static int cycle = 5135;
public readonly static int completeNext = 5136;
- public readonly static int Selectedtimetype = 5137;
+ public readonly static int Selectedtimetype= 5137;
public readonly static int Timecondition = 5138;
public readonly static int condition = 5139;
public readonly static int pushset = 5140;
@@ -591,6 +591,7 @@
public readonly static int application = 5376;
public readonly static int automationaddtext = 5377;
public readonly static int tiptextnull = 5378;
+ public readonly static int tiplocktextnull = 5379;
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -4727,7 +4728,7 @@
/// </summary>
public const int uSubmit = 15922;
/// <summary>
- /// 鎻愪氦鎴愬姛,鎰熻阿鎮ㄧ殑鎰忚
+ /// 鎮ㄧ殑鍙嶉宸叉垚鍔熸彁浜�
/// </summary>
public const int uSubmitSuccessMsg = 15923;
/// <summary>
@@ -5278,6 +5279,18 @@
/// 鍔炲叕瀹�
/// </summary>
public const int uWorkRoom = 16060;
+ /// <summary>
+ /// 鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+ /// </summary>
+ public const int uCurtainDataIsErrorPleaseResetCurtain = 16061;
+ /// <summary>
+ /// 鑾峰彇绌鸿皟鎽嗛鐘舵�佸け璐�
+ /// </summary>
+ public const int uGetAirConditionerSwingFunctionFail = 16062;
+ /// <summary>
+ /// 璁剧疆绌鸿皟鎽嗛澶辫触
+ /// </summary>
+ public const int uSetAirConditionerSwingFunctionFail = 16063;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
--
Gitblit v1.8.0