From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 67 +++++++++++++++++++++++++--------
1 files changed, 50 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 bf7e4d7..4e767eb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -14,10 +14,15 @@
/// <summary>
/// 榛樿閫変腑鏄埧闂存椂锛氬叏閮ㄥ尯鍩�
/// </summary>
- private Entity.Room selectedRoom = new Entity.Room { name = Language.StringByID(StringId.allAreas) };
-
- public void Show()
+ private Entity.Room selectedRoom = new Entity.Room { sid = Language.StringByID(StringId.allAreas) };
+ /// <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());
@@ -58,7 +63,7 @@
Y = Application.GetRealHeight(103),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(21 + 44),
- BackgroundImagePath = "LogicIcon/bjicon.png",
+ //BackgroundImagePath = "LogicIcon/bjicon.png",
};
fLayout.AddChidren(bghFrameLyout);
@@ -76,12 +81,12 @@
Width = Application.GetRealWidth(144),
Height = Application.GetRealHeight(44 * 5),
};
- var roomList = LogicMethod.GetGatewayRoomListG(Language.StringByID(StringId.allAreas));
+ var roomList = LogicMethod.GetGatewayRoomList(Language.StringByID(StringId.allAreas));
if (roomList.Count > 5)
{
bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * 5);
bghFrameLyout.AddChidren(vvBgh);
-
+ bghFrameLyout.BackgroundImagePath = "LogicIcon/bjicon5.png";
}
else
{
@@ -89,6 +94,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";
}
#endregion
@@ -111,12 +117,18 @@
{
fLayout.RemoveFromParent();
funAllAreaView.btnText1.Text = (areaView.btnClick.Tag as Entity.Room).name;
+ ///鍒囨崲鎴块棿榛樿鍔熻兘绫诲瀷鍏ㄩ儴;
+ 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.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room,LogicMethod.condition_if);
DeviceListView(vv, list);
};
-
+ if (roomList.Count-1==i) {
+ ///鏀瑰彉鏈�鍚庨偅鏉′竴涓嚎鐨勯鑹�,鐣岄潰鏄剧ず鏁堟灉浣滅敤;
+ areaView.btnLine.BackgroundColor = CSS.CSS_Color.view;
+ }
}
};
funAllAreaView.btnText1.MouseUpEventHandler += roomClick;
@@ -140,7 +152,7 @@
Y = Application.GetRealHeight(103),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(21 + 44),
- BackgroundImagePath = "LogicIcon/bjicon.png",
+ //BackgroundImagePath = "LogicIcon/bjicon5.png",
};
fLayout.AddChidren(bghFrameLyout);
@@ -159,7 +171,9 @@
Height = Application.GetRealHeight(44 * 5),
};
- var functionList = LogicMethod.GetFunctionDeviceList(selectedRoom, LogicMethod.condition_if);
+ //鑾峰彇鏈�缁堟樉绀哄垪琛�
+ var functionList = LogicMethod.GetFunctionDeviceList(selectedRoom, if_type);
+ //鑾峰彇璁惧鍒楄〃鐨勭被鍨嬶紙渚嬪锛氱伅鍏夌被锛岀獥甯樼被銆傘�傘�傦級
var deviceTypeList = LogicMethod.GetDeviceTypeList(functionList);
@@ -167,13 +181,14 @@
{
bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * 5);
bghFrameLyout.AddChidren(vvBgh);
-
+ bghFrameLyout.BackgroundImagePath = "LogicIcon/bjicon5.png";
}
else
{
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";
}
#endregion
@@ -195,18 +210,24 @@
areaView.btnClick.MouseUpEventHandler += (sender, e2) =>
{
fLayout.RemoveFromParent();
- funAllAreaView.btnText1.Text = areaView.btnClick.Tag.ToString();
+ funAllAreaView.btnText2.Text = areaView.btnClick.Tag.ToString();
+ ///鑾峰彇鍗曚釜绫诲瀷锛堜緥濡傦細鐏厜绫汇�傘�傦級璁惧FunctionType鍒楄〃
var typeFunctionList = LogicMethod.GetDeviceTypeFunctionList(areaView.btnClick.Tag.ToString());
+ ///鑾峰彇鍗曚釜绫诲瀷锛堜緥濡傦細鐏厜绫汇�傘�傦級鏄剧ず璁惧鍒楄〃
var lists = LogicMethod.GetShowDeviceList(typeFunctionList, functionList);
DeviceListView(vv, lists);
};
-
+ if (deviceTypeList.Count - 1 == i)
+ {
+ ///鏀瑰彉鏈�鍚庨偅鏉′竴涓嚎鐨勯鑹�,鐣岄潰鏄剧ず鏁堟灉浣滅敤;
+ areaView.btnLine.BackgroundColor = CSS.CSS_Color.view;
+ }
}
};
funAllAreaView.btnText2.MouseUpEventHandler += funClick;
funAllAreaView.btnIcon2.MouseUpEventHandler += funClick;
-
- var deviceList = LogicMethod.GetFunctionDeviceList(selectedRoom, LogicMethod.condition_if);
+ ///鑾峰彇鏄剧ず璁惧鍒楄〃
+ var deviceList = LogicMethod.GetFunctionDeviceList(selectedRoom, if_type);
DeviceListView(vv, deviceList);
}
@@ -230,8 +251,20 @@
funView.btnIcon.UnSelectedImagePath = LogicMethod.GetIconPath(dev.functionType);
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