From aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 21:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/Common/R.cs | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 0a834b8..c1448e6 100755
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -3,12 +3,12 @@
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;
@@ -155,7 +155,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 +521,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;
+
+
@@ -750,7 +759,26 @@
/// 缁樺埗鎵嬪娍楠岃瘉
/// </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;
#region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
--
Gitblit v1.8.0