From e1ac4ab0e68024e6289e0b11756962d662749b04 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 17:15:23 +0800
Subject: [PATCH] Revert "Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC"
---
HDL_ON/Common/R.cs | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 7fcd492..ab3559c 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,7 +4,14 @@
{
public static class StringId
{
- public const int Lightint = 433;
+ public const int MinuteUint = 430;
+ public const int HourUint = 429;
+ public const int AnionTime = 428;
+ public const int DisinfectTime = 427;
+ public const int WindDryTime = 426;
+ public const int HotDryTime = 425;
+ public const int Time = 424;
+ public const int Lightint = 423;
public const int Disinfect = 422;
public const int WindDry = 421;
public const int HotDry = 420;
@@ -561,17 +568,17 @@
/// </summary>
public const int AutoClean = 1035;
/// <summary>
- /// 瀹氱偣娓呮壂
+ /// 闅忔満娓呮壂
/// </summary>
- public const int FixedPointClean = 1036;
+ public const int RandomClean = 1036;
/// <summary>
/// 娌垮娓呮壂
/// </summary>
public const int WallClean = 1037;
/// <summary>
- /// 鍖哄煙娓呮壂
+ /// 铻烘棆娓呮壂
/// </summary>
- public const int AreaClean = 1038;
+ public const int SpiralClean = 1038;
/// <summary>
/// 鎬绘竻娲侀潰绉�
/// </summary>
@@ -733,8 +740,17 @@
public const int shifouyouxiangying = 6063;
public const int kongzhishibai = 6064;
public const int kongzhichenggong = 6065;
-
-
+ public const int kaiguankai = 6066;
+ public const int moshizhileng = 6067;
+ public const int fengsuzhongfeng = 6068;
+ public const int wendu26 = 6069;
+ public const int shanchushebei = 6070;
+ public const int xiugaimingzi = 6071;
+ public const int querenshanchu = 6072;
+ public const int quxiao = 6073;
+ public const int bunengchaoguo10 = 6074;
+ public const int yaokongqiquyu = 6075;
+ public const int bianjixinxi = 6076;
--
Gitblit v1.8.0