From d720466cffce3bea2ee92e419f64a92da6ab7e18 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 06 十一月 2023 15:34:24 +0800
Subject: [PATCH] 国际化支持：场景增加自动化使能配置
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 7d455a8..d64166b 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -239,7 +239,7 @@
int h = time / (60 * 60);
int m = time % (60 * 60) / 60;
int s = (time % (60 * 60) % 60);
- view2.btnState.Text = inputs.hold_time + "s";
+ view2.btnState.Text = LogicMethod.Current.getTimeStr(inputs.hold_time);
view2.btnState.Name = h + ":" + m + ":" + s;
this.hold_time = inputs.hold_time;
}
@@ -758,7 +758,7 @@
fLayout.AddChidren(viewEzIpcam.FLayoutView());
viewEzIpcam.btnClick.MouseUpEventHandler += (sender, e) =>
{
- this.identifier = "motiondetect_event";//浜轰綋鎰熷簲鍛婅
+ this.identifier = Constant.intelligentDetection_event;//浜轰綋鎰熷簲鍛婅
this.DeviceView(device, viewEzIpcam.btnState, StringId.shi, StringId.offLogic, 1);
};
@@ -1121,9 +1121,11 @@
}
}
int max = 100;
+ int min = 1;
if (device.spk == SPK.SensorLight)
{
//鐓ф槑浼犳劅鍣�
+ min = 0;
max =1200;
}
@@ -1171,12 +1173,12 @@
key = "illuminance";
comparator = "<";
}
- break;
+ break ;
}
selectedState = device.spk + "_" + value;
AddDictionary(key, value, data_type, comparator);
SaveInput(device,index, edit);
- },1,max);
+ },min,max);
}
/// PM2.5,Co2,Tvoc璁剧疆鍊�
/// </summary>
@@ -1400,7 +1402,7 @@
this.hold_time = (h + m + s).ToString();
if (button != null)
{
- button.Text = this.hold_time + "s";
+ button.Text = LogicMethod.Current.getTimeStr(this.hold_time);
button.Name = timeValue;
}
selectedState = device.spk + "_" + timeValue;
@@ -1451,7 +1453,7 @@
}
break;
case SPK.Ev_Ipcam:
- if (inputs.identifier == "motiondetect_event")
+ if (inputs.identifier == Constant.intelligentDetection_event)
{
button1.Text = Language.StringByID(StringId.shi);
}
--
Gitblit v1.8.0