From a9d1161b1df96e7ddad566335989a1444e433ef5 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 11:54:45 +0800
Subject: [PATCH] 2023年03月28日11:52:02
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index 00c2315..85ff3c3 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -244,12 +244,20 @@
var typeFunctionList = LogicMethod.Current.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);
///鑾峰彇璁惧鍗曚釜灏忕被鍒楄〃锛堜緥濡傦細鐏厜1,鐏厜2...锛�
var lists = LogicMethod.Current.GetShowDeviceList(typeFunctionList, deviceList);
+ if (string.IsNullOrEmpty(UserInfo.Current.logicselectedRoom.roomName))
+ {
+ UserInfo.Current.logicselectedRoom.roomName = Language.StringByID(StringId.allAreas);
+ }
///鎴块棿鍚嶇О
funAllAreaView.btnText1.Text = UserInfo.Current.logicselectedRoom.roomName;
+ if (string.IsNullOrEmpty(UserInfo.Current.logicselectedFunction))
+ {
+ UserInfo.Current.logicselectedFunction = Language.StringByID(StringId.allFun);
+ }
///璁惧澶х被鍚嶇О<鐏厜绫汇�傘�傘�傘�傘��>
funAllAreaView.btnText2.Text = UserInfo.Current.logicselectedFunction;
this.LoadingDeviceListView(vv, lists);
-
+
}
/// <summary>
/// 鏄剧ず璁惧鐨刅iew
@@ -275,9 +283,10 @@
funView.btnLine.X = Application.GetRealWidth(16);
funView.btnLine.Width = Application.GetRealWidth(343);
verticalScrolView.AddChidren(funView.FLayoutView());
- funView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetIconPath(dev.spk);
+ funView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetDeviceIconPath(dev);
funView.btnDeviceName.Text = dev.name;
funView.btnRoomName.Text = dev.GetRoomListName();
+
funView.btnClick.MouseUpEventHandler += (sen, e) =>
{
if (if_Type == LogicMethod.condition_if)
--
Gitblit v1.8.0