From f5b46f80546aac860ade6e4c53821e43df833b39 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期三, 09 六月 2021 11:11:28 +0800
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/wxr4' into dev-tzy"
---
HDL_ON/Common/R.cs | 87 ++-----------------------------------------
1 files changed, 4 insertions(+), 83 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index be0041a..4004cad 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,73 +5,6 @@
public static class StringId
{
- /// <summary>
- /// 姣背娉紶鎰熷櫒
- /// </summary>
- public const int SenesorMillimeterWave = 471;
- /// <summary>
- /// 闃叉姢涓�
- /// </summary>
- public const int UnderProtection=470;
- /// <summary>
- /// 鏈変汉杩涘叆
- /// </summary>
- public const int SomeoneIn = 469;
- /// <summary>
- /// 鏈変汉璺屽��
- /// </summary>
- public const int SomeoneFell = 468;
- /// <summary>
- /// 鎶曞奖浠�
- /// </summary>
- public const int PJT = 467;
- /// <summary>
- /// 鏈洪《鐩�
- /// </summary>
- public const int STB = 466;
- /// <summary>
- /// 鍒犻櫎璁惧
- /// </summary>
- public const int DeleteDevice = 465;
- /// <summary>
- /// 鍙互寮�濮嬩娇鐢ㄦ渤涓滄绫虫尝浜�
- /// </summary>
- public const int CanStartUsingZhaoguanMillimeterWave = 464;
- /// <summary>
- /// 璇疯緭鍏n鐮�
- /// </summary>
- public const int PlsEntrySNCode = 463;
- /// <summary>
- /// 鎮ㄥ綋鍓嶈繕鏈坊鍔犱换浣曡澶�
- /// </summary>
- public const int NotAddedAnyDevices = 462;
- /// <summary>
- /// 瀹ゅ唴瀹ゅ
- /// </summary>
- public const int InOutdoor = 461;
- /// <summary>
- /// 鏈湀鑳借��
- /// </summary>
- public const int EnergyConsumptionOfThisMonth = 460;
- /// <summary>
- /// 瀹炴椂鑳借��
- /// </summary>
- public const int RealTimeEnergyConsumption=459;
- /// <summary>
- /// 鏃ユ湡
- /// </summary>
- public const int Date = 458;
- /// <summary>
- /// 鑳借��
- /// </summary>
- public const int EnergyConsumption = 457;
- /// <summary>
- /// 鐢诲竷
- /// </summary>
- public const int Canvas = 456;
- /// <summary>
- /// 鍚嶇О涓嶈兘涓虹┖
- /// </summary>
public const int NameCannotBeEmpty = 455;
/// <summary>
/// 甯冮槻淇℃伅
@@ -1317,20 +1250,10 @@
public const int xitongweihuzhong = 6078;
public const int huoqushujushibao = 6079;
public const int zanshibuzhichigaigongneng = 6080;
- public const int xuanzehongwaipinpai= 6081;
- public const int yaotou = 6082;
- public const int disu = 6083;
- public const int zhongsu = 6084;
- public const int gaosu = 6085;
- public const int zidong = 6086;
- public const int wendujia = 6087;
- public const int wendujian = 6088;
- public const int kongqijinghauqi = 6089;
- public const int reshuiqi = 6090;
- public const int bucunzaichanpin = 6091;
- public const int shebeibucunzai = 6092;
- public const int shebeibuzaixian = 6093;
- public const int wangguanshebeibuzaixian = 6094;
+
+
+
+
public const int newAutomation = 7000;
public const int editAutomation = 7001;
@@ -1466,8 +1389,6 @@
public const int apptuisong = 7131;
public const int zidontghua = 7132;
public const int yizhixing = 7133;
- public const int mubiaozhuangtai = 7134;
- public const int diedao = 7135;
#region LE鏂板
/// <summary>
--
Gitblit v1.8.0