From 19397c2a95efa904cccaf299363dc0111af28042 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 八月 2023 19:47:53 +0800
Subject: [PATCH] 2023年08月07日19:47:43
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index 6a3bd4e..85ff3c3 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -30,7 +30,7 @@
VerticalScrolViewLayout vv = new VerticalScrolViewLayout
{
Y = funAllAreaView.frameLayout.Bottom,
- Height = Application.GetRealHeight(667 - 64 - 50 * funCount - 8),
+ Height = Application.GetRealHeight(667 - 64 - 50 * funCount - 8-50),
};
viewLayout.AddChidren(vv);
if (!MainView.IsGatewayType)
@@ -77,7 +77,7 @@
Width = Application.GetRealWidth(144),
Height = Application.GetRealHeight(44 * 5),
};
- var roomList = LogicMethod.CurrLogicMethod.GetGatewayRoomList(Language.StringByID(StringId.allAreas));
+ var roomList = LogicMethod.Current.GetGatewayRoomList(Language.StringByID(StringId.allAreas));
if (roomList.Count > 5)
{
@@ -121,7 +121,7 @@
///鍒囨崲鎴块棿榛樿:鍏ㄩ儴鍔熻兘
UserInfo.Current.logicselectedFunction = Language.StringByID(StringId.allFun);
///鑾峰彇鏄剧ず璁惧鍒楄〃
- var list = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room, if_Type);
+ var list = LogicMethod.Current.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room, if_Type);
this.LoadingDeviceListView(vv, list);
};
@@ -139,9 +139,9 @@
{
//鑾峰彇鏈�缁堟樉绀哄垪琛�
- var functionList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(UserInfo.Current.logicselectedRoom, if_Type);
+ var functionList = LogicMethod.Current.GetFunctionDeviceList(UserInfo.Current.logicselectedRoom, if_Type);
//鑾峰彇璁惧鍒楄〃鐨勭被鍨嬶紙渚嬪锛氱伅鍏夌被锛岀獥甯樼被銆傘�傘�傦級
- var deviceTypeList = LogicMethod.CurrLogicMethod.GetDeviceTypeList(functionList);
+ var deviceTypeList = LogicMethod.Current.GetDeviceTypeList(functionList);
if (deviceTypeList.Count == 0)
{
//娌℃湁绫诲瀷鐩存帴杩斿洖鍘�;
@@ -223,9 +223,9 @@
funAllAreaView.btnText2.Text = clickText;
UserInfo.Current.logicselectedFunction = clickText;
///鑾峰彇璁惧鍗曚釜澶х被spk鍒楄〃锛堜緥濡�:鐏厜绫�,绌鸿皟绫�...锛�
- var typeFunctionList2 = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(clickText);
+ var typeFunctionList2 = LogicMethod.Current.GetDeviceTypeFunctionList(clickText);
///鑾峰彇璁惧鍗曚釜灏忕被鍒楄〃锛堜緥濡傦細鐏厜1,鐏厜2...锛�
- var lists2 = LogicMethod.CurrLogicMethod.GetShowDeviceList(typeFunctionList2, functionList);
+ var lists2 = LogicMethod.Current.GetShowDeviceList(typeFunctionList2, functionList);
this.LoadingDeviceListView(vv, lists2);
};
@@ -239,17 +239,25 @@
funAllAreaView.btnText2.MouseUpEventHandler += funClick;
funAllAreaView.btnIcon2.MouseUpEventHandler += funClick;
///鑾峰彇鎴块棿鏀寔鐨勮澶囧垪琛�
- var deviceList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(UserInfo.Current.logicselectedRoom, if_Type);
+ var deviceList = LogicMethod.Current.GetFunctionDeviceList(UserInfo.Current.logicselectedRoom, if_Type);
///鑾峰彇璁惧鍗曚釜澶х被spk鍒楄〃锛堜緥濡�:鐏厜绫�,绌鸿皟绫�...锛�
- var typeFunctionList = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);
+ var typeFunctionList = LogicMethod.Current.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);
///鑾峰彇璁惧鍗曚釜灏忕被鍒楄〃锛堜緥濡傦細鐏厜1,鐏厜2...锛�
- var lists = LogicMethod.CurrLogicMethod.GetShowDeviceList(typeFunctionList, deviceList);
+ 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
@@ -258,6 +266,7 @@
/// <param name="deviceList"></param>
private void LoadingDeviceListView(VerticalScrolViewLayout verticalScrolView, List<HDL_ON.Entity.Function> deviceList)
{
+
loading.Start();
System.Threading.Tasks.Task.Run(() =>
{
@@ -274,9 +283,10 @@
funView.btnLine.X = Application.GetRealWidth(16);
funView.btnLine.Width = Application.GetRealWidth(343);
verticalScrolView.AddChidren(funView.FLayoutView());
- funView.btnIcon.UnSelectedImagePath = LogicMethod.CurrLogicMethod.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