From 4cc40d883a00869f9aeec20e120d09c14ab427fb Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 08 四月 2022 13:05:18 +0800
Subject: [PATCH] 2022年04月08日13:03:36
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 120 ++++++++++++++++++++++++++++--------------------------------
1 files changed, 56 insertions(+), 64 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index f7b44a0..7402009 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -12,15 +12,6 @@
if_type = str;
}
/// <summary>
- /// 榛樿閫変腑鏄埧闂存椂锛氬叏閮ㄥ尯鍩�
- /// </summary>
- //public static Entity.Room selectedRoom = new Entity.Room { roomId ="6688" };
-
- /// <summary>
- /// 榛樿閫変腑鏄澶囩被鍨嬫椂锛氬叏閮ㄥ姛鑳�
- /// </summary>
- //public static Entity.Room selectedRoom = new Entity.Room { roomId = "6688" };
- /// <summary>
/// 琛ㄧず鏄�(鏉′欢/鐩爣)
/// </summary>
private string if_type;
@@ -43,7 +34,9 @@
viewLayout.AddChidren(vv);
if (!MainView.IsGatewayType)
{
+ //濡傛灉鏄痓us缃戝叧閲嶇疆楂樺害;
funAllAreaView.frameLayout.Y = Application.GetRealHeight(0);
+ vv.Y = funAllAreaView.frameLayout.Bottom;
}
//鎴块棿鐐瑰嚮浜嬩欢
EventHandler<MouseEventArgs> roomClick = (sender, e) =>
@@ -124,11 +117,12 @@
funAllAreaView.btnText2.Text = Language.StringByID(StringId.allFun);
//selectedRoom = (areaView.btnClick.Tag as Entity.Room);
UserInfo.Current.logicselectedRoom = (areaView.btnClick.Tag as Entity.Room);
- UserInfo.Current.logicselectedFunction = "";
+ ///鍒囨崲鎴块棿榛樿:鍏ㄩ儴鍔熻兘
+ UserInfo.Current.logicselectedFunction = Language.StringByID(StringId.allFun);
///鑾峰彇鏄剧ず璁惧鍒楄〃
var list = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room, if_type);
- DeviceListView(vv, list);
+ this.LoadingDeviceListView(vv, list);
};
if (roomList.Count - 1 == i)
{
@@ -139,7 +133,7 @@
};
funAllAreaView.btnText1.MouseUpEventHandler += roomClick;
funAllAreaView.btnIcon1.MouseUpEventHandler += roomClick;
- //鍔熻兘鐐瑰嚮浜嬩欢
+ //鍔熻兘绫诲瀷鐐瑰嚮浜嬩欢
EventHandler<MouseEventArgs> funClick = (sender3, e3) =>
{
@@ -226,11 +220,11 @@
fLayout.RemoveFromParent();
funAllAreaView.btnText2.Text = areaView.btnClick.Tag.ToString();
UserInfo.Current.logicselectedFunction = areaView.btnClick.Tag.ToString();
- ///鑾峰彇鍗曚釜绫诲瀷锛堜緥濡傦細鐏厜绫汇�傘�傦級璁惧FunctionType鍒楄〃
- var typeFunctionList = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);
- ///鑾峰彇鍗曚釜鐏厜绫诲瀷锛堜緥濡傦細鐏厜1,鐏厜2銆傘�傦級鏄剧ず璁惧鍒楄〃
- var lists2 = LogicMethod.CurrLogicMethod.GetShowDeviceList(typeFunctionList, functionList);
- DeviceListView(vv, lists2);
+ ///鑾峰彇璁惧鍗曚釜澶х被spk鍒楄〃锛堜緥濡�:鐏厜绫�,绌鸿皟绫�...锛�
+ var typeFunctionList2 = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);
+ ///鑾峰彇璁惧鍗曚釜灏忕被鍒楄〃锛堜緥濡傦細鐏厜1,鐏厜2...锛�
+ var lists2 = LogicMethod.CurrLogicMethod.GetShowDeviceList(typeFunctionList2, functionList);
+ this.LoadingDeviceListView(vv, lists2);
};
if (deviceTypeList.Count - 1 == i)
@@ -242,25 +236,17 @@
};
funAllAreaView.btnText2.MouseUpEventHandler += funClick;
funAllAreaView.btnIcon2.MouseUpEventHandler += funClick;
- ///鑾峰彇鏄剧ず璁惧鍒楄〃
+ ///鑾峰彇鎴块棿鏀寔鐨勮澶囧垪琛�
var deviceList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(UserInfo.Current.logicselectedRoom, if_type);
-
- if (!string.IsNullOrEmpty(UserInfo.Current.logicselectedFunction))
- {
-
- ///鑾峰彇鍗曚釜绫诲瀷锛堜緥濡傦細鐏厜绫汇�傘�傦級璁惧FunctionType鍒楄〃
- var typeFunctionList = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);
- ///鑾峰彇鍗曚釜鐏厜绫诲瀷锛堜緥濡傦細鐏厜1,鐏厜2銆傘�傦級鏄剧ず璁惧鍒楄〃
- var lists = LogicMethod.CurrLogicMethod.GetShowDeviceList(typeFunctionList, deviceList);
-
- funAllAreaView.btnText2.Text = UserInfo.Current.logicselectedFunction;
- DeviceListView(vv, lists);
- }
- else
- {
- DeviceListView(vv, deviceList);
- }
+ ///鑾峰彇璁惧鍗曚釜澶х被spk鍒楄〃锛堜緥濡�:鐏厜绫�,绌鸿皟绫�...锛�
+ var typeFunctionList = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);
+ ///鑾峰彇璁惧鍗曚釜灏忕被鍒楄〃锛堜緥濡傦細鐏厜1,鐏厜2...锛�
+ var lists = LogicMethod.CurrLogicMethod.GetShowDeviceList(typeFunctionList, deviceList);
+ ///鎴块棿鍚嶇О
funAllAreaView.btnText1.Text = UserInfo.Current.logicselectedRoom.roomName;
+ ///璁惧澶х被鍚嶇О<鐏厜绫汇�傘�傘�傘�傘��>
+ funAllAreaView.btnText2.Text = UserInfo.Current.logicselectedFunction;
+ this.LoadingDeviceListView(vv, lists);
}
@@ -269,40 +255,46 @@
/// </summary>
/// <param name="verticalScrolView">涓婁笅婊戝姩</param>
/// <param name="deviceList"></param>
- public void DeviceListView(VerticalScrolViewLayout verticalScrolView, List<HDL_ON.Entity.Function> deviceList)
+ private void LoadingDeviceListView(VerticalScrolViewLayout verticalScrolView, List<HDL_ON.Entity.Function> deviceList)
{
-
- verticalScrolView.RemoveAll();
- foreach (var dev in deviceList)
+ System.Threading.Tasks.Task.Run(() =>
{
- LogicView.SelectTypeView funView = new LogicView.SelectTypeView();
- funView.btnText.Visible = false;
- funView.btnDeviceName.Visible = true;
- funView.btnRoomName.Visible = true;
- 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.btnDeviceName.Text = dev.name;
- funView.btnRoomName.Text = dev.GetRoomListName();
- funView.btnClick.MouseUpEventHandler += (sen, e) => {
- if (if_type == LogicMethod.condition_if)
+ Application.RunOnMainThread(() =>
+ {
+ verticalScrolView.RemoveAll();
+ foreach (var dev in deviceList)
{
- ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
- MainPage.BasePageView.AddChidren(conditionDeviceFunList);
- conditionDeviceFunList.Show(dev, 0, false);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }
- else
- {
- TargetDeviceFunList targetDeviceFunList = new TargetDeviceFunList();
- MainPage.BasePageView.AddChidren(targetDeviceFunList);
- targetDeviceFunList.Show(dev, 0, false);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }
+ LogicView.SelectTypeView funView = new LogicView.SelectTypeView();
+ funView.btnText.Visible = false;
+ funView.btnDeviceName.Visible = true;
+ funView.btnRoomName.Visible = true;
+ 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.btnDeviceName.Text = dev.name;
+ funView.btnRoomName.Text = dev.GetRoomListName();
+ funView.btnClick.MouseUpEventHandler += (sen, e) =>
+ {
+ if (if_type == LogicMethod.condition_if)
+ {
+ ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
+ MainPage.BasePageView.AddChidren(conditionDeviceFunList);
+ conditionDeviceFunList.Show(dev, 0, false);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
+ else
+ {
+ TargetDeviceFunList targetDeviceFunList = new TargetDeviceFunList();
+ MainPage.BasePageView.AddChidren(targetDeviceFunList);
+ targetDeviceFunList.Show(dev, 0, false);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
- };
- }
+ };
+ }
+ });
+ });
}
}
--
Gitblit v1.8.0