From 18c8ba14183bf72fd01e595124a9614bc4c7d6a3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 23 十月 2023 14:34:16 +0800
Subject: [PATCH] 2.3版本
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 345ebdd..f99b97c 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;
}
@@ -269,11 +269,11 @@
case SPK.SensorHelp:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
- view.btnText.TextID = StringId.qiujiuandzhengchang;
+ view.btnText.TextID = StringId.qiujiu;
fLayout.AddChidren(view.FLayoutView());
view.btnClick.MouseUpEventHandler += (sender, e) =>
{
- DeviceView(device, view.btnState, StringId.qiujiu, StringId.zhengchang );
+ DeviceView(device, view.btnState, StringId.qiujiu, StringId.zhengchang,1);
};
if (edit)
{
@@ -895,7 +895,7 @@
/// <param name="button">閫変腑鐘舵�佹樉绀烘枃鏈珺tn鎺т欢</param>
/// <param name="btnText1">灞炴�х姸鎬佸�兼枃鏈�1</param>
/// <param name="btnText2">灞炴�х姸鎬佸�兼枃鏈�2</param>
- /// <param name="viewCount">view鏁伴噺</param>
+ /// <param name="viewCount">view鏁伴噺,榛樿2涓獀iew</param>
private void DeviceView(Entity.Function device, Button button, int btnText1, int btnText2,int viewCount=2)
{
FrameLayout frame = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence };
@@ -998,11 +998,19 @@
case StringId.onLogic:
{
value = "on";
+ if (device.spk== SPK.SensorDryContact) {
+ value = "open";
+ }
+
}
break;
case StringId.offLogic:
{
value = "off";
+ if (device.spk == SPK.SensorDryContact)
+ {
+ value = "close";
+ }
}
break;
case StringId.youren:
@@ -1113,10 +1121,12 @@
}
}
int max = 100;
+ int min = 1;
if (device.spk == SPK.SensorLight)
{
//鐓ф槑浼犳劅鍣�
- max =int.MaxValue;
+ min = 0;
+ max =1200;
}
new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) =>
@@ -1163,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>
@@ -1392,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;
--
Gitblit v1.8.0