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 | 119 ++---------------------------------------------------------
1 files changed, 4 insertions(+), 115 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 383268c..ab3559c 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,11 +4,6 @@
{
public static class StringId
{
- public const int RemoteControl = 435;
- public const int TimeSwitch = 434;
- public const int WaterValve = 433;
- public const int Use3tyBrandListTip = 432;
- public const int Not3tyBrandListTip = 431;
public const int MinuteUint = 430;
public const int HourUint = 429;
public const int AnionTime = 428;
@@ -627,115 +622,7 @@
/// <summary>
/// 鏄惁閲嶇疆婊ょ綉
/// </summary>
- public const int ResetFilterScreenMsg = 1049;
- /// <summary>
- /// 娣诲姞璁惧
- /// </summary>
- public const int AddDevice = 1050;
- /// <summary>
- /// mini鏅鸿兘閬ユ帶鍣�
- /// </summary>
- public const int MiniIntelligentRemoteControl = 1051;
- /// <summary>
- /// 娣诲姞绾㈠閬ユ帶
- /// </summary>
- public const int AddInfraredRemoteControl = 1052;
- /// <summary>
- /// 闀挎寜绾㈠閬ユ帶鍣ㄦ寜閽�10绉掞紝鎸囩ず鐏摑鑹插揩闂�
- /// </summary>
- public const int AddInfraredRemoteControlMsg1 = 1053;
- /// <summary>
- /// 璇风‘淇濇偍鐨勮摑鐗欏凡寮�鍚苟澶勪簬鍙互琚悳绱㈢姸鎬�
- /// </summary>
- public const int AddInfraredRemoteControlMsg2 = 1054;
- /// <summary>
- /// 涓嬩竴姝�
- /// </summary>
- public const int Next = 1055;
- /// <summary>
- /// 璁惧鎼滅储涓�...
- /// </summary>
- public const int SearchingDevice = 1056;
- /// <summary>
- /// 娌℃湁鍙戠幇绾㈠閬ユ帶鍣�
- /// </summary>
- public const int NoInfraredRemoteControlFound = 1057;
- /// <summary>
- /// 1銆佽妫�鏌ヨ澶囨槸鍚︽甯搁�氱數{0}2銆佽妫�鏌ヨ摑鐗欏姛鑳芥槸鍚︽甯稿紑鍚瘂0}3銆佽妫�鏌ユ寚绀虹伅鏄惁钃濊壊蹇棯鐘舵��
- /// </summary>
- public const int AddInfraredRemoteControlMsg3 = 1058;
- /// <summary>
- /// 閲嶆柊鎼滅储
- /// </summary>
- public const int ReSearch = 1059;
- /// <summary>
- /// 杩炴帴WiFi
- /// </summary>
- public const int ConnectWiFi = 1060;
- /// <summary>
- /// 鐩墠鍙敮鎸�2.4G WiFi缃戠粶{0}鏆備笉鏀寔甯︽湁涓枃瀛楃鐨刉iFi鍚嶇О
- /// </summary>
- public const int AddInfraredRemoteControlMsg4 = 1061;
- /// <summary>
- /// 瀵嗙爜
- /// </summary>
- public const int Password = 1062;
- /// <summary>
- /// 姝ｅ湪杩炴帴涓�...
- /// </summary>
- public const int NowConnectting = 1063;
- /// <summary>
- /// 璇疯绾㈠閬ユ帶灏介噺鎺ヨ繎WIFI璺敱鍣�
- /// </summary>
- public const int AddInfraredRemoteControlMsg5 = 1064;
- /// <summary>
- /// 缃戠粶閾炬帴涓�
- /// </summary>
- public const int InTheNetworkLink = 1065;
- /// <summary>
- /// 涓婁紶鍒颁簯
- /// </summary>
- public const int UploadToCloud = 1066;
- /// <summary>
- /// 杩炴帴鎴愬姛
- /// </summary>
- public const int ConnectSuccess = 1067;
- /// <summary>
- /// 1銆佽妫�鏌ヨ澶囨槸鍚︽甯搁�氱數{0}2銆佽寮�鍚摑鐗欏姛鑳絳0}3銆佸苟闀挎寜鎸夐挳10s锛屾寚绀虹伅甯镐寒
- /// </summary>
- public const int AddInfraredRemoteControlMsg6 = 1068;
- /// <summary>
- /// 娣诲姞澶辫触
- /// </summary>
- public const int AddFail = 1069;
- /// <summary>
- /// 娣诲姞鎴愬姛
- /// </summary>
- public const int AddSuccess = 1070;
- /// <summary>
- /// 鍙互寮�濮嬩娇鐢ㄧ孩澶栭仴鎺у姛鑳斤紒
- /// </summary>
- public const int AddInfraredRemoteControlMsg7 = 1071;
- /// <summary>
- /// 寮�濮嬩娇鐢�
- /// </summary>
- public const int StartUse = 1072;
- /// <summary>
- /// 璇锋墦寮�钃濈墮
- /// </summary>
- public const int PleaseTurnOnBluetooth = 1073;
- /// <summary>
- /// 浣嶇疆淇℃伅(GBS)涓嶅彲鐢�
- /// </summary>
- public const int GbsIsNotAvailable = 1074;
- /// <summary>
- /// 缃戠粶涓嶅彲鐢�
- /// </summary>
- public const int NetworkIsNotAvailable = 1075;
- /// <summary>
- /// 閫夋嫨绾㈠閬ユ帶鍣�
- /// </summary>
- public const int ChooseInfraredRemoteControl = 1076;
+ public const int ResetFilterScreenMsg = 1049;
@@ -861,7 +748,9 @@
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