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 | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
old mode 100644
new mode 100755
index 5ef50b0..c1448e6
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,15 @@
{
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 Retry = 402;
+ public const int QRCodeIsInvalid = 401;
+ public const int WellComBackHome = 400;
+ public const int WholeZone = 377;
public const int CannotEnterSpecialCharacters = 376;
public const int GatewayOfflineCannotCreateScene = 375;
public const int ResidenceDeletedSwitchToAnotherResidence = 374;
@@ -512,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;
+
+
--
Gitblit v1.8.0