From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index 4e767eb..addf896 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -14,7 +14,7 @@
/// <summary>
/// 榛樿閫変腑鏄埧闂存椂锛氬叏閮ㄥ尯鍩�
/// </summary>
- private Entity.Room selectedRoom = new Entity.Room { sid = Language.StringByID(StringId.allAreas) };
+ private Entity.Room selectedRoom = new Entity.Room { roomId ="6688" };
/// <summary>
/// 琛ㄧず鏄�(鏉′欢/鐩爣)
/// </summary>
@@ -81,7 +81,8 @@
Width = Application.GetRealWidth(144),
Height = Application.GetRealHeight(44 * 5),
};
- var roomList = LogicMethod.GetGatewayRoomList(Language.StringByID(StringId.allAreas));
+ var roomList = LogicMethod.CurrLogicMethod.GetGatewayRoomList(Language.StringByID(StringId.allAreas));
+
if (roomList.Count > 5)
{
bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * 5);
@@ -94,7 +95,7 @@
bghFrameLyout.AddChidren(areaBgh);
bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * roomList.Count);
areaBgh.Height = Application.GetRealHeight(44 * roomList.Count);
- bghFrameLyout.BackgroundImagePath = $"LogicIcon/bjicon{roomList.Count+1}.png";
+ bghFrameLyout.BackgroundImagePath = $"LogicIcon/bjicon{roomList.Count}.png";
}
#endregion
@@ -111,17 +112,17 @@
areaView.frameLayout.Y = Application.GetRealHeight(i * 44);
areaBgh.AddChidren(areaView.FLayoutView());
}
- areaView.btnRoomName.Text = room.name;
+ areaView.btnRoomName.Text = room.roomName;
areaView.btnClick.Tag = room;
areaView.btnClick.MouseUpEventHandler += (sender2, e2) =>
{
fLayout.RemoveFromParent();
- funAllAreaView.btnText1.Text = (areaView.btnClick.Tag as Entity.Room).name;
+ funAllAreaView.btnText1.Text = (areaView.btnClick.Tag as Entity.Room).roomName;
///鍒囨崲鎴块棿榛樿鍔熻兘绫诲瀷鍏ㄩ儴;
funAllAreaView.btnText2.Text = Language.StringByID(StringId.allFun);
selectedRoom = (areaView.btnClick.Tag as Entity.Room);
///鑾峰彇鏄剧ず璁惧鍒楄〃
- var list = LogicMethod.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room,if_type);
+ var list = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room,if_type);
DeviceListView(vv, list);
};
@@ -135,6 +136,15 @@
funAllAreaView.btnIcon1.MouseUpEventHandler += roomClick;
//鍔熻兘鐐瑰嚮浜嬩欢
EventHandler<MouseEventArgs> funClick = (sender3, e3) =>{
+
+ //鑾峰彇鏈�缁堟樉绀哄垪琛�
+ var functionList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(selectedRoom, if_type);
+ //鑾峰彇璁惧鍒楄〃鐨勭被鍨嬶紙渚嬪锛氱伅鍏夌被锛岀獥甯樼被銆傘�傘�傦級
+ var deviceTypeList = LogicMethod.CurrLogicMethod.GetDeviceTypeList(functionList);
+ if (deviceTypeList.Count==0) {
+ //娌℃湁绫诲瀷鐩存帴杩斿洖鍘�;
+ return;
+ }
#region 鍖哄煙寮规鐣岄潰
FrameLayout fLayout = new FrameLayout
{
@@ -148,7 +158,7 @@
FrameLayout bghFrameLyout = new FrameLayout
{
- X = Application.GetRealWidth(10),
+ X = Application.GetRealWidth(118),
Y = Application.GetRealHeight(103),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(21 + 44),
@@ -171,10 +181,7 @@
Height = Application.GetRealHeight(44 * 5),
};
- //鑾峰彇鏈�缁堟樉绀哄垪琛�
- var functionList = LogicMethod.GetFunctionDeviceList(selectedRoom, if_type);
- //鑾峰彇璁惧鍒楄〃鐨勭被鍨嬶紙渚嬪锛氱伅鍏夌被锛岀獥甯樼被銆傘�傘�傦級
- var deviceTypeList = LogicMethod.GetDeviceTypeList(functionList);
+
if (deviceTypeList.Count > 5)
@@ -188,7 +195,7 @@
bghFrameLyout.AddChidren(areaBgh);
bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * deviceTypeList.Count);
areaBgh.Height = Application.GetRealHeight(44 * deviceTypeList.Count);
- bghFrameLyout.BackgroundImagePath = $"LogicIcon/bjicon{deviceTypeList.Count+1}.png";
+ bghFrameLyout.BackgroundImagePath = $"LogicIcon/bjicon{deviceTypeList.Count}.png";
}
#endregion
@@ -212,9 +219,9 @@
fLayout.RemoveFromParent();
funAllAreaView.btnText2.Text = areaView.btnClick.Tag.ToString();
///鑾峰彇鍗曚釜绫诲瀷锛堜緥濡傦細鐏厜绫汇�傘�傦級璁惧FunctionType鍒楄〃
- var typeFunctionList = LogicMethod.GetDeviceTypeFunctionList(areaView.btnClick.Tag.ToString());
- ///鑾峰彇鍗曚釜绫诲瀷锛堜緥濡傦細鐏厜绫汇�傘�傦級鏄剧ず璁惧鍒楄〃
- var lists = LogicMethod.GetShowDeviceList(typeFunctionList, functionList);
+ var typeFunctionList = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(areaView.btnClick.Tag.ToString());
+ ///鑾峰彇鍗曚釜鐏厜绫诲瀷锛堜緥濡傦細鐏厜1,鐏厜2銆傘�傦級鏄剧ず璁惧鍒楄〃
+ var lists = LogicMethod.CurrLogicMethod.GetShowDeviceList(typeFunctionList, functionList);
DeviceListView(vv, lists);
};
if (deviceTypeList.Count - 1 == i)
@@ -227,7 +234,7 @@
funAllAreaView.btnText2.MouseUpEventHandler += funClick;
funAllAreaView.btnIcon2.MouseUpEventHandler += funClick;
///鑾峰彇鏄剧ず璁惧鍒楄〃
- var deviceList = LogicMethod.GetFunctionDeviceList(selectedRoom, if_type);
+ var deviceList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(selectedRoom, if_type);
DeviceListView(vv, deviceList);
}
@@ -248,7 +255,7 @@
funView.btnLine.X = Application.GetRealWidth(16);
funView.btnLine.Width = Application.GetRealWidth(343);
verticalScrolView.AddChidren(funView.FLayoutView());
- funView.btnIcon.UnSelectedImagePath = LogicMethod.GetIconPath(dev.functionType);
+ funView.btnIcon.UnSelectedImagePath = LogicMethod.CurrLogicMethod.GetIconPath(dev.spk);
funView.btnDeviceName.Text = dev.name;
funView.btnRoomName.Text = dev.GetRoomListName();
funView.btnClick.MouseUpEventHandler += (sen,e) => {
--
Gitblit v1.8.0