From f2d122dc78c58925a05d770d716e7fefcbd784ef Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 11:09:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/Common/R.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
old mode 100644
new mode 100755
index 58cf187..be5edf2
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,11 @@
{
public static class StringId
{
+ public const int WholeZone = 377;
+ public const int Retry = 402;
+ public const int QRCodeIsInvalid = 401;
+ public const int WellComBackHome = 400;
+ public const int CannotEnterSpecialCharacters = 376;
public const int GatewayOfflineCannotCreateScene = 375;
public const int ResidenceDeletedSwitchToAnotherResidence = 374;
public const int AddFloorFail = 373;
@@ -509,7 +514,9 @@
public const int leaveMode = 7066;
public const int ordinaryMode = 7067;
public const int timeMode = 7068;
-
+ public const int logicnull = 7069;
+ public const int secnenull = 7070;
+
--
Gitblit v1.8.0