From d3189eaa6be7c70ed5ac783efe68f43211a90d27 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 20 七月 2023 08:58:56 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://172.16.1.23:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 52570e4..16d2d2d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -467,6 +467,12 @@
}
break;
+ case SPK.Ev_Ipcam:
+ if (inputCondition.identifier == "pir_event")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.On);
+ }
+ break;
case SPK.SensorPirHold:
{
string value = this.GetKeyValue("people_status", dicList);
@@ -1002,7 +1008,10 @@
//鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
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;
//鎻掑骇(鏈塙SB)
case SPK.PanelSocket:
{
@@ -1045,6 +1054,24 @@
case SPK.LightCCT:
case SPK.LightDimming:
{
+ if(device.spk == SPK.LightRGB)
+ {
+ string colorful = GetKeyValue(FunctionAttributeKey.Colorful, dicList);
+ if (!string.IsNullOrEmpty(colorful))
+ {
+ targetView.btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/groupControl.png";
+ if (colorful == "on")
+ {
+ stateStr = Language.StringByID(StringId.onLogic);
+ }
+ else if (colorful == "off")
+ {
+ stateStr = Language.StringByID(StringId.offLogic);
+ }
+
+ break;
+ }
+ }
string on_off = GetKeyValue("on_off", dicList);
string brightness = GetKeyValue("brightness", dicList);
if (on_off == "on" && brightness != "")
@@ -1189,11 +1216,7 @@
if (set_temp != "")
{
- string unit = device.GetAttribute("temperature_type") == null ? "鈩�" : device.GetAttribute("temperature_type").state;
- if (string.IsNullOrEmpty(unit))
- {
- unit = "鈩�";
- }
+ string unit =GetTemperatureUnit(device);
stateStr += set_temp + unit + ",";
}
@@ -1291,11 +1314,7 @@
}
if (set_temp != "")
{
- string unit = device.GetAttribute("temperature_type") == null ? "鈩�" : device.GetAttribute("temperature_type").state;
- if (string.IsNullOrEmpty(unit))
- {
- unit = "鈩�";
- }
+ string unit = GetTemperatureUnit(device);
stateStr += set_temp + unit + ",";
}
if (mode != "")
@@ -1800,7 +1819,7 @@
//鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
break;
}
- button2.Text = value + "鈩�";
+ button2.Text = value + GetTemperatureUnit(device); ;
}
break;
case "mode":
@@ -1913,7 +1932,7 @@
//鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
break;
}
- button2.Text = value + "鈩�";
+ button2.Text = value + GetTemperatureUnit(device); ;
}
break;
case "mode":
@@ -2365,6 +2384,25 @@
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 && device.GetAttribute("temperature_type").value.Count > 0)
+ {
+ unit = device.GetAttribute("temperature_type").value[0];
+ }
+ if (string.IsNullOrEmpty(unit))
+ {
+ //璋冭瘯杞欢鏈夌┖鑳戒笂浼犱负绌�
+ unit = "鈩�";
+ }
+ return unit;
+ }
+ /// <summary>
///鑾峰彇鑷姩鍖栧悕绉�
/// </summary>
/// <returns> 鏂板缓鑷姩鍖栧懡鍚嶈鍒�</returns>
--
Gitblit v1.8.0