From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index ec9fca3..975533b 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -89,7 +89,6 @@
//绌鸿皟
case SPK.AcStandard:
case SPK.HvacAC:
- case SPK.HvacCac://姣涚粏绌鸿皟
//鍦扮儹
case SPK.FloorHeatStandard:
case SPK.HvacFloorHeat:
@@ -107,22 +106,6 @@
view.btnClick.MouseUpEventHandler += (sender, e) =>
{
DeviceView(device, view.btnState, StringId.onLogic, StringId.offLogic);
- };
- if (edit)
- {
- GetEditState(device, index, view.btnState, null, null, null);
- }
- }
- break;
- //绱ф�ュ懠鍙�
- case SPK.SensorHelp:
- {
- LogicView.FunTypeView view = new LogicView.FunTypeView();
- view.btnText.TextID = StringId.qiujiuandzhengchang;
- fLayout.AddChidren(view.FLayoutView());
- view.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- DeviceView(device, view.btnState, StringId.qiujiu, StringId.zhengchang);
};
if (edit)
{
@@ -585,13 +568,13 @@
}
if (intValue == 1)
{
- //璺屽�掓姤璀�
+
view2.frameLayout.Visible = false;
}
else if (intValue == 2)
{
- //鏈変汉鎶ヨ
+
view2.frameLayout.Y = Application.GetRealHeight(0);
}
if (edit)
@@ -706,7 +689,6 @@
case SPK.SensorGas:
case SPK.SensorWater:
case SPK.SensorSmoke:
- case SPK.SensorHelp:
{
keyVlaue = "status";
if (!Is_SpkAttribute(keyVlaue)) {
@@ -995,7 +977,7 @@
});
}
/// <summary>
- ///
+ /// 鍙瀵硅涓撶敤
/// </summary>
/// <param name="frame">褰撳墠鐣岄潰</param>
/// <param name="device">褰撳墠璁惧</param>
@@ -1026,7 +1008,7 @@
//鐣岄潰鏄剧ず閫変腑鍊�
btnState.Text = face.userName;
//鏁版嵁灏佽
- AddDictionary("open_type", "1", "string");
+ AddDictionary("open_type", "1", "integer");
AddDictionary("user_id", face.userId, "string");
}, false);
--
Gitblit v1.8.0