From 23606832f1fe19ba021d212ef0c04dc31e33f375 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 11 三月 2022 10:18:54 +0800
Subject: [PATCH] 2022-03-11-01
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 86 ++++++++++++++++++++++++-------------------
1 files changed, 48 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index addf896..8cc3709 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -5,44 +5,46 @@
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
- public class FunTpye : FrameLayout
+ public class FunTpye
{
- public FunTpye()
+ public FunTpye(string str)
{
- Tag = "Logic";
+ if_type = str;
}
/// <summary>
/// 榛樿閫変腑鏄埧闂存椂锛氬叏閮ㄥ尯鍩�
/// </summary>
- private Entity.Room selectedRoom = new Entity.Room { roomId ="6688" };
+ 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;
- public void Show(string str)
- {
-
- if_type = str;
- this.BackgroundColor = CSS.CSS_Color.viewMiddle;
- LogicView.TopView topView = new LogicView.TopView();
- this.AddChidren(topView.FLayoutView());
- topView.clickBackBtn.MouseUpEventHandler += (e, sen) =>
- {
- RemoveFromParent();
- };
- topView.topNameBtn.TextID = StringId.selectedFunCondition;
+ /// <summary>
+ /// 璁惧鍔熻兘ui
+ /// </summary>
+ /// <param name="viewLayout">鐖舵帶浠�</param>
+ /// <param name="bottm"></param>
+ /// <param name="funCount">鏀寔鍔熻兘绫诲瀷涓暟<琛ㄧず涓婇潰鎵�鍗犻珮搴�></param>
+ public void FunTypeView(FrameLayout viewLayout,int bottm,int funCount) {
LogicView.FunAllAreaView funAllAreaView = new LogicView.FunAllAreaView();
- funAllAreaView.frameLayout.Y = topView.frameLayout.Bottom;
- this.AddChidren(funAllAreaView.FLayoutView());
-
+ funAllAreaView.frameLayout.Y = bottm + Application.GetRealHeight(8);
+ viewLayout.AddChidren(funAllAreaView.FLayoutView());
VerticalScrolViewLayout vv = new VerticalScrolViewLayout
{
- Y = Application.GetRealHeight(117),
- Height = Application.GetRealHeight(667 - 117),
+ Y = funAllAreaView.frameLayout.Bottom,
+ Height = Application.GetRealHeight(667 - 64 - 50 * funCount - 8),
};
- this.AddChidren(vv);
-
+ viewLayout.AddChidren(vv);
+ if (!MainView.IsGatewayType)
+ {
+ funAllAreaView.frameLayout.Y = Application.GetRealHeight(0);
+ }
//鎴块棿鐐瑰嚮浜嬩欢
EventHandler<MouseEventArgs> roomClick = (sender, e) =>
{
@@ -51,7 +53,7 @@
{
BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
};
- this.AddChidren(fLayout);
+ viewLayout.AddChidren(fLayout);
fLayout.MouseUpEventHandler += (sender1, e1) =>
{
fLayout.RemoveFromParent();
@@ -60,7 +62,7 @@
FrameLayout bghFrameLyout = new FrameLayout
{
X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(103),
+ Y = Application.GetRealHeight(103 + 50 * funCount + 8-64),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(21 + 44),
//BackgroundImagePath = "LogicIcon/bjicon.png",
@@ -82,7 +84,7 @@
Height = Application.GetRealHeight(44 * 5),
};
var roomList = LogicMethod.CurrLogicMethod.GetGatewayRoomList(Language.StringByID(StringId.allAreas));
-
+
if (roomList.Count > 5)
{
bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * 5);
@@ -122,11 +124,12 @@
funAllAreaView.btnText2.Text = Language.StringByID(StringId.allFun);
selectedRoom = (areaView.btnClick.Tag as Entity.Room);
///鑾峰彇鏄剧ず璁惧鍒楄〃
- var list = LogicMethod.CurrLogicMethod.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);
};
- if (roomList.Count-1==i) {
+ if (roomList.Count - 1 == i)
+ {
///鏀瑰彉鏈�鍚庨偅鏉′竴涓嚎鐨勯鑹�,鐣岄潰鏄剧ず鏁堟灉浣滅敤;
areaView.btnLine.BackgroundColor = CSS.CSS_Color.view;
}
@@ -135,13 +138,15 @@
funAllAreaView.btnText1.MouseUpEventHandler += roomClick;
funAllAreaView.btnIcon1.MouseUpEventHandler += roomClick;
//鍔熻兘鐐瑰嚮浜嬩欢
- EventHandler<MouseEventArgs> funClick = (sender3, e3) =>{
+ EventHandler<MouseEventArgs> funClick = (sender3, e3) =>
+ {
//鑾峰彇鏈�缁堟樉绀哄垪琛�
var functionList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(selectedRoom, if_type);
//鑾峰彇璁惧鍒楄〃鐨勭被鍨嬶紙渚嬪锛氱伅鍏夌被锛岀獥甯樼被銆傘�傘�傦級
var deviceTypeList = LogicMethod.CurrLogicMethod.GetDeviceTypeList(functionList);
- if (deviceTypeList.Count==0) {
+ if (deviceTypeList.Count == 0)
+ {
//娌℃湁绫诲瀷鐩存帴杩斿洖鍘�;
return;
}
@@ -150,7 +155,7 @@
{
BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
};
- this.AddChidren(fLayout);
+ viewLayout.AddChidren(fLayout);
fLayout.MouseUpEventHandler += (sender1, e1) =>
{
fLayout.RemoveFromParent();
@@ -159,7 +164,7 @@
FrameLayout bghFrameLyout = new FrameLayout
{
X = Application.GetRealWidth(118),
- Y = Application.GetRealHeight(103),
+ Y = Application.GetRealHeight(103 + 50 * funCount + 8-64),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(21 + 44),
//BackgroundImagePath = "LogicIcon/bjicon5.png",
@@ -181,7 +186,7 @@
Height = Application.GetRealHeight(44 * 5),
};
-
+
if (deviceTypeList.Count > 5)
@@ -238,12 +243,14 @@
DeviceListView(vv, deviceList);
}
+
+
/// <summary>
/// 鏄剧ず璁惧鐨刅iew
/// </summary>
/// <param name="verticalScrolView">涓婁笅婊戝姩</param>
/// <param name="deviceList"></param>
- public void DeviceListView(VerticalScrolViewLayout verticalScrolView, List<HDL_ON.Entity.Function> deviceList)
+ public void DeviceListView(VerticalScrolViewLayout verticalScrolView, List<HDL_ON.Entity.Function> deviceList)
{
verticalScrolView.RemoveAll();
foreach (var dev in deviceList)
@@ -258,19 +265,22 @@
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) {
+ 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 {
+ }
+ 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