From 9fd75dabbab6850751b33959329da782534514f7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 十二月 2020 16:54:52 +0800
Subject: [PATCH] 2020-12-02-2
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index f09d0b0..4f3d3c0 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -63,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);
@@ -86,7 +86,7 @@
{
bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * 5);
bghFrameLyout.AddChidren(vvBgh);
-
+ bghFrameLyout.BackgroundImagePath = "LogicIcon/bjicon5.png";
}
else
{
@@ -94,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
@@ -124,7 +125,10 @@
DeviceListView(vv, list);
};
-
+ if (roomList.Count-1==i) {
+ ///鏀瑰彉鏈�鍚庨偅鏉′竴涓嚎鐨勯鑹�,鐣岄潰鏄剧ず鏁堟灉浣滅敤;
+ areaView.btnLine.BackgroundColor = CSS.CSS_Color.view;
+ }
}
};
funAllAreaView.btnText1.MouseUpEventHandler += roomClick;
@@ -148,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);
@@ -177,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
@@ -212,7 +217,11 @@
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;
--
Gitblit v1.8.0