~wxr/OnPro.git - Gitblit

			@@ -7,12 +7,27 @@
			{
			public class InpOrOutLogicMethod
			{

			private static InpOrOutLogicMethod s_Current = null;

			public static InpOrOutLogicMethod Current
			{
			get
			{
			if (s_Current == null)
			{
			s_Current = new InpOrOutLogicMethod();

			}
			return s_Current;
			}
			}
			/// <summary>
			/// 输入条件处理方法
			/// </summary>
			/// <param name="thisView">当前界面</param>
			/// <param name="viewLayout">上下滑动控件</param>
			public static void InputCondition(FrameLayout thisView, VerticalScrolViewLayout viewLayout)
			public void InputCondition(FrameLayout thisView, VerticalScrolViewLayout viewLayout)
			{
			for (int i = 0; i < Logic.currlogic.input.Count; i++)
			{
			@@ -33,6 +48,7 @@
			{
			case "1":
			{

			inputView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
			foreach (var dic in dicList)
			{
			@@ -114,20 +130,17 @@
			case "2":
			{
			inputView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
			foreach (var dic in dicList)
			{
			string value = dic["value"];
			inputView.btnText.Text = Language.StringByID(StringId.timeHorizon) + ": " + value;
			}

			string value = this.GetKeyValue("timesection", dicList);
			inputView.btnText.Text = Language.StringByID(StringId.timeHorizon) + ": " + value;
			}
			break;
			case "3":
			case "9"://可视对讲:9
			{
			//用sid找到设备；
			var device = LogicMethod.CurrLogicMethod.GetDevice(inputCondition.sid);
			var device = LogicMethod.Current.GetDevice(inputCondition.sid);
			//用设备的functionType类型找到对应图标；
			inputView.btnIcon.UnSelectedImagePath = LogicMethod.CurrLogicMethod.GetIconPath(device.spk);
			inputView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetDeviceIconPath(device);
			//显示设备名称
			inputView.btnText.Text = device.name;
			//改变设备名称显示控件宽度
			@@ -149,6 +162,7 @@
			//空调
			case SPK.AcStandard:
			case SPK.HvacAC:
			case SPK.AcIr:
			//地热
			case SPK.HvacFloorHeat:
			case SPK.FloorHeatStandard:
			@@ -159,91 +173,56 @@
			case SPK.PanelSocket:
			case SPK.ElectricSocket:
			{//开关灯
			foreach (var dic in dicList)
			string value = this.GetKeyValue("on_off", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.offLogic);
			if (value == "on")
			{

			string value = dic["value"];
			if (value == "on")
			{
			inputView.btnState.Text = Language.StringByID(StringId.onLogic);

			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.offLogic);
			}
			inputView.btnState.Text = Language.StringByID(StringId.onLogic);
			}
			}
			break;
			//传感器
			//紧急求助传感器
			case SPK.SensorHelp:
			{
			foreach (var dic in dicList)
			string value = this.GetKeyValue("alarm_status", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.zhengchang);
			if (value == "alarm")
			{
			string value = dic["value"];
			if (value == "alarm")
			{
			inputView.btnState.Text = Language.StringByID(StringId.qiujiu);

			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.zhengchang);
			}
			inputView.btnState.Text = Language.StringByID(StringId.qiujiu);
			}
			}
			break;
			case SPK.SensorSmoke:
			case SPK.SensorGas:
			{
			foreach (var dic in dicList)
			string value = this.GetKeyValue("alarm_status", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.wuxieluo);
			if (value == "alarm")
			{
			string value = dic["value"];
			if (value == "alarm")
			{
			inputView.btnState.Text = Language.StringByID(StringId.xieluo);
			inputView.btnState.Text = Language.StringByID(StringId.xieluo);

			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.wuxieluo);
			}
			}
			}
			break;
			case SPK.SensorWater:
			{
			foreach (var dic in dicList)
			string value = this.GetKeyValue("alarm_status", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.wuluoshui);
			if (value == "alarm")
			{
			string value = dic["value"];
			if (value == "alarm")
			{
			inputView.btnState.Text = Language.StringByID(StringId.luoshui);

			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.wuluoshui);
			}
			inputView.btnState.Text = Language.StringByID(StringId.luoshui);
			}
			}
			break;
			case SPK.SensorDryContact:
			case SPK.SensorDryContact2:
			{
			foreach (var dic in dicList)

			string value = this.GetKeyValue("contact_status", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.offLogic);
			if (value == "open")
			{

			string value = dic["value"];
			if (value == "on")
			{
			inputView.btnState.Text = Language.StringByID(StringId.onLogic);

			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.offLogic);
			}
			inputView.btnState.Text = Language.StringByID(StringId.onLogic);
			}
			}
			break;
			@@ -251,100 +230,91 @@
			case SPK.SensorDuiShe:
			case SPK.SensorPir:
			{
			foreach (var dic in dicList)
			string value = this.GetKeyValue("people_status", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			if (value == "true")
			{
			inputView.btnState.Text = Language.StringByID(StringId.youren);

			string value = dic["value"];
			if (value == "true")
			{
			inputView.btnState.Text = Language.StringByID(StringId.youren);

			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			}
			}
			}
			break;
			case SPK.SensorDoorWindow:
			{
			foreach (var dic in dicList)
			string value = this.GetKeyValue("contact_status", dicList);
			inputView.btnState.Text = Language.StringByID(StringId.bihe);
			if (value == "open")
			{

			string value = dic["value"];
			if (value == "open")
			{
			inputView.btnState.Text = Language.StringByID(StringId.kaiqi);

			}
			else
			{
			inputView.btnState.Text = Language.StringByID(StringId.bihe);
			}
			inputView.btnState.Text = Language.StringByID(StringId.kaiqi);
			}

			}
			break;
			case SPK.SensorUtrasonic:
			{
			string key = this.GetKey(dicList);
			string value = this.GetValue(dicList);
			string str = "";
			foreach (var dic in dicList)
			switch (key)
			{
			string value = dic["value"];
			switch (dic["key"])
			{
			case "status":
			case "people_status":
			case "status":
			case "people_status":
			{
			str = Language.StringByID(StringId.wuren);
			if (value == "true")
			{
			if (value == "true")
			{
			str += Language.StringByID(StringId.youren) + ";";
			}
			else
			{
			str += Language.StringByID(StringId.wuren) + ";";
			}


			str = Language.StringByID(StringId.youren);
			}
			break;
			case "dismantle":
			}
			break;
			case "dismantle":
			{
			str = Language.StringByID(StringId.buzaixian);
			if (value == "true")
			{
			if (value == "true")
			{
			str += Language.StringByID(StringId.zaixian);
			}
			else
			{
			str += Language.StringByID(StringId.buzaixian);
			}
			str = Language.StringByID(StringId.zaixian);
			}
			break;

			}
			}
			break;

			}
			inputView.btnState.Text = str;
			}
			break;
			case SPK.SenesorMegahealth:
			case SPK.SenesorMegahealth2:
			case SPK.SensorMmvPose:
			{
			foreach (var dic in dicList)
			string key = this.GetKey(dicList);
			string value = this.GetValue(dicList);
			if (key == "people_status")
			{
			string value = dic["value"];
			if (value == "fall")
			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			if (value == "true")
			{
			inputView.btnState.Text = Language.StringByID(StringId.diedao);
			inputView.btnState.Text = Language.StringByID(StringId.youren);
			}
			else
			}
			else if (key == "target_status")
			{
			if (value == "4")
			{
			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			inputView.btnState.Text = Language.StringByID(StringId.shi);
			}
			}
			}
			break;
			case SPK.SenesorMegahealth2:
			{
			string value = this.GetValue(dicList);
			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			if (value == "fall")
			{
			inputView.btnState.Text = Language.StringByID(StringId.diedao);
			}
			}
			break;
			case SPK.SensorEnvironment:
			case SPK.SensorEnvironmentHailin:
			case SPK.SensorEnvironment2:
			case SPK.SensorEnvironment3:
			{
			@@ -408,56 +378,159 @@
			case SPK.SensorTemperature:
			{

			string str = new InpOrOutLogicMethod { }.GetText(dicList, "temperature");
			string str = this.GetText(dicList, "temperature");
			inputView.btnState.Text = str;
			}
			break;
			case SPK.SensorHumidity:
			{
			string str = new InpOrOutLogicMethod { }.GetText(dicList, "humidity");
			string str = this.GetText(dicList, "humidity");
			inputView.btnState.Text = str;

			}
			break;
			case SPK.SensorPm10:
			case SPK.SensorCO2:
			{
			string str = new InpOrOutLogicMethod { }.GetText(dicList, "co2");
			inputView.btnState.Text = str;

			}
			break;
			case SPK.SensorPm25:
			{
			string str = new InpOrOutLogicMethod { }.GetText(dicList, "pm25");
			inputView.btnState.Text = str;

			}
			break;
			case SPK.SensorTVOC:
			{
			string str = new InpOrOutLogicMethod { }.GetText(dicList, "tvoc");
			inputView.btnState.Text = str;

			}
			break;
			case SPK.SensorHcho:
			{
			string str = new InpOrOutLogicMethod { }.GetText(dicList, "hcho");
			string value = this.GetValue(dicList);
			string str = new PublicInterface().GetSensorLevelText(device, value, true);
			inputView.btnState.Text = str;
			}
			break;
			case SPK.SensorLight:
			{
			string str = this.GetText(dicList, "illuminance");
			inputView.btnState.Text = str;

			}
			break;
			case SPK.DoorLock:
			{
			foreach (var dic in dicList)
			string value = this.GetValue(dicList);
			if (value == "open")
			{
			string value = dic["value"];
			if (value == "open")
			inputView.btnState.Text = Language.StringByID(StringId.kaiqi);
			}
			}
			break;
			case SPK.VideoDoorLock:
			{
			string userName = string.Empty;
			string tag = string.Empty;
			for (int b = 0; b < dicList.Count; b++)
			{
			var dic = dicList[b];
			//var userId = dic["value"].ToString();
			//var FaceItem = this.GetVideoDoorLockUserItem(userId, device);
			//s += FaceItem.userName;
			//s += ",";
			//tag += FaceItem.userId;
			//tag += "_";
			userName = dic["value"].ToString();
			}
			inputView.btnState.Text = RemoveLastStr(userName);
			}
			break;
			case SPK.doorgate:
			{

			string s = string.Empty;
			try
			{
			if (inputCondition.identifier == "door_call_cloud_event")
			{
			inputView.btnState.Text = Language.StringByID(StringId.kaiqi);
			s = Language.StringByID(StringId.shipintonghuahujiao);
			}
			else
			{
			for (int b = 0; b < dicList.Count; b++)
			{
			var dic = dicList[b];
			var key = dic["key"].ToString();
			if (key != "user_id")
			{
			continue;
			}
			var value = dic["value"].ToString();
			if (!string.IsNullOrEmpty(value))
			{
			var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(value);
			for (int a = 0; a < list.Count; a++)
			{

			var FaceItem = this.GetFaceItem(list[a], device.deviceId);
			s += FaceItem.userName;
			s += ",";

			}
			}

			}

			}
			}
			catch { }
			inputView.btnState.Text = s;
			}
			break;
			case SPK.IpCam_Imou:
			{
			if (inputCondition.identifier == "ipcam_region_alram_event")
			{
			inputView.btnState.Text = Language.StringByID(StringId.quyuruqingaojing);
			}

			}
			break;
			case SPK.Ev_Ipcam:
			if (inputCondition.identifier == Constant.intelligentDetection_event)
			{
			inputView.btnState.Text = Language.StringByID(StringId.shi);
			}
			break;
			case SPK.Peephole:
			if (inputCondition.identifier == "pir_event")
			{
			inputView.btnState.Text = Language.StringByID(StringId.shi);
			}
			break;
			case SPK.SensorPirHold:
			{
			string value = this.GetKeyValue("people_status", dicList);
			if (string.IsNullOrEmpty(value))
			{
			inputView.btnState.Text = LogicMethod.Current.getTimeStr(inputCondition.hold_time).Replace("0s", "");
			break;

			}

			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			if (value == "true")
			{
			inputView.btnState.Text = Language.StringByID(StringId.youren);

			}
			if (!string.IsNullOrEmpty(inputCondition.hold_time) && int.Parse(inputCondition.hold_time) > 0)
			{
			int time = int.Parse(inputCondition.hold_time);
			inputView.btnState.Text += "持续" + LogicMethod.Current.getTimeStr(inputCondition.hold_time).Replace("0s", "");
			}
			if (!string.IsNullOrEmpty(inputCondition.detect_type))
			{
			if (inputCondition.detect_type == "1")
			{
			inputView.btnState.Text += "," + Language.StringByID(StringId.gaibiancaizhixing);
			}
			else
			{
			inputView.btnState.Text += "," + Language.StringByID(StringId.shoudaojiuzhixing);
			}
			}


			}
			break;
			}
			@@ -580,32 +653,24 @@
			case "8":
			{
			inputView.btnIcon.UnSelectedImagePath = "LogicIcon/location.png";
			foreach (var dic in dicList)
			string value = this.GetValue(dicList);
			if (value == "arrive")
			{
			string strtext = "";
			string value = dic["value"];
			switch (value)
			{
			case "arrive":
			{
			strtext = Language.StringByID(StringId.daoda);
			}
			break;
			case "leave":
			{
			strtext = Language.StringByID(StringId.likai);
			}
			break;
			}
			inputView.btnText.TextID = StringId.likiadaoda;
			inputView.btnState.Text = strtext;
			value = Language.StringByID(StringId.daoda);
			}
			else if (value == "leave")
			{
			value = Language.StringByID(StringId.likai);
			}

			inputView.btnText.TextID = StringId.likiadaoda;
			inputView.btnState.Text = value;
			}
			break;
			case "10":
			{
			//用sid找到场景；
			var scene = LogicMethod.CurrLogicMethod.GetSecne(inputCondition.sid);
			var scene = LogicMethod.Current.GetSecne(inputCondition.sid);
			inputView.btnIcon.UnSelectedImagePath = "LogicIcon/scene.png";
			inputView.btnNextIcon.Visible = false;
			inputView.btnClick.Visible = false;
			@@ -620,19 +685,19 @@
			{
			Button button = (Button)sen;
			//当前编辑的条件
			Input ckcliInput = inputView.btnClick.Tag as Input;
			Input clickInput = inputView.btnClick.Tag as Input;
			//找到当前编辑的索引
			int indexVulae = 0;
			for (int index = 0; index < Logic.currlogic.input.Count; index++)
			{
			Input input = Logic.currlogic.input[index];
			if (input.sid == ckcliInput.sid)
			if (input.sid == clickInput.sid)
			{
			if (button.Name == "3")
			if (button.Name == "3" \|\| button.Name == "9")
			{
			//有些设备比较特殊（例如：海林传感器还是要判断属性值，温湿度属性还要判断比较关系，才能确认是否已经存在该条件，其他设备条件直接用sid判断即可）
			//加一级判断是为兼容特殊设备
			if (new ConditionDeviceFunList { }.IsContainsAll(ckcliInput.condition, input.condition))
			if (new ConditionDeviceFunList { }.IsContainsAll(clickInput.condition, input.condition))
			{
			//用户可能删除数据，使列表索引发生改变；
			//通过唯一sid重新查找到索引且更新索引值
			@@ -706,17 +771,17 @@
			timeTpye.TimeHorizon(fLayout, edit, indexVulae);
			}
			break;
			case "9":
			case "3":
			{
			//用sid找到设备；
			var device = LogicMethod.CurrLogicMethod.GetDevice(inputCondition.sid);
			if (device.spk == SPK.SensorEnvironment
			var device = LogicMethod.Current.GetDevice(inputCondition.sid);
			if (device.spk == SPK.SensorEnvironment \|\| device.spk == SPK.SensorEnvironmentHailin
			\|\| device.spk == SPK.SensorEnvironment2
			\|\| device.spk == SPK.SensorEnvironment3
			\|\| device.spk == SPK.SensorLight
			)
			{
			//这个设备比较特殊
			ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
			///当前的索引值数据对象
			Input inputedit = Logic.currlogic.input[indexVulae];
			///状态值
			@@ -729,6 +794,20 @@
			switch (key)
			{

			case "illuminance":
			{
			int titleInt = 0;
			if (comparator == ">")
			{
			titleInt = StringId.zhaomingdugaoyu;
			}
			else if (comparator == "<")
			{
			titleInt = StringId.zhaomingdudiyu;
			}
			ConditionDeviceFunList.Current.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			}
			break;
			case "temperature":
			{
			int titleInt = 0;
			@@ -740,7 +819,7 @@
			{
			titleInt = StringId.wendudiyu;
			}
			conditionDeviceFunList.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			}
			break;
			case "humidity":
			@@ -754,27 +833,27 @@
			{
			titleInt = StringId.shidudiyu;
			}
			conditionDeviceFunList.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			}
			break;
			case "co2":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "co2", StringId.co2, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "co2", StringId.co2, indexVulae, true, stateValue);
			}
			break;
			case "pm25":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "pm25", StringId.pm25, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm25", StringId.pm25, indexVulae, true, stateValue);
			}
			break;
			case "tvoc":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "tvoc", StringId.tvoc, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "tvoc", StringId.tvoc, indexVulae, true, stateValue);
			}
			break;
			case "hcho":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "hcho", StringId.Formaldehyde, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "hcho", StringId.Formaldehyde, indexVulae, true, stateValue);
			}
			break;
			}
			@@ -784,37 +863,43 @@
			else if (device.spk == SPK.SensorTemperature)
			{

			new InpOrOutLogicMethod().SensorView(thisView, device, "temperature", indexVulae);
			this.SensorView(thisView, device, "temperature", indexVulae);

			}
			else if (device.spk == SPK.SensorHumidity)
			{

			new InpOrOutLogicMethod().SensorView(thisView, device, "humidity", indexVulae);
			this.SensorView(thisView, device, "humidity", indexVulae);

			}
			else if (device.spk == SPK.SensorCO2)
			{

			new InpOrOutLogicMethod().SensorView(thisView, device, "co2", indexVulae);
			this.SensorView(thisView, device, "co2", indexVulae);

			}
			else if (device.spk == SPK.SensorPm10)
			{

			this.SensorView(thisView, device, "pm10", indexVulae);

			}
			else if (device.spk == SPK.SensorPm25)
			{

			new InpOrOutLogicMethod().SensorView(thisView, device, "pm25", indexVulae);
			this.SensorView(thisView, device, "pm25", indexVulae);

			}
			else if (device.spk == SPK.SensorTVOC)
			{

			new InpOrOutLogicMethod().SensorView(thisView, device, "tvoc", indexVulae);
			this.SensorView(thisView, device, "tvoc", indexVulae);

			}
			else if (device.spk == SPK.SensorHcho)
			{

			new InpOrOutLogicMethod().SensorView(thisView, device, "hcho", indexVulae);
			this.SensorView(thisView, device, "hcho", indexVulae);

			}
			else
			@@ -939,7 +1024,7 @@
			/// </summary>
			/// <param name="thisView">当前界面</param>
			/// <param name="viewLayout">上下滑动控件</param>
			public static void OutputTarget(FrameLayout thisView, VerticalScrolViewLayout viewLayout)
			public void OutputTarget(FrameLayout thisView, VerticalScrolViewLayout viewLayout)
			{

			for (int i = 0; i < Logic.currlogic.output.Count; i++)
			@@ -960,11 +1045,12 @@
			switch (outputTarget.target_type)
			{
			case "1":
			case "5":
			{
			//用sid找到设备；
			var device = LogicMethod.CurrLogicMethod.GetDevice(outputTarget.sid);
			var device = LogicMethod.Current.GetDevice(outputTarget.sid);
			//用设备的functionType类型找到对应图标；
			targetView.btnIcon.UnSelectedImagePath = LogicMethod.CurrLogicMethod.GetIconPath(device.spk);
			targetView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetDeviceIconPath(device);
			//显示设备名称
			targetView.btnText.Text = device.name;
			//改变设备名称显示控件宽度
			@@ -973,11 +1059,33 @@
			//区别不同设备，显示不同设备状态
			switch (device.spk)
			{

			case SPK.CommonSeries:
			targetView.btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/groupControl.png";
			stateStr = GetKeyValue("on_off", dicList) == "on" ? Language.StringByID(StringId.onLogic) : Language.StringByID(StringId.offLogic);
			break;
			//插座(有USB)
			case SPK.PanelSocket:
			{
			//string on_off = GetKeyValue("on_off_master", dicList);
			string on_off = GetKeyValue("on_off", dicList);
			if (on_off == "on")
			{
			stateStr = Language.StringByID(StringId.onLogic);
			}
			else
			{
			stateStr = stateStr = Language.StringByID(StringId.offLogic);
			}
			}
			break;
			case SPK.OtherCommon:
			case SPK.AirSwitch:
			case SPK.LightSwitch:
			//插座
			case SPK.PanelSocket:
			case SPK.ElectricSocket:
			//机械手
			case SPK.MechanicalArm:
			{//开关

			foreach (var dic in dicList)
			@@ -995,11 +1103,14 @@
			}
			}
			break;


			case SPK.LightRGB:
			case SPK.LightRGBW:
			case SPK.LightCCT:
			case SPK.LightDimming:
			{

			string on_off = GetKeyValue("on_off", dicList);
			string brightness = GetKeyValue("brightness", dicList);
			if (on_off == "on" && brightness != "")
			@@ -1018,9 +1129,91 @@
			{
			stateStr = brightness + "%";
			}
			if (device.spk == SPK.LightCCT)
			{
			//色温这个属性才有效
			if (stateStr != Language.StringByID(StringId.offLogic) && GetKeyValue("cct", dicList) != "")
			{
			stateStr += "," + GetKeyValue("cct", dicList) + "k";
			}
			}
			if (device.spk == SPK.LightRGB)
			{
			string rgb = GetKeyValue("rgb", dicList);
			if (!string.IsNullOrEmpty(rgb) && rgb.Length > 6)
			{
			targetView.btnStateColor.Visible = true;
			targetView.btnStateColor.BackgroundColor = new LogicView.RGBColorView().GetBackgroundColor(rgb);
			}
			}
			if (device.spk == SPK.LightRGBW)
			{
			string rgb = GetKeyValue("rgbw", dicList);
			if (!string.IsNullOrEmpty(rgb) && rgb.Length > 6)
			{
			targetView.btnStateColor.Visible = true;
			targetView.btnStateColor.BackgroundColor = new LogicView.RGBColorView().GetBackgroundColor(rgb);
			}
			}

			}
			break;
			case SPK.GroupControl: //群控
			{
			targetView.btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/groupControl.png";
			string on_off = GetKeyValue("on_off", dicList);
			string brightness = GetKeyValue("brightness", dicList);
			string cct = GetKeyValue(FunctionAttributeKey.CCT, dicList);
			//自动化组控炫彩功能
			//string colorful = GetKeyValue(FunctionAttributeKey.Colorful, dicList);
			string rgb = GetKeyValue("rgb", dicList);


			if (on_off == "on" && brightness != "")
			{
			stateStr = Language.StringByID(StringId.onLogic) + brightness + "%";
			}
			else if (on_off == "on")
			{
			stateStr = Language.StringByID(StringId.onLogic);
			}
			else if (on_off == "off")
			{
			stateStr = Language.StringByID(StringId.offLogic);
			}
			else if (brightness != "")
			{
			stateStr = brightness + "%";
			}
			//色温这个属性才有效
			if (!string.IsNullOrEmpty(cct))
			{
			stateStr += "," + Language.StringByID(StringId.ColorTemperature) + cct + "k";
			}

			//if (!string.IsNullOrEmpty(colorful))
			//{
			// stateStr += "," + Language.StringByID(StringId.ColorfulFunction);
			// if (colorful == "on")
			// {
			// stateStr += Language.StringByID(StringId.onLogic);
			// }
			// else if (colorful == "off")
			// {
			// stateStr += Language.StringByID(StringId.offLogic);
			// }
			//}

			if (!string.IsNullOrEmpty(rgb) && rgb.Length > 6)
			{
			targetView.btnStateColor.Visible = true;
			targetView.btnStateColor.BackgroundColor = new LogicView.RGBColorView().GetBackgroundColor(rgb);
			}


			}
			break;

			case SPK.CurtainSwitch:
			{
			foreach (var dic in dicList)
			@@ -1051,7 +1244,7 @@
			case SPK.CurtainRoller:
			{
			string on_off = GetKeyValue("on_off", dicList);
			string percent = GetKeyValue("percent", dicList);
			string percent = GetKeyValue("percent", dicList);
			if (on_off == "on" && percent != "")
			{
			stateStr = Language.StringByID(StringId.onLogic) + percent + "%";
			@@ -1070,8 +1263,28 @@
			}
			}
			break;
			case SPK.CurtainDream:
			{
			string percent = GetKeyValue("percent", dicList);
			string angle = GetKeyValue("angle", dicList);
			if (percent != "" && angle != "")
			{
			stateStr += Language.StringByID(StringId.onLogic) + percent + "%;";
			stateStr += Language.StringByID(StringId.Angle) + angle + "°";
			}
			else if (percent != "")
			{
			stateStr = Language.StringByID(StringId.onLogic) + percent + "%";
			}
			else if (angle != "")
			{
			stateStr = Language.StringByID(StringId.onLogic) + Language.StringByID(StringId.Angle) + angle + "°";
			}
			}
			break;
			case SPK.AcStandard:
			case SPK.HvacAC:
			case SPK.AcIr:
			{
			string on_off = GetKeyValue("on_off", dicList);
			string set_temp = GetKeyValue("set_temp", dicList);
			@@ -1097,8 +1310,8 @@

			if (set_temp != "")
			{

			stateStr += set_temp + "℃,";
			string unit = GetTemperatureUnit(device);
			stateStr += set_temp + unit + ",";
			}

			if (mode != "")
			@@ -1170,7 +1383,8 @@

			}
			break;
			case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
			case SPK.FloorHeatStandard:
			case SPK.HvacFloorHeat:
			{
			string on_off = GetKeyValue("on_off", dicList);
			string set_temp = GetKeyValue("set_temp", dicList);
			@@ -1194,8 +1408,8 @@
			}
			if (set_temp != "")
			{

			stateStr += set_temp + "℃,";
			string unit = GetTemperatureUnit(device);
			stateStr += set_temp + unit + ",";
			}
			if (mode != "")
			{
			@@ -1302,13 +1516,84 @@
			}
			}
			break;
			case SPK.MusicStandard:
			case SPK.AvMusic:
			{
			string on_off = GetKeyValue("on_off", dicList);
			string song_name = GetKeyValue("song_name", dicList);
			string volume = GetKeyValue("volume", dicList);

			if (!string.IsNullOrEmpty(on_off))
			{
			if (on_off == "on")
			{
			stateStr = Language.StringByID(StringId.onLogic);
			}
			else
			{
			stateStr = Language.StringByID(StringId.offLogic);
			}
			}

			if (!string.IsNullOrEmpty(song_name))
			{
			stateStr += "," + song_name;
			}

			if (!string.IsNullOrEmpty(volume))
			{
			stateStr += "," + volume;
			}

			}
			break;
			case SPK.ElectricalTvHisense:
			{
			string on = GetKeyValue("wol", dicList);
			string off = GetKeyValue("on_off", dicList);
			string volumet = GetKeyValue("set_volume", dicList);
			string signal = GetKeyValue("signal", dicList);

			if (!string.IsNullOrEmpty(off))
			{
			stateStr = Language.StringByID(StringId.offLogic);
			//如果关了，其它属性不显示
			break;
			}

			if (!string.IsNullOrEmpty(on))
			{
			stateStr = Language.StringByID(StringId.onLogic);
			}
			if (!string.IsNullOrEmpty(stateStr))
			{
			stateStr += ",";
			}
			if (!string.IsNullOrEmpty(volumet))
			{
			stateStr += Language.StringByID(StringId.yinliang) + volumet;
			}

			if (!string.IsNullOrEmpty(stateStr))
			{
			stateStr += ",";
			}
			if (!string.IsNullOrEmpty(signal))
			{
			var p = new PublicInterface();
			string key = p.GetKey(p.GetHisenseSignalSourceDic(), signal);
			stateStr += key;
			}
			stateStr = stateStr.TrimEnd(',');
			}
			break;
			}
			}
			break;
			case "2":
			{
			//用sid找到场景；
			var scene = LogicMethod.CurrLogicMethod.GetSecne(outputTarget.sid);
			var scene = LogicMethod.Current.GetSecne(outputTarget.sid);
			targetView.btnIcon.UnSelectedImagePath = "LogicIcon/scene.png";
			targetView.btnNextIcon.Visible = false;
			//显示场景名称
			@@ -1318,7 +1603,7 @@
			case "3":
			{
			//用sid找到安防；
			var security = LogicMethod.CurrLogicMethod.GetSecurity(outputTarget.sid);
			var security = LogicMethod.Current.GetSecurity(outputTarget.sid);
			targetView.btnIcon.UnSelectedImagePath = "LogicIcon/security.png";
			targetView.btnDelay.Visible = false;
			//显示安防名称
			@@ -1348,13 +1633,16 @@
			break;
			}

			if (outputTarget.target_type == "1" \|\| outputTarget.target_type == "3")
			if (outputTarget.target_type == "1"
			\|\| outputTarget.target_type == "3"
			\|\| outputTarget.target_type == "5"
			)
			{
			targetView.btnState.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
			targetView.btnState.Text = this.GetTimeText(outputTarget.delay) + stateStr;
			}
			else
			{
			targetView.btnText.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
			targetView.btnText.Text = this.GetTimeText(outputTarget.delay) + stateStr;
			}
			//再次编辑条件状态点击事件
			targetView.btnClick.MouseUpEventHandler += (sen, e) =>
			@@ -1378,9 +1666,10 @@
			switch (button.Name)
			{
			case "1":
			case "5":
			{
			//用sid找到设备；
			var device = LogicMethod.CurrLogicMethod.GetDevice(outputTarget.sid);
			var device = LogicMethod.Current.GetDevice(outputTarget.sid);
			TargetDeviceFunList deviceFunList = new TargetDeviceFunList();
			MainPage.BasePageView.AddChidren(deviceFunList);
			deviceFunList.Show(device, indexVulae, edit);
			@@ -1411,20 +1700,19 @@
			//延时点击事件
			targetView.btnDelay.MouseUpEventHandler += (sen, e) =>
			{

			InpOrOutLogicMethod inpOrOutLogicMethod = new InpOrOutLogicMethod();
			inpOrOutLogicMethod.Delayed(thisView, outputTarget.delay, (value) =>
			{
			outputTarget.delay = value.ToString();
			if (outputTarget.target_type == "1")
			{
			targetView.btnState.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
			}
			else
			{
			targetView.btnText.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
			}
			});
			this.Delayed(thisView, outputTarget.delay, (value) =>
			{
			outputTarget.delay = value.ToString();
			if (outputTarget.target_type == "1"
			\|\| outputTarget.target_type == "5")
			{
			targetView.btnState.Text = this.GetTimeText(outputTarget.delay) + stateStr;
			}
			else
			{
			targetView.btnText.Text = this.GetTimeText(outputTarget.delay) + stateStr;
			}
			});

			};
			///删除控件
			@@ -1443,16 +1731,35 @@
			/// <param name="button2">显示Btn</param>
			/// <param name="button3">显示Btn</param>
			/// <param name="button4">显示Btn</param>
			public static void EditState(Entity.Function device, List<Dictionary<string, string>> dicList, Button button1, Button button2, Button button3, Button button4)
			/// <param name="attribute">属性索引</param>
			public void EditDeviceState(Entity.Function device, List<Dictionary<string, string>> dicList, Button button1, Button button2, Button button3, Button button4, string attribute)
			{
			switch (device.spk)
			{
			//插座
			//插座(有USB)
			case SPK.PanelSocket:
			{
			foreach (var dic in dicList)
			{
			string value = dic["value"];
			if (value == "on")
			{
			button1.Text = Language.StringByID(StringId.onLogic);
			}
			else
			{
			button1.Text = Language.StringByID(StringId.offLogic);
			}
			}
			}
			break;
			case SPK.ElectricSocket:
			//开关灯光
			case SPK.OtherCommon:
			case SPK.AirSwitch:
			case SPK.LightSwitch:
			//机械手
			case SPK.MechanicalArm:
			{
			foreach (var dic in dicList)
			{
			@@ -1500,9 +1807,102 @@
			button2.Text = value + "%";
			}
			break;
			case "cct":
			{
			if (button3 == null)
			{
			//怕调试软件乱上东西导致抛异常
			break;
			}
			button3.Text = value + "k";
			}
			break;
			case "rgb":
			case "rgbw":
			{
			if (button3 == null)
			{
			//怕调试软件乱上东西导致抛异常
			break;
			}
			if (!string.IsNullOrEmpty(value) && value.Length > 6)
			{
			button3.BackgroundColor = new LogicView.RGBColorView().GetBackgroundColor(value);
			button3.Tag = value;
			}
			}
			break;

			}

			}
			}
			break;
			case SPK.GroupControl://群控
			{
			foreach (var dic in dicList)
			{
			string key = dic["key"];
			if (key != attribute)
			{
			continue;
			}
			string value = dic["value"];
			switch (key)
			{
			case "on_off":
			case "colorful":
			{
			if (value == "on")
			{
			button1.Text = Language.StringByID(StringId.onLogic);
			}
			else
			{
			button1.Text = Language.StringByID(StringId.offLogic);
			}
			}
			break;
			case "brightness":
			{
			if (button1 == null)
			{
			//怕调试软件乱上东西导致抛异常
			break;
			}
			button1.Text = value + "%";
			}
			break;
			case "cct":
			{
			if (button1 == null)
			{
			//怕调试软件乱上东西导致抛异常
			break;
			}
			button1.Text = value + "k";
			}
			break;
			case "rgb":
			{
			if (button1 == null)
			{
			//怕调试软件乱上东西导致抛异常
			break;
			}
			if (!string.IsNullOrEmpty(value) && value.Length > 6)
			{
			button1.BackgroundColor = new LogicView.RGBColorView().GetBackgroundColor(value);
			button1.Tag = value;
			}
			}
			break;



			}
			}

			}
			break;
			case SPK.CurtainSwitch:
			@@ -1574,11 +1974,45 @@
			}

			}


			}
			break;
			case SPK.CurtainDream:
			{
			foreach (var dic in dicList)
			{
			string value = dic["value"];
			switch (dic["key"])
			{
			case "percent":
			{
			if (button1 == null)
			{
			//怕调试软件乱上东西导致抛异常
			break;
			}
			button1.Text = value + "%";
			}
			break;
			case "angle":
			{
			if (button2 == null)
			{
			//怕调试软件乱上东西导致抛异常
			break;
			}
			button2.Text = value + "°";
			}
			break;
			}

			}

			}
			break;
			case SPK.AcStandard:
			case SPK.HvacAC:
			case SPK.AcIr:
			{
			foreach (var dic in dicList)
			{
			@@ -1609,7 +2043,7 @@
			//怕调试软件乱上东西导致抛异常
			break;
			}
			button2.Text = value + "℃";
			button2.Text = value + GetTemperatureUnit(device); ;
			}
			break;
			case "mode":
			@@ -1689,7 +2123,8 @@

			}
			break;
			case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
			case SPK.FloorHeatStandard:
			case SPK.HvacFloorHeat:
			{

			foreach (var dic in dicList)
			@@ -1721,7 +2156,7 @@
			//怕调试软件乱上东西导致抛异常
			break;
			}
			button2.Text = value + "℃";
			button2.Text = value + GetTemperatureUnit(device); ;
			}
			break;
			case "mode":
			@@ -1856,6 +2291,7 @@
			}
			}
			break;

			case SPK.SensorGas:
			case SPK.SensorSmoke:
			{
			@@ -1895,7 +2331,7 @@
			foreach (var dic in dicList)
			{
			string value = dic["value"];
			if (value == "on")
			if (value == "on" \|\| value == "open")
			{
			button1.Text = Language.StringByID(StringId.onLogic);
			}
			@@ -1922,6 +2358,23 @@
			button1.Text = Language.StringByID(StringId.wuren);
			}
			}
			}
			break;
			case SPK.SensorPirHold:
			{
			foreach (var dic in dicList)
			{
			string value = dic["value"];
			if (value == "true")
			{
			button1.Text = Language.StringByID(StringId.youren);
			}
			else
			{
			button1.Text = Language.StringByID(StringId.wuren);
			}
			}

			}
			break;
			case SPK.SensorDoorWindow:
			@@ -1966,11 +2419,11 @@
			{
			if (value == "true")
			{
			button1.Text = Language.StringByID(StringId.zaixian);
			button2.Text = Language.StringByID(StringId.zaixian);
			}
			else
			{
			button1.Text = Language.StringByID(StringId.buzaixian);
			button2.Text = Language.StringByID(StringId.buzaixian);
			}
			}
			break;
			@@ -1981,6 +2434,40 @@
			}
			break;
			case SPK.SenesorMegahealth:
			case SPK.SensorMmvPose:
			{
			foreach (var dic in dicList)
			{
			string value = dic["value"];
			switch (dic["key"])
			{

			case "target_status":
			{
			if (value == "4")
			{
			button1.Text = Language.StringByID(StringId.shi);
			}
			}
			break;
			case "people_status":
			{
			if (value == "true")
			{
			button2.Text = Language.StringByID(StringId.youren);
			}
			else
			{
			button2.Text = Language.StringByID(StringId.wuren);
			}

			}
			break;
			}

			}
			}
			break;
			case SPK.SenesorMegahealth2:
			{
			foreach (var dic in dicList)
			@@ -2006,10 +2493,149 @@
			{
			button1.Text = Language.StringByID(StringId.shi);
			}


			}
			}
			break;
			case SPK.VideoDoorLock:
			{
			string userName = string.Empty;
			string tag = string.Empty;
			for (int b = 0; b < dicList.Count; b++)
			{
			var dic = dicList[b];
			//var userId = dic["value"].ToString();
			//var FaceItem = this.GetVideoDoorLockUserItem(userId, device);
			//s += FaceItem.userName;
			//s += ",";
			//tag += FaceItem.userId;
			//tag += "_";
			userName = dic["value"].ToString();

			}
			button1.Text = RemoveLastStr(userName);
			button1.Tag = tag;
			}
			break;
			case SPK.MusicStandard:
			case SPK.AvMusic:
			{
			foreach (var dic in dicList)
			{
			if (dic["key"] == "on_off")
			{
			if (dic["value"] == "on")
			{
			button1.Text = Language.StringByID(StringId.onLogic);
			}
			else
			{
			button1.Text = Language.StringByID(StringId.offLogic);
			}
			}
			else if (dic["key"] == "song_name")
			{
			button2.Text = dic["value"]?.ToString();
			}
			else if (dic["key"] == "volume")
			{
			button3.Text = dic["value"]?.ToString();
			}
			}
			}
			break;
			case SPK.doorgate:
			{
			try
			{
			string userNameStr = string.Empty;
			string tag = string.Empty;
			for (int b = 0; b < dicList.Count; b++)
			{
			var dic = dicList[b];
			var key = dic["key"].ToString();
			if (key != "user_id")
			{
			continue;
			}
			var value = dic["value"].ToString();
			if (!string.IsNullOrEmpty(value))
			{
			var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(value);
			for (int i = 0; i < list.Count; i++)
			{

			var FaceItem = this.GetFaceItem(list[i], device.deviceId);
			userNameStr += FaceItem.userName;
			userNameStr += ",";
			tag += FaceItem.userId;
			tag += "_";
			}
			}
			}
			button2.Text = RemoveLastStr(userNameStr);
			button2.Tag = tag;
			}
			catch { }
			}
			break;
			case SPK.ElectricalTvHisense:
			{
			foreach (var dic in dicList)
			{
			string value = dic["value"];
			switch (dic["key"])
			{
			case "on_off":
			{
			if (value == "off")
			{
			button1.Text = Language.StringByID(StringId.offLogic);

			}

			}
			break;
			case "wol":
			{
			if (value == "on")
			{
			button1.Text = Language.StringByID(StringId.onLogic);

			}

			}
			break;

			case "set_volume":
			{
			if (button2 == null)
			{
			//怕调试软件乱上东西导致抛异常
			break;
			}
			button2.Text = value;
			}
			break;
			case "signal":
			{
			if (button3 == null)
			{
			//怕调试软件乱上东西导致抛异常
			break;
			}
			var p = new PublicInterface();
			string key = p.GetKey(p.GetHisenseSignalSourceDic(), value);
			button3.Text = key;
			}
			break;
			}

			}
			}
			break;


			}
			}
			/// <summary>
			@@ -2018,7 +2644,7 @@
			/// <param name="keyValue"></param>
			/// <param name="dicList"></param>
			/// <returns></returns>
			public static string GetKeyValue(string keyValue, List<Dictionary<string, string>> dicList)
			public string GetKeyValue(string keyValue, List<Dictionary<string, string>> dicList)
			{

			string valueStr = "";
			@@ -2034,10 +2660,55 @@
			return valueStr;
			}
			/// <summary>
			/// 获取Key值
			/// </summary>
			/// <param name="dicList">注意:永远默认第一个元素</param>
			/// <returns></returns>
			public string GetKey(List<Dictionary<string, string>> dicList)
			{
			if (dicList.Count == 0)
			{
			return "";
			}
			return dicList[0]["key"].ToString();
			}
			/// <summary>
			/// 获取value值
			/// </summary>
			/// <param name="dicList">注意:永远默认第一个元素</param>
			/// <returns></returns>
			public string GetValue(List<Dictionary<string, string>> dicList)
			{
			if (dicList.Count == 0)
			{
			return "";
			}
			return dicList[0]["value"].ToString();
			}
			/// <summary>
			/// 获取温度单位
			/// </summary>
			/// <param name="device"></param>
			/// <returns></returns>
			public string GetTemperatureUnit(Entity.Function device)
			{
			string unit = string.Empty;
			if (device.GetAttribute("temperature_type") != null)
			{
			unit = device.GetAttribute("temperature_type").unit;
			}
			if (string.IsNullOrEmpty(unit))
			{
			//调试软件有空能上传为空
			unit = "℃";
			}
			return unit;
			}
			/// <summary>
			///获取自动化名称
			/// </summary>
			/// <returns> 新建自动化命名规则</returns>
			public static string GetLogicName(Logic logic)
			public string GetLogicName(Logic logic)
			{

			string name = "";
			@@ -2060,16 +2731,17 @@
			}
			break;
			case "3":
			case "9":
			{
			//用sid找到设备；
			var device = LogicMethod.CurrLogicMethod.GetDevice(inputCondition.sid);
			var device = LogicMethod.Current.GetDevice(inputCondition.sid);
			name = device.name + "-";
			}
			break;
			case "10":
			{
			//用sid找到场景；
			var scene = LogicMethod.CurrLogicMethod.GetSecne(inputCondition.sid);
			var scene = LogicMethod.Current.GetSecne(inputCondition.sid);
			name = scene.name + "-";
			}
			break;
			@@ -2084,29 +2756,23 @@
			case "1":
			{
			//用sid找到设备；
			var device = LogicMethod.CurrLogicMethod.GetDevice(outputTarget.sid);
			var device = LogicMethod.Current.GetDevice(outputTarget.sid);
			//显示设备名称
			name += device.name;
			string stateStr = "";
			//区别不同设备，显示不同设备状态
			switch (device.spk)
			{
			case SPK.MechanicalArm:
			case SPK.AirSwitch:
			case SPK.LightSwitch:
			{//开关灯

			foreach (var dic in dicList)
			string value = this.GetValue(dicList);
			stateStr = Language.StringByID(StringId.offLogic);
			if (value == "on")
			{
			string value = dic["value"];
			if (value == "on")
			{
			stateStr = Language.StringByID(StringId.onLogic);
			stateStr = Language.StringByID(StringId.onLogic);

			}
			else
			{
			stateStr = Language.StringByID(StringId.offLogic);
			}
			}
			}
			break;
			@@ -2115,8 +2781,8 @@
			case SPK.LightCCT:
			case SPK.LightDimming:
			{
			string on_off = InpOrOutLogicMethod.GetKeyValue("on_off", dicList);
			string brightness = InpOrOutLogicMethod.GetKeyValue("brightness", dicList);
			string on_off = this.GetKeyValue("on_off", dicList);
			string brightness = this.GetKeyValue("brightness", dicList);
			if (on_off == "on" && brightness != "")
			{
			stateStr = Language.StringByID(StringId.onLogic) + brightness + "%";
			@@ -2165,20 +2831,16 @@
			break;
			case SPK.AcStandard:
			case SPK.HvacAC:
			case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
			case SPK.AcIr:
			case SPK.FloorHeatStandard:
			case SPK.HvacFloorHeat:
			{
			foreach (var dic in dicList)
			string value = this.GetValue(dicList);
			stateStr = Language.StringByID(StringId.offLogic);
			if (value == "on")
			{
			string value = dic["value"];
			if (value == "on")
			{
			stateStr = Language.StringByID(StringId.onLogic);
			stateStr = Language.StringByID(StringId.onLogic);

			}
			else if (value == "off")
			{
			stateStr = Language.StringByID(StringId.offLogic);
			}
			}

			}
			@@ -2191,7 +2853,7 @@
			case "2":
			{
			//用sid找到场景；
			var scene = LogicMethod.CurrLogicMethod.GetSecne(outputTarget.sid);
			var scene = LogicMethod.Current.GetSecne(outputTarget.sid);
			name += scene.name;

			}
			@@ -2199,7 +2861,7 @@
			case "3":
			{
			//用sid找到安防；
			var security = LogicMethod.CurrLogicMethod.GetSecurity(outputTarget.sid);
			var security = LogicMethod.Current.GetSecurity(outputTarget.sid);
			name += security.name;

			}
			@@ -2287,40 +2949,44 @@
			/// <returns></returns>
			private string GetTimeText(string strTimeValue)
			{
			var timeValue = int.Parse(strTimeValue);
			//因为调试软件上传为空过;
			string intTimeValue = string.IsNullOrEmpty(strTimeValue) ? "0" : strTimeValue;
			int timeValue = 0;
			int.TryParse(intTimeValue,out timeValue);
			string state = "";
			var minutes = timeValue / 60;
			var seconds = timeValue % 60;
			if (minutes != 0)
			{
			if (seconds == 0)
			{
			state = minutes.ToString() + Language.StringByID(StringId.minute);
			}
			else
			{
			state = minutes.ToString() + Language.StringByID(StringId.minute) + seconds.ToString() + Language.StringByID(StringId.s);
			}
			}
			else
			{
			if (seconds != 0)
			{
			state = seconds.ToString() + Language.StringByID(StringId.s);
			}
			}
			if (!string.IsNullOrEmpty(state))
			{
			state = Language.StringByID(StringId.delayLogic) + state;
			}
			return state;
			return LogicMethod.Current.getTimeStr(strTimeValue).Replace("0s","");
			//if (minutes != 0)
			//{
			// if (seconds == 0)
			// {
			// state = minutes.ToString() + Language.StringByID(StringId.minute);
			// }
			// else
			// {
			// state = minutes.ToString() + Language.StringByID(StringId.minute) + seconds.ToString() + Language.StringByID(StringId.s);
			// }
			//}
			//else
			//{
			// if (seconds != 0)
			// {
			// state = seconds.ToString() + Language.StringByID(StringId.s);
			// }
			//}
			//if (!string.IsNullOrEmpty(state))
			//{
			// state = Language.StringByID(StringId.delayLogic) + state;
			//}
			//return state;
			}
			/// <summary>
			/// 获取显示面熟文本
			/// </summary>
			/// <param name="dicList">状态数据列表</param>
			/// <returns></returns>
			private string GetText(List<Dictionary<string, string>> dicList,string key)
			private string GetText(List<Dictionary<string, string>> dicList, string key)
			{
			string strtext = "";
			foreach (var dic in dicList)
			@@ -2330,6 +2996,19 @@
			switch (key)
			{

			case "illuminance":
			{
			if (comparator == ">")
			{
			strtext = ">" + value;
			}
			else if (comparator == "<")
			{
			strtext = "<" + value;
			}

			}
			break;
			case "temperature":
			{
			if (comparator == ">")
			@@ -2361,6 +3040,11 @@
			strtext = Language.StringByID(StringId.co2) + new PublicInterface { }.GetString("co2", value);
			}
			break;
			case "pm10":
			{
			strtext = Language.StringByID(StringId.pm10) + new PublicInterface { }.GetString("pm25", value);
			}
			break;
			case "pm25":
			{
			strtext = Language.StringByID(StringId.pm25) + new PublicInterface { }.GetString("pm25", value);
			@@ -2380,15 +3064,16 @@
			}
			return strtext;
			}
			private void SensorView(FrameLayout thisView, Function device,string key, int indexVulae) {
			private void SensorView(FrameLayout thisView, Function device, string key, int indexVulae)
			{
			//这个设备比较特殊
			ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
			///当前的索引值数据对象
			Input inputedit = Logic.currlogic.input[indexVulae];
			///状态值
			string stateValue = "";
			foreach (var dic in inputedit.condition)
			for (int i = 0; i < inputedit.condition.Count; i++)
			{
			var dic = inputedit.condition[i];
			string comparator = dic["comparator"];
			stateValue = dic["value"];
			switch (key)
			@@ -2405,7 +3090,7 @@
			{
			titleInt = StringId.wendudiyu;
			}
			conditionDeviceFunList.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			}
			break;
			case "humidity":
			@@ -2419,32 +3104,88 @@
			{
			titleInt = StringId.shidudiyu;
			}
			conditionDeviceFunList.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
			}
			break;
			case "co2":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "co2", StringId.co2, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "co2", StringId.co2, indexVulae, true, stateValue);
			}
			break;
			case "pm10":
			{
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm10", StringId.pm10, indexVulae, true, stateValue);
			}
			break;
			case "pm25":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "pm25", StringId.pm25, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm25", StringId.pm25, indexVulae, true, stateValue);
			}
			break;
			case "tvoc":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "tvoc", StringId.tvoc, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "tvoc", StringId.tvoc, indexVulae, true, stateValue);
			}
			break;
			case "hcho":
			{
			conditionDeviceFunList.PmCo2TvocAction(thisView, device, "hcho", StringId.Formaldehyde, indexVulae, true, stateValue);
			ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "hcho", StringId.Formaldehyde, indexVulae, true, stateValue);
			}
			break;
			}
			}
			}
			/// <summary>
			/// 查找指定可视对讲userId
			/// </summary>
			/// <param name="userId"></param>
			/// <returns></returns>
			public Face GetFaceItem(string userId, string deviceId)
			{
			if (Send.Current.faceList.Count == 0)
			{
			Send.Current.GetListHomeFace(deviceId, false);
			}
			var face = Send.Current.faceList.Find((o) => { return o.userId == userId; });
			if (face == null)
			{
			face = new Face();
			}
			return face;
			}
			/// <summary>
			/// 查找指定萤石视频门锁userId
			/// </summary>
			/// <param name="userId"></param>
			/// <returns></returns>
			public Face GetVideoDoorLockUserItem(string userId, Function device)
			{
			if (Send.Current.VideoDoorLockUserListInfo.Count == 0)
			{
			Send.Current.GetVideoDoorLockUserListInfo(device);
			}
			var face = Send.Current.VideoDoorLockUserListInfo.Find((o) => { return o.userId == userId; });
			if (face == null)
			{
			face = new Face();
			}
			return face;
			}

			/// <summary>
			/// 删除最后一个 ","
			/// </summary>
			/// <param name="s">字符串</param>
			/// <returns></returns>
			public string RemoveLastStr(string s)
			{
			if (string.IsNullOrEmpty(s))
			{
			return string.Empty;
			}
			return s.Replace("[","").Replace("]","").Replace("\"","").TrimEnd(',');
			}

			}
			}