From c008153a455b2c79ac9087d82bd9abf9f1eea19f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 11 八月 2021 18:03:14 +0800
Subject: [PATCH] 2021-08-11-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs | 2
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 54 +-
HDL_ON/Entity/Function/Function.cs | 10
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 2
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 8
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 4
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 8
HDL_ON/Common/R.cs | 917 +++++++++++++++++++++++++++++++++++++++++++++++++++++
8 files changed, 967 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 9464539..d7fe0f2 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -1238,312 +1238,1217 @@
/// </summary>
public const int TransferreSuccessMsg1 = 1167;
+ /// <summary>
+ /// 鍙瀵硅
+ /// </summary>
public const int keshiduijiang = 4000;
+ /// <summary>
+ /// 閫氳瘽璁板綍
+ /// </summary>
public const int tonghuajilu = 4001;
+ /// <summary>
+ /// *浜戠璁板綍鍙繚鐣�30澶�
+ /// </summary>
public const int baolu30 = 4002;
+ /// <summary>
+ /// 闂ㄥ彛鏈哄懠鍙�
+ /// </summary>
public const int menkoujihujiao = 4003;
+ /// <summary>
+ /// 宸叉帴鍚�
+ /// </summary>
public const int yijieting = 4004;
+ /// <summary>
+ /// 宸插紑閿�
+ /// </summary>
public const int yikaisuo = 4005;
+ /// <summary>
+ /// 骞�
+ /// </summary>
public const int nian = 4006;
+ /// <summary>
+ /// 鏉ヨ嚜
+ /// </summary>
public const int laizi = 4007;
+ /// <summary>
+ /// 鍛煎彨
+ /// </summary>
public const int hujiao = 4008;
+ /// <summary>
+ /// 鏈紑閿�
+ /// </summary>
public const int weikaisuo = 4009;
+ /// <summary>
+ /// 鏈帴鍚�
+ /// </summary>
public const int weijieting = 4010;
+ /// <summary>
+ /// 宸叉嫆缁�
+ /// </summary>
public const int yijujue = 4011;
+ /// <summary>
+ /// 閰嶇疆鍙傛暟鏈夊紓甯�!
+ /// </summary>
public const int peizhicanshuyouyichang = 4012;
+ /// <summary>
+ /// 闂ㄧ浜岀淮鐮�
+ /// </summary>
public const int menjinerweima = 4013;
+ /// <summary>
+ /// 涓存椂瀵嗙爜
+ /// </summary>
public const int linshimima = 4014;
+
+ /// <summary>
+ /// 闊充箰
+ /// </summary>
public const int a31Music = 5000;
+ /// <summary>
+ /// 缁勫悎
+ /// </summary>
public const int merge = 5001;
+ /// <summary>
+ /// 璁剧疆
+ /// </summary>
public const int set = 5002;
+ /// <summary>
+ /// 鍩虹淇℃伅
+ /// </summary>
public const int information = 5003;
+ /// <summary>
+ /// 鎾斁鍣ㄥ悕绉�
+ /// </summary>
public const int playerName = 5004;
+ /// <summary>
+ /// 钃濈墮鍚嶇О
+ /// </summary>
public const int bluetoothName = 5005;
+ /// <summary>
+ /// 鍖哄煙
+ /// </summary>
public const int region = 5006;
+ /// <summary>
+ /// 姝屽崟
+ /// </summary>
public const int playList = 5007;
+ /// <summary>
+ /// 鎴戠殑鏈�鐖�
+ /// </summary>
public const int myLove = 5008;
+ /// <summary>
+ /// 鎴戠殑鍒楄〃
+ /// </summary>
public const int myList = 5009;
+ /// <summary>
+ /// 閫夋嫨闊虫簮
+ /// </summary>
public const int selectedSource = 5010;
+ /// <summary>
+ /// 鏈湴闊充箰
+ /// </summary>
public const int localMusic = 5011;
+ /// <summary>
+ /// USB
+ /// </summary>
public const int usb = 5012;
+ /// <summary>
+ /// 鍦ㄧ嚎鐢靛彴
+ /// </summary>
public const int radio = 5013;
+ /// <summary>
+ /// QQ闊充箰
+ /// </summary>
public const int qqMusic = 5014;
+ /// <summary>
+ /// 钃濈墮
+ /// </summary>
public const int bluetooth = 5015;
+ /// <summary>
+ /// 绾胯矾杈撳叆
+ /// </summary>
public const int line = 5016;
+ /// <summary>
+ /// 淇敼鍚嶇О
+ /// </summary>
public const int modifyName = 5017;
+ /// <summary>
+ /// 鍗曟洸鎾斁
+ /// </summary>
public const int singleMode = 5018;
+ /// <summary>
+ /// 闅忔満鎾斁
+ /// </summary>
public const int randomMode = 5019;
+ /// <summary>
+ /// 鍒楄〃鎾斁
+ /// </summary>
public const int listMode = 5020;
+ /// <summary>
+ /// 宸插垏鎹㈠埌
+ /// </summary>
public const int switchTo = 5021;
+ /// <summary>
+ /// 鍙栨秷
+ /// </summary>
public const int cancelMusic = 5022;
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
public const int delMusic = 5023;
+ /// <summary>
+ /// 缂栬緫
+ /// </summary>
public const int editMusic = 5024;
+ /// <summary>
+ /// 鍒楄〃鍚嶇О鐩稿悓
+ /// </summary>
public const int listNamesSame = 5025;
+ /// <summary>
+ /// 鍒楄〃鍚嶄负绌�
+ /// </summary>
public const int listNameNull = 5026;
+ /// <summary>
+ /// 璇疯緭鍏ュ垪琛ㄥ悕
+ /// </summary>
public const int listNameInput = 5027;
+ /// <summary>
+ /// 娣诲姞鏂扮殑鍒楄〃
+ /// </summary>
public const int addNewList = 5028;
+ /// <summary>
+ /// 鎻愮ず
+ /// </summary>
public const int tip = 5029;
+ /// <summary>
+ /// 鏄惁纭鍒犻櫎鏂囦欢澶�
+ /// </summary>
public const int delMusicFile = 5030;
+ /// <summary>
+ /// 纭
+ /// </summary>
public const int confirmMusic = 5031;
+ /// <summary>
+ /// 鍚嶇О涓虹┖
+ /// </summary>
public const int nameNull = 5032;
+ /// <summary>
+ /// 宸叉坊鍔犲埌姝屽崟
+ /// </summary>
public const int addMusicList = 5033;
+ /// <summary>
+ /// 鐢靛彴
+ /// </summary>
public const int radioLove = 5034;
+ /// <summary>
+ /// 閫夋嫨缁勫悎
+ /// </summary>
public const int selectedMergence = 5035;
+ /// <summary>
+ /// 闇�瑕佹挱鏀�
+ /// </summary>
public const int readyPlay = 5036;
+ /// <summary>
+ /// 鑷冲皯閫変腑涓や釜浠ヤ笂鎾斁鍣�
+ /// </summary>
public const int selectAtLeastTwoPlayers = 5037;
+ /// <summary>
+ /// 涓嶈兘閫変腑涓や釜鎴栦袱涓互涓婁富鎾斁鍣ㄨ繘琛岀粍鍚�
+ /// </summary>
public const int cannotSelectTwoOrMoreMainPlayersToCombine = 5038;
+ /// <summary>
+ /// 杩樻病閫変腑鎾斁鍣�
+ /// </summary>
public const int noSelectedPlay = 5039;
+ /// <summary>
+ /// 閫変腑瑙ｉ櫎鎾斁鍣�
+ /// </summary>
public const int checkTheReleasePlayer = 5040;
+ /// <summary>
+ /// 杩樻病鏈夐�夋嫨瑙ｉ櫎缁勬挱鏀惧櫒
+ /// </summary>
public const int noCheckTheReleasePlayer = 5041;
+ /// <summary>
+ /// 閰嶇疆涓�...
+ /// </summary>
public const int inConfiguration = 5042;
+ /// <summary>
+ /// 瑙ｉ櫎涓�...
+ /// </summary>
public const int lifting = 5043;
+ /// <summary>
+ /// 闊抽噺
+ /// </summary>
public const int volumeMusic = 5044;
+ /// <summary>
+ /// 鎬婚煶閲�
+ /// </summary>
public const int totalVolume = 5045;
+ /// <summary>
+ /// 璋冭妭闊抽噺
+ /// </summary>
public const int volumeAdjustment = 5046;
+ /// <summary>
+ /// 浣犳墜鏈烘殏鏈畨瑁�"QQ闊充箰"{\r\n}璇峰墠寰�鎵嬫満鍟嗗満瀹夎
+ /// </summary>
public const int qqMsuicTip = 5047;
-
+ /// <summary>
+ /// 姝ｅ父
+ /// </summary>
public const int zhengchang = 6000;
+ /// <summary>
+ /// 璁惧鐘舵��
+ /// </summary>
public const int shebeizhuangtai = 6001;
+ /// <summary>
+ /// 涓�
+ /// </summary>
public const int ge = 6002;
+ /// <summary>
+ /// 褰撳墠绾㈠閬ユ帶璁惧
+ /// </summary>
public const int dangqianhongwaishebei = 6003;
+ /// <summary>
+ /// 宸叉坊鍔犻仴鎺у櫒
+ /// </summary>
public const int yitianjiayaokongqi = 6004;
+ /// <summary>
+ /// 绌鸿皟
+ /// </summary>
public const int kongtiao = 6005;
+ /// <summary>
+ /// 鐢佃
+ /// </summary>
public const int dianshi = 6006;
+ /// <summary>
+ /// 椋庢墖
+ /// </summary>
public const int fengshan = 6007;
+ /// <summary>
+ /// 鏈洪《鐩�
+ /// </summary>
public const int jidinghe = 6008;
+ /// <summary>
+ /// DVD
+ /// </summary>
public const int dvd = 6009;
+ /// <summary>
+ /// 鎶曞奖浠�
+ /// </summary>
public const int touyingyi = 6010;
+ /// <summary>
+ /// 鑷畾涔�
+ /// </summary>
public const int zidingyi = 6011;
+ /// <summary>
+ /// 绾㈠閬ユ帶
+ /// </summary>
public const int hongwaiyaokong = 6012;
+ /// <summary>
+ /// 璁惧绠＄悊
+ /// </summary>
public const int shebeigaunli = 6013;
+ /// <summary>
+ /// 娣诲姞閬ユ帶鍣�
+ /// </summary>
public const int tianjiayaokongqi = 6014;
+ /// <summary>
+ /// 鍦ㄧ嚎
+ /// </summary>
public const int zaixianhwb= 6015;
+ /// <summary>
+ /// 绂荤嚎
+ /// </summary>
public const int lixian = 6016;
+ /// <summary>
+ /// 鐗堟湰鍙�
+ /// </summary>
public const int banbenhao = 6017;
+ /// <summary>
+ /// 璇疯緭鍏ラ仴鎺у櫒鍚嶇О
+ /// </summary>
public const int shuruyaokongqimingcheng = 6018;
+ /// <summary>
+ /// 绀猴細閬ユ帶鍣ㄥ垱寤哄悗鍙湪鍔熻兘-鐢靛櫒鍒嗙被{\r\n}鏌ユ壘浣跨敤
+ /// </summary>
public const int fengleichazhao = 6019;
+ /// <summary>
+ /// 鎺ㄨ崘鎸夐敭
+ /// </summary>
public const int tuijiananjian = 6020;
+ /// <summary>
+ /// 璇疯緭鍏ユ寜閿悕绉�
+ /// </summary>
public const int anjianmingcheng = 6021;
+ /// <summary>
+ /// 涓嬩竴姝�
+ /// </summary>
public const int xiayibu= 6022;
+ /// <summary>
+ /// 鐢垫簮
+ /// </summary>
public const int dianyuan = 6023;
+ /// <summary>
+ /// 闊抽噺+
+ /// </summary>
public const int yinliangjia = 6024;
+ /// <summary>
+ /// 闊抽噺-
+ /// </summary>
public const int yinliangjian = 6025;
+ /// <summary>
+ /// 棰戦亾+
+ /// </summary>
public const int pindaojia = 6026;
+ /// <summary>
+ /// 棰戦亾-
+ /// </summary>
public const int pindaojian = 6027;
+ /// <summary>
+ /// 涓�
+ /// </summary>
public const int shang = 6028;
+ /// <summary>
+ /// 涓�
+ /// </summary>
public const int xia = 6029;
+ /// <summary>
+ /// 宸�
+ /// </summary>
public const int zuo = 6030;
+ /// <summary>
+ /// 鍙�
+ /// </summary>
public const int you = 6031;
+ /// <summary>
+ /// 闈欓煶
+ /// </summary>
public const int jingyin = 6032;
+ /// <summary>
+ /// 纭
+ /// </summary>
public const int queren = 6034;
+ /// <summary>
+ /// 鎾斁
+ /// </summary>
public const int bofang = 6035;
+ /// <summary>
+ /// 閫�鍑�
+ /// </summary>
public const int tuichu = 6037;
+ /// <summary>
+ /// 鑿滃崟
+ /// </summary>
public const int caidan = 6038;
+ /// <summary>
+ /// 鏆傚仠
+ /// </summary>
public const int zanting = 6039;
+ /// <summary>
+ /// 杩斿洖
+ /// </summary>
public const int fanhui = 6040;
+ /// <summary>
+ /// 鍋滄
+ /// </summary>
public const int tingzhi = 6041;
+ /// <summary>
+ /// 涓婚〉
+ /// </summary>
public const int zhuye = 6042;
+ /// <summary>
+ /// 蹇繘
+ /// </summary>
public const int kuaijin = 6043;
+ /// <summary>
+ /// 蹇��
+ /// </summary>
public const int kuaitui = 6044;
+ /// <summary>
+ /// 瀹氭椂
+ /// </summary>
public const int dingshi = 6045;
+ /// <summary>
+ /// 澶嶅埗閬ユ帶鍔熻兘
+ /// </summary>
public const int fuzhiyaokonggongnneg = 6046;
+ /// <summary>
+ /// 瀵瑰噯閬ユ帶鍣ㄤ腑蹇冩寜涓嬬浉鍚屾寜閿�
+ /// </summary>
public const int duizhunanxiaanniu = 6047;
+ /// <summary>
+ /// 鏅鸿兘閬ユ帶鍣�
+ /// </summary>
public const int zhinengyaokongqi = 6048;
+ /// <summary>
+ /// 娣诲姞鎸夐敭
+ /// </summary>
public const int tianjiaanniu = 6049;
+ /// <summary>
+ /// *闀挎寜鍙繘琛岃嚜瀹氫箟鎺掑簭
+ /// </summary>
public const int paixu = 6050;
+ /// <summary>
+ /// 瀹屾垚
+ /// </summary>
public const int wancheng = 6051;
+ /// <summary>
+ /// 娣诲姞鎴愬姛
+ /// </summary>
public const int tianjiachenggong = 6052;
+ /// <summary>
+ /// 鍙埌鍒嗙被-鍔熻兘-鐢靛櫒鎿嶄綔浣跨敤
+ /// </summary>
public const int kedaofenlei = 6053;
+ /// <summary>
+ /// 鎵�灞炲垎绫�
+ /// </summary>
public const int suoshufenlei = 6054;
+ /// <summary>
+ /// 閬ユ帶鍣ㄥ悕绉�
+ /// </summary>
public const int yaokongqimingcheng = 6055;
+ /// <summary>
+ /// 鎵�灞炲尯鍩�
+ /// </summary>
public const int suoshuquyu = 6056;
+ /// <summary>
+ /// 缁х画娣诲姞
+ /// </summary>
public const int jixutianjia = 6057;
+ /// <summary>
+ /// 鐢靛櫒
+ /// </summary>
public const int dianqi = 6058;
+ /// <summary>
+ /// 娣诲姞澶辫触
+ /// </summary>
public const int tianjiashibai = 6059;
+ /// <summary>
+ /// 閲嶈瘯
+ /// </summary>
public const int chongshii = 6060;
+ /// <summary>
+ /// 鍖归厤閬ユ帶鍣�
+ /// </summary>
public const int pipeiyaokongqi = 6061;
+ /// <summary>
+ /// 璇风偣鍑讳互涓嬫寜閽�
+ /// </summary>
public const int dianjianniu = 6062;
+ /// <summary>
+ /// 纭璁惧鏄惁鏈夊搷搴�
+ /// </summary>
public const int shifouyouxiangying = 6063;
+ /// <summary>
+ /// 鎺у埗澶辫触
+ /// </summary>
public const int kongzhishibai = 6064;
+ /// <summary>
+ /// 鎺у埗鎴愬姛
+ /// </summary>
public const int kongzhichenggong = 6065;
- public const int kaiguankai = 6066;
- public const int moshizhileng = 6067;
- public const int fengsuzhongfeng = 6068;
+ /// <summary>
+ /// 鐢垫簮寮�
+ /// </summary>
+ public const int kaiguankai = 6066;
+ /// <summary>
+ /// 妯″紡鍒跺喎
+ /// </summary>
+ public const int moshizhileng = 6067;
+ /// <summary>
+ /// 椋庨�熶腑椋�
+ /// </summary>
+ public const int fengsuzhongfeng = 6068;
+ /// <summary>
+ /// 娓╁害26鈩�
+ /// </summary>
public const int wendu26 = 6069;
+ /// <summary>
+ /// 鍒犻櫎璁惧
+ /// </summary>
public const int shanchushebei = 6070;
+ /// <summary>
+ /// 淇敼鍚嶅瓧
+ /// </summary>
public const int xiugaimingzi = 6071;
+ /// <summary>
+ /// 纭鍒犻櫎
+ /// </summary>
public const int querenshanchu = 6072;
+ /// <summary>
+ /// 鍙栨秷
+ /// </summary>
public const int quxiao = 6073;
+ /// <summary>
+ /// 閬ユ帶鍣ㄤ笉鑳借秴杩�10涓�
+ /// </summary>
public const int bunengchaoguo10 = 6074;
+ /// <summary>
+ /// 閬ユ帶鍣ㄦ墍灞炲尯鍩�
+ /// </summary>
public const int yaokongqiquyu = 6075;
+ /// <summary>
+ /// 缂栬緫淇℃伅
+ /// </summary>
public const int bianjixinxi = 6076;
+ /// <summary>
+ /// 鐗堟湰鍗囩骇
+ /// </summary>
public const int banbenshengji = 6077;
+ /// <summary>
+ /// 绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘
+ /// </summary>
public const int xitongweihuzhong = 6078;
+ /// <summary>
+ /// 鑾峰彇鏁版嵁澶辫触
+ /// </summary>
public const int huoqushujushibao = 6079;
+ /// <summary>
+ /// 鏆傛椂涓嶆敮鎸佽鍔熻兘
+ /// </summary>
public const int zanshibuzhichigaigongneng = 6080;
+ /// <summary>
+ /// 閫夋嫨绾㈠鍝佺墝
+ /// </summary>
public const int xuanzehongwaipinpai= 6081;
+ /// <summary>
+ /// 鎽囧ご
+ /// </summary>
public const int yaotou = 6082;
+ /// <summary>
+ /// 浣庨��
+ /// </summary>
public const int disu = 6083;
- public const int fengsuqiehuan = 6084;
+ /// <summary>
+ /// 椋庨�熷垏鎹�
+ /// </summary>
+ public const int fengsuqiehuan = 6084;
+ /// <summary>
+ /// 楂橀��
+ /// </summary>
public const int gaosu = 6085;
+ /// <summary>
+ /// 鑷姩
+ /// </summary>
public const int zidong = 6086;
+ /// <summary>
+ /// 娓╁害+
+ /// </summary>
public const int wendujia = 6087;
+ /// <summary>
+ /// 娓╁害-
+ /// </summary>
public const int wendujian = 6088;
+ /// <summary>
+ /// 绌烘皵鍑�鍖栧櫒
+ /// </summary>
public const int kongqijinghauqi = 6089;
+ /// <summary>
+ /// 鐑按鍣�
+ /// </summary>
public const int reshuiqi = 6090;
+ /// <summary>
+ /// 涓嶅瓨鍦ㄧ殑浜у搧
+ /// </summary>
public const int bucunzaichanpin = 6091;
+ /// <summary>
+ /// 璁惧涓嶅瓨鍦�
+ /// </summary>
public const int shebeibucunzai = 6092;
+ /// <summary>
+ /// 璁惧涓嶅湪绾�
+ /// </summary>
public const int shebeibuzaixian = 6093;
+ /// <summary>
+ /// 缃戝叧璁惧涓嶅瓨鍦�
+ /// </summary>
public const int wangguanshebeibuzaixian = 6094;
+ /// <summary>
+ /// 娣诲姞鎸夐挳瓒呭嚭30涓�
+ /// </summary>
public const int anniuchaochu30 = 6095;
-
+ /// <summary>
+ /// 鏂板缓鑷姩鍖�
+ /// </summary>
public const int newAutomation = 7000;
+ /// <summary>
+ /// 缂栬緫鑷姩鍖�
+ /// </summary>
public const int editAutomation = 7001;
+ /// <summary>
+ /// 濡傛灉
+ /// </summary>
public const int ifCondition = 7002;
+ /// <summary>
+ /// 鍚屾椂婊¤冻浠ヤ笅鏉′欢鏃�
+ /// </summary>
public const int andCondition = 7003;
+ /// <summary>
+ /// 浠讳竴婊¤冻浠ヤ笅鏉′欢鏃�
+ /// </summary>
public const int orCondition = 7004;
+ /// <summary>
+ /// 灏辨墽琛�
+ /// </summary>
public const int isExecuted = 7005;
+ /// <summary>
+ /// 浠ヤ笅鍔ㄤ綔
+ /// </summary>
public const int theFollowingActions = 7006;
+ /// <summary>
+ /// 寰幆鏂瑰紡
+ /// </summary>
public const int cyclic = 7007;
+ /// <summary>
+ /// 鎵ц涓�娆�
+ /// </summary>
public const int performA = 7008;
+ /// <summary>
+ /// 姣忓ぉ
+ /// </summary>
public const int days = 7009;
+ /// <summary>
+ /// 姣忓懆
+ /// </summary>
public const int weekly = 7010;
+ /// <summary>
+ /// 姣忔湀
+ /// </summary>
public const int monthly = 7011;
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
public const int save = 7012;
+ /// <summary>
+ /// 鎵ц鎺ㄩ��
+ /// </summary>
public const int push = 7013;
+ /// <summary>
+ /// 鍙戦�侀�氱煡
+ /// </summary>
public const int notification = 7014;
+ /// <summary>
+ /// 閫夋嫨鏉′欢
+ /// </summary>
public const int selectionCondition = 7015;
+ /// <summary>
+ /// 鏃堕棿
+ /// </summary>
public const int time = 7016;
+ /// <summary>
+ /// 閫夋嫨鏃堕棿鏉′欢
+ /// </summary>
public const int selectionTimeCondition = 7017;
+ /// <summary>
+ /// 鏃跺埢
+ /// </summary>
public const int hour = 7018;
+ /// <summary>
+ /// 鏃堕棿鑼冨洿
+ /// </summary>
public const int timeHorizon = 7019;
+ /// <summary>
+ /// 鏃�
+ /// </summary>
public const int h = 7020;
+ /// <summary>
+ /// 鍒�
+ /// </summary>
public const int m = 7021;
+ /// <summary>
+ /// 绉�
+ /// </summary>
public const int s = 7022;
+ /// <summary>
+ /// 鍙栨秷
+ /// </summary>
public const int cancelSelected = 7023;
+ /// <summary>
+ /// 纭畾
+ /// </summary>
public const int confirmSelected = 7024;
+ /// <summary>
+ /// *鍦ㄦ偍鎵�璁剧疆鐨勬椂闂存鍐呭繀瀹氫細鎵ц涓�娆℃偍鎵�璁剧疆鐨勮嚜鍔ㄥ寲
+ /// </summary>
public const int timeTipText = 7025;
+ /// <summary>
+ /// 寮�濮嬫椂闂�
+ /// </summary>
public const int startTime = 7026;
+ /// <summary>
+ /// 缁撴潫鏃堕棿
+ /// </summary>
public const int endTime = 7027;
+ /// <summary>
+ /// 鍔熻兘
+ /// </summary>
public const int funLogic = 7028;
+ /// <summary>
+ /// 閫変腑鍔熻兘鏉′欢
+ /// </summary>
public const int selectedFunCondition = 7029;
+ /// <summary>
+ /// 鍏ㄩ儴鍖哄煙
+ /// </summary>
public const int allAreas = 7030;
+ /// <summary>
+ /// 鍏ㄩ儴鍔熻兘
+ /// </summary>
public const int allFun = 7031;
+ /// <summary>
+ /// 寮�
+ /// </summary>
public const int onLogic = 7032;
+ /// <summary>
+ /// 鍏�
+ /// </summary>
public const int offLogic = 7033;
+ /// <summary>
+ /// 寮�鍏�
+ /// </summary>
public const int switchLogic = 7034;
+ /// <summary>
+ /// 瀹屾垚
+ /// </summary>
public const int completeLogic = 7035;
+ /// <summary>
+ /// 娣诲姞鎵ц鍔ㄤ綔
+ /// </summary>
public const int addtarget = 7036;
+ /// <summary>
+ /// 鍛ㄤ竴
+ /// </summary>
public const int monday = 7037;
+ /// <summary>
+ /// 鍛ㄤ簩
+ /// </summary>
public const int tuesday = 7038;
+ /// <summary>
+ /// 鍛ㄤ笁
+ /// </summary>
public const int wednesday = 7039;
+ /// <summary>
+ /// 鍛ㄥ洓
+ /// </summary>
public const int thursday = 7040;
+ /// <summary>
+ /// 鍛ㄤ簲
+ /// </summary>
public const int friday = 7041;
+ /// <summary>
+ /// 鍛ㄥ叚
+ /// </summary>
public const int saturday = 7042;
+ /// <summary>
+ /// 鍛ㄦ棩
+ /// </summary>
public const int sunday = 7043;
+ /// <summary>
+ /// 婊¤冻鏉′欢
+ /// </summary>
public const int meetTheCondition = 7044;
+ /// <summary>
+ /// 璁剧疆
+ /// </summary>
public const int setlogic = 7045;
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
public const int namelogic = 7046;
+ /// <summary>
+ /// 淇敼鍚嶇О
+ /// </summary>
public const int editName = 7047;
+ /// <summary>
+ /// 鍚嶇О宸插瓨鍦�
+ /// </summary>
public const int NameAlreadyExists = 7048;
+ /// <summary>
+ /// 鏄惁瑕佸垹闄よ嚜鍔ㄥ寲锛�
+ /// </summary>
public const int delAutomation = 7049;
+ /// <summary>
+ /// 娣诲姞鍦烘櫙
+ /// </summary>
public const int addSceneLogic = 7050;
+ /// <summary>
+ /// 寤舵椂
+ /// </summary>
public const int delayLogic = 7051;
+ /// <summary>
+ /// 淇濆瓨澶辫触锛岃閲嶈瘯
+ /// </summary>
public const int saveFail = 7052;
+ /// <summary>
+ /// 鍒犻櫎澶辫触锛岃閲嶈瘯
+ /// </summary>
public const int delFail = 7053;
+ /// <summary>
+ /// 鏆傚仠
+ /// </summary>
public const int stop= 7054;
+ /// <summary>
+ /// 浜害
+ /// </summary>
public const int brightnesLogic= 7055;
+ /// <summary>
+ /// 鐧惧垎姣�
+ /// </summary>
public const int percentum = 7056;
+ /// <summary>
+ /// 妯″紡
+ /// </summary>
public const int modeLogic = 7057;
+ /// <summary>
+ /// 鍒跺喎
+ /// </summary>
public const int coolLogic= 7058;
+ /// <summary>
+ /// 鍒剁儹
+ /// </summary>
public const int heatingLogic = 7059;
+ /// <summary>
+ /// 鑷姩
+ /// </summary>
public const int autoLogic = 7060;
+ /// <summary>
+ /// 闄ゆ箍
+ /// </summary>
public const int dehumidifyLogic = 7061;
+ /// <summary>
+ /// 娓╁害
+ /// </summary>
public const int temperatureLogic = 7062;
+ /// <summary>
+ /// 椋庨��
+ /// </summary>
public const int speedLogic = 7063;
+ /// <summary>
+ /// 鐧藉ぉ
+ /// </summary>
public const int dayMode = 7064;
+ /// <summary>
+ /// 澶滄櫄
+ /// </summary>
public const int nightMode = 7065;
+ /// <summary>
+ /// 绂诲紑
+ /// </summary>
public const int leaveMode = 7066;
+ /// <summary>
+ /// 涓�鑸�
+ /// </summary>
public const int ordinaryMode = 7067;
+ /// <summary>
+ /// 鏃堕棿
+ /// </summary>
public const int timeMode = 7068;
+ /// <summary>
+ /// 鏆傛湭璁剧疆鑷姩鍖栵紝璇峰墠寰�璁剧疆锛�
+ /// </summary>
public const int logicnull = 7069;
+ /// <summary>
+ /// 姝ゅ绌虹┖濡備篃~
+ /// </summary>
public const int secnenull = 7070;
+ /// <summary>
+ /// 寮�濮嬫椂闂存湭璁剧疆锛岃璁剧疆寮�濮嬫椂闂淬��
+ /// </summary>
public const int setStartTime = 7071;
+ /// <summary>
+ /// 缁撴潫鏃堕棿鏈缃紝璇疯缃粨鏉熸椂闂淬��
+ /// </summary>
public const int setEndTime = 7072;
+ /// <summary>
+ /// 寮�濮嬫椂闂村拰缁撴潫鏃堕棿涓嶈兘涓�鏍枫��
+ /// </summary>
public const int unlikeTime = 7073;
+ /// <summary>
+ /// 寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂淬��
+ /// </summary>
public const int startTimeLessThanEndTime = 7074;
+ /// <summary>
+ /// 鏉′欢涓嶈兘涓虹┖銆�
+ /// </summary>
public const int conditioncNull = 7075;
+ /// <summary>
+ /// 鐩爣涓嶈兘涓虹┖銆�
+ /// </summary>
public const int targetNull = 7076;
+ /// <summary>
+ /// 鏃堕棿鏈缃紝璇疯缃椂闂淬��
+ /// </summary>
public const int timeNoSet = 7077;
+ /// <summary>
+ /// 鏉′欢鎴栬�呯洰鏍囦负绌恒��
+ /// </summary>
public const int conditioncNullOrtargetNull = 7078;
+ /// <summary>
+ /// 缃戝叧涓嶅湪绾�
+ /// </summary>
public const int gatewayNotOnline = 7079;
+ /// <summary>
+ /// 鏃ュ嚭/鏃ヨ惤/姝ｅ崍
+ /// </summary>
public const int timespecia = 7080;
+ /// <summary>
+ /// 鏃ュ嚭
+ /// </summary>
public const int sunrise = 7081;
+ /// <summary>
+ /// 鏃ヨ惤
+ /// </summary>
public const int sunset = 7082;
+ /// <summary>
+ /// 姝ｅ崍
+ /// </summary>
public const int at = 7083;
+ /// <summary>
+ /// 姝ｇ偣
+ /// </summary>
public const int punctually = 7084;
+ /// <summary>
+ /// 鎻愬墠
+ /// </summary>
public const int advanced = 7085;
+ /// <summary>
+ /// 鍒嗛挓
+ /// </summary>
public const int minute = 7086;
+ /// <summary>
+ /// 瀹ゅ鍙樺寲
+ /// </summary>
public const int shiwaibainhua=7087;
+ /// <summary>
+ /// 閫夋嫨瀹ゅ鍙樺寲鏉′欢
+ /// </summary>
public const int xuanzeshiwaibianhuatiaojian = 7088;
+ /// <summary>
+ /// 瀹ゅ娓┿�佹箍搴︺�丳M2.5鍙樺寲
+ /// </summary>
public const int shuwaigongneng = 7089;
+ /// <summary>
+ /// 澶╂皵鍙樺寲(鍩庡競澶╂皵)
+ /// </summary>
public const int tianqibianhua = 7090;
+ /// <summary>
+ /// 瀹ゅ鐜鍙樺寲
+ /// </summary>
public const int shiwaihuanjingbianhua = 7091;
+ /// <summary>
+ /// 娓╁害楂樹簬
+ /// </summary>
public const int wendugaoyu = 7092;
+ /// <summary>
+ /// 娓╁害浣庝簬
+ /// </summary>
public const int wendudiyu = 7093;
+ /// <summary>
+ /// 婀垮害楂樹簬
+ /// </summary>
public const int shidugaoyu = 7094;
+ /// <summary>
+ /// 婀垮害浣庝簬
+ /// </summary>
public const int shidudiyu = 7095;
+ /// <summary>
+ /// PM2.5楂樹簬
+ /// </summary>
public const int pmgaoyu = 7096;
+ /// <summary>
+ /// PM2.5浣庝簬
+ /// </summary>
public const int pmdiyu = 7097;
+ /// <summary>
+ /// 鏅村ぉ
+ /// </summary>
public const int clearday =7098;
+ /// <summary>
+ /// 澶氫簯
+ /// </summary>
public const int cloudy= 7099;
+ /// <summary>
+ /// 涓嬮洦
+ /// </summary>
public const int rain = 7100;
+ /// <summary>
+ /// *璇峰湪杩欎釜鑼冨洿(1~100)璁剧疆鍊笺��
+ /// </summary>
public const int setvalue = 7101;
+ /// <summary>
+ /// 杩樻病鏈夎缃�笺��
+ /// </summary>
public const int nullvalue = 7102;
+ /// <summary>
+ /// 浼�:0~35ug/m鲁
+ /// </summary>
public const int pmyou = 7103;
+ /// <summary>
+ /// 鑹�:35~75ug/m鲁
+ /// </summary>
public const int pmliang = 7104;
+ /// <summary>
+ /// 杞诲害姹℃煋:75~115ug/m鲁
+ /// </summary>
public const int pmqingdu= 7105;
+ /// <summary>
+ /// 涓害姹℃煋:115~150ug/m鲁
+ /// </summary>
public const int pmzhongdu = 7106;
+ /// <summary>
+ /// 閲嶅害姹℃煋:>150ug/m鲁
+ /// </summary>
public const int pmzhongduwuran= 7107;
+ /// <summary>
+ /// 娉勬紡/鏃犳硠婕�
+ /// </summary>
public const int xieluoandwuxieluo=7108;
+ /// <summary>
+ /// 娉勬紡
+ /// </summary>
public const int xieluo = 7109;
+ /// <summary>
+ /// 鏃犳硠婕�
+ /// </summary>
public const int wuxieluo = 7110;
+ /// <summary>
+ /// 婕忔按/鏃犳紡姘�
+ /// </summary>
public const int luoshuiandwuluoshui = 7111;
+ /// <summary>
+ /// 婕忔按
+ /// </summary>
public const int luoshui = 7112;
+ /// <summary>
+ /// 鏃犳紡姘�
+ /// </summary>
public const int wuluoshui = 7113;
+ /// <summary>
+ /// 鏈変汉/鏃犱汉
+ /// </summary>
public const int yourenandwuren = 7114;
+ /// <summary>
+ /// 鏈変汉
+ /// </summary>
public const int youren = 7115;
+ /// <summary>
+ /// 鏃犱汉
+ /// </summary>
public const int wuren = 7116;
+ /// <summary>
+ /// 寮�鍚�/闂悎
+ /// </summary>
public const int kaiqiandbihe = 7117;
+ /// <summary>
+ /// 寮�鍚�
+ /// </summary>
public const int kaiqi = 7118;
+ /// <summary>
+ /// 闂悎
+ /// </summary>
public const int bihe = 7119;
+ /// <summary>
+ /// 闃叉媶鍔熻兘
+ /// </summary>
public const int fangchaigongneng = 7120;
+ /// <summary>
+ /// 鍦ㄧ嚎
+ /// </summary>
public const int zaixian = 7121;
+ /// <summary>
+ /// 涓嶅湪绾�
+ /// </summary>
public const int buzaixian = 7122;
+ /// <summary>
+ /// 绌烘皵璐ㄩ噺
+ /// </summary>
public const int kongqizhiliang = 7123;
+ /// <summary>
+ /// 浼�
+ /// </summary>
public const int kongqiyou= 7124;
+ /// <summary>
+ /// 鑹�
+ /// </summary>
public const int kongqiliang = 7125;
+ /// <summary>
+ /// 宸�
+ /// </summary>
public const int kongqicha = 7126;
+ /// <summary>
+ /// 鍙戦�侀�氱煡
+ /// </summary>
public const int fasongtongzhi = 7127;
+ /// <summary>
+ /// 閫氱煡鍐呭
+ /// </summary>
public const int tongzhineirong = 7128;
+ /// <summary>
+ /// (100瀛楀唴)
+ /// </summary>
public const int xianzhichangdu = 7129;
+ /// <summary>
+ /// 璐﹀彿閫夋嫨
+ /// </summary>
public const int zhanghaoxuanze = 7130;
+ /// <summary>
+ /// App鎺ㄩ��
+ /// </summary>
public const int apptuisong = 7131;
+ /// <summary>
+ /// 鑷姩鍖�
+ /// </summary>
public const int zidontghua = 7132;
+ /// <summary>
+ /// 宸叉墽琛�
+ /// </summary>
public const int yizhixing = 7133;
+ /// <summary>
+ /// 鐩爣鐘舵��
+ /// </summary>
public const int mubiaozhuangtai = 7134;
+ /// <summary>
+ /// 璺屽��
+ /// </summary>
public const int diedao = 7135;
+ /// <summary>
+ /// 娓╁害
+ /// </summary>
public const int wendu = 7136;
+ /// <summary>
+ /// 婀垮害
+ /// </summary>
public const int shidu = 7137;
+ /// <summary>
+ /// PM2.5
+ /// </summary>
public const int pm25 = 7138;
+ /// <summary>
+ /// CO2
+ /// </summary>
public const int co2 = 7139;
+ /// <summary>
+ /// TVOC
+ /// </summary>
public const int tvoc = 7140;
+ /// <summary>
+ /// 瓒呮爣
+ /// </summary>
public const int chaobiao = 7141;
+ /// <summary>
+ /// 涓ラ噸
+ /// </summary>
public const int yanzhong = 7142;
+ /// <summary>
+ /// 鍋忛珮
+ /// </summary>
public const int piangao = 7143;
+ /// <summary>
+ /// 浼樼
+ /// </summary>
public const int youxiu = 7144;
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index b9e3102..b99f909 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -917,7 +917,7 @@
/// </summary>
public const string FilterRemain = "filter_remain";
/// <summary>
- /// 杩囨护缃戞槸鍚﹁秴鏃惰鍛�
+ /// 杩囨护缃戞槸鍚﹁秴鏃惰鍛�
/// </summary>
public const string FilterTimeout = "filter_timeout";
@@ -1266,6 +1266,14 @@
/// 璇pk鍔熻兘鏄幆澧冧紶鎰熷櫒鍔熻兘鐨勯泦鎴�
/// </summary>
public const string SensorEnvironment = "sensor.environment";
+ /// <summary>
+ /// 闈掕悕浼犳劅鍣�2锛坈o2锛宲m25锛屾俯婀垮害锛岀數閲忥紝tvoc锛�
+ /// </summary>
+ public const string SensorEnvironment2 = "sensor.environment2";
+ /// <summary>
+ /// 闈掕悕浼犳劅鍣�3锛坈o2锛宲m25锛屾俯婀垮害锛�
+ /// </summary>
+ public const string SensorEnvironment3 = "sensor.environment3";
/// <summary>
/// 鐜浼犳劅鍣╯pk鍒楄〃
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index d6af876..9423a49 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -204,6 +204,8 @@
break;
//鐜妫�娴嬩紶鎰熷櫒
case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment2:
+ case SPK.SensorEnvironment3:
{
#region 鐣岄潰
///娓╁害
@@ -229,7 +231,11 @@
LogicView.FunTypeView tvocView = new LogicView.FunTypeView();
tvocView.frameLayout.Y = co2View.frameLayout.Bottom;
tvocView.btnText.TextID = StringId.tvoc;
- fLayout.AddChidren(tvocView.FLayoutView());
+ if (SPK.SensorEnvironment3 != device.spk)
+ {
+ fLayout.AddChidren(tvocView.FLayoutView());
+ }
+
#endregion
#region 鐐瑰嚮浜嬩欢
///娓╁害鐐瑰嚮浜嬩欢
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index c1ec71b..398c19a 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -316,6 +316,8 @@
}
break;
case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment2:
+ case SPK.SensorEnvironment3:
{
string strtext = "";
foreach (var dic in dicList)
@@ -599,7 +601,7 @@
{
//鐢╯id鎵惧埌璁惧锛�
var device = LogicMethod.CurrLogicMethod.GetDevice(inputCondition.sid);
- if (device.spk == SPK.SensorEnvironment)
+ if (device.spk == SPK.SensorEnvironment|| device.spk == SPK.SensorEnvironment2 || device.spk == SPK.SensorEnvironment3)
{
//杩欎釜璁惧姣旇緝鐗规畩
ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 443542a..f55167c 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -326,6 +326,8 @@
case SPK.SensorUtrasonic:
case SPK.SenesorMegahealth:
case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment2:
+ case SPK.SensorEnvironment3:
{
strPath = "LogicIcon/sensor.png";
}
@@ -385,6 +387,8 @@
|| device.spk == SPK.SensorUtrasonic
|| device.spk == SPK.SenesorMegahealth
|| device.spk == SPK.SensorEnvironment
+ || device.spk == SPK.SensorEnvironment2
+ || device.spk == SPK.SensorEnvironment3
);
if (sensor != null)
{
@@ -436,6 +440,8 @@
functionTypeList.Add(SPK.SensorUtrasonic);
functionTypeList.Add(SPK.SenesorMegahealth);
functionTypeList.Add(SPK.SensorEnvironment);
+ functionTypeList.Add(SPK.SensorEnvironment2);
+ functionTypeList.Add(SPK.SensorEnvironment3);
}
@@ -474,6 +480,8 @@
deviceTypeList.Add(SPK.SensorUtrasonic);
deviceTypeList.Add(SPK.SenesorMegahealth);
deviceTypeList.Add(SPK.SensorEnvironment);
+ deviceTypeList.Add(SPK.SensorEnvironment2);
+ deviceTypeList.Add(SPK.SensorEnvironment3);
}
break;
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs
index c7d0a64..4a2d600 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs
@@ -107,7 +107,7 @@
Y = Application.GetRealHeight(57),
TextSize = LogicView.TextSize.text10,
TextColor = CSS.CSS_Color.textCancelColor,
- Text = "骞夸笢骞垮窞甯傜暘绂哄尯鐭虫ゼ闀�",
+ //Text = "骞夸笢骞垮窞甯傜暘绂哄尯鐭虫ゼ闀�",
};
frameLayout.AddChidren(textBtn);
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index 4683464..27524ab 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -690,18 +690,18 @@
case "co2":
{
list = new List<string> {
- Language.StringByID(StringId.zhengchang),
- Language.StringByID(StringId.piangao),
- Language.StringByID(StringId.chaobiao),
+ Language.StringByID(StringId.zhengchang)+ ":0~1000PPM",
+ Language.StringByID(StringId.piangao) + ":1001~2000PPM",
+ Language.StringByID(StringId.chaobiao) + ":>2000PPM",
};
}
break;
case "tvoc":
{
list = new List<string> {
- Language.StringByID(StringId.zhengchang),
- Language.StringByID(StringId.chaobiao),
- Language.StringByID(StringId.yanzhong),
+ Language.StringByID(StringId.zhengchang)+ ":0~399PPB",
+ Language.StringByID(StringId.chaobiao)+ ":400~699PPB",
+ Language.StringByID(StringId.yanzhong)+":>700PPB",
};
}
break;
@@ -899,19 +899,19 @@
case "pm25":
{
- if (intValue > 0 && intValue < 35)
+ if (intValue >= 0 && intValue <= 35)
{
text = Language.StringByID(StringId.pmyou);
}
- else if (intValue > 35 && intValue < 75)
+ else if (intValue >35 && intValue <= 75)
{
text = Language.StringByID(StringId.pmliang);
}
- else if (intValue > 75 && intValue < 115)
+ else if (intValue > 75 && intValue <= 115)
{
text = Language.StringByID(StringId.pmqingdu);
}
- else if (intValue > 115 && intValue < 150)
+ else if (intValue >115 && intValue <= 150)
{
text = Language.StringByID(StringId.pmzhongdu);
}
@@ -924,17 +924,17 @@
case "co2":
{
- if (intValue > 0 && intValue < 800)
+ if (intValue >= 0 && intValue <= 1000)
{
- text = Language.StringByID(StringId.zhengchang);
+ text = Language.StringByID(StringId.zhengchang)+ ":0~1000PPM";
}
- else if (intValue > 800 && intValue < 1100)
+ else if (intValue > 1000 && intValue <= 2000)
{
- text = Language.StringByID(StringId.piangao);
+ text = Language.StringByID(StringId.piangao) + ":1001~2000PPM";
}
- else if (intValue > 1100)
+ else if (intValue > 2000)
{
- text = Language.StringByID(StringId.chaobiao);
+ text = Language.StringByID(StringId.chaobiao) + ":>2000PPM";
}
}
break;
@@ -943,15 +943,15 @@
if (intValue >=1 && intValue <= 3)
{
- text = Language.StringByID(StringId.zhengchang);
+ text = Language.StringByID(StringId.zhengchang) + ":0~399PPB";
}
else if (intValue >=4 && intValue<=6)
{
- text = Language.StringByID(StringId.chaobiao);
+ text = Language.StringByID(StringId.chaobiao) + ":400~699PPB";
}
else if (intValue >= 7 && intValue <= 9)
{
- text = Language.StringByID(StringId.yanzhong);
+ text = Language.StringByID(StringId.yanzhong) + ":>700PPB";
}
}
break;
@@ -996,31 +996,31 @@
break;
case "co2":
{
- if (text == Language.StringByID(StringId.zhengchang))
+ if (text == Language.StringByID(StringId.zhengchang) + ":0~1000PPM")
{
value = "400";
}
- else if (text == Language.StringByID(StringId.piangao))
+ else if (text == Language.StringByID(StringId.piangao) + ":1001~2000PPM")
{
- value = "850";
+ value = "1850";
}
- else if (text == Language.StringByID(StringId.chaobiao))
+ else if (text == Language.StringByID(StringId.chaobiao) + ":>2000PPM")
{
- value = "1200";
+ value = "2200";
}
}
break;
case "tvoc":
{
- if (text == Language.StringByID(StringId.zhengchang))
+ if (text == Language.StringByID(StringId.zhengchang) + ":0~399PPB")
{
value = "2";
}
- else if (text == Language.StringByID(StringId.chaobiao))
+ else if (text == Language.StringByID(StringId.chaobiao) + ":400~699PPB")
{
value = "5";
}
- else if (text == Language.StringByID(StringId.yanzhong))
+ else if (text == Language.StringByID(StringId.yanzhong) +":>700PPB")
{
value = "8";
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index de7c61b..42628ff 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -473,7 +473,7 @@
{
var utcTime = Convert.ToDateTime(str);
var dateTime = TimeZoneInfo.ConvertTimeFromUtc(utcTime, TimeZoneInfo.Local);
- return dateTime.ToString("HH") + ":" + dateTime.ToString("mm");
+ return dateTime.ToString("MM-dd HH:mm");
}
/// <summary>
/// 鑾峰彇鍛煎彨鐘舵�佹枃鏈�
--
Gitblit v1.8.0