From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 269 +++++++++++++++++++++++++----------------------------
1 files changed, 129 insertions(+), 140 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index b8f664b..4f332e2 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -117,7 +117,7 @@
contentPageView = new PageLayout()
{
Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64-49+30),
+ Height = Application.GetRealHeight(667 - 64 - 49 + 30),
BackgroundColor = CSS_Color.MainBackgroundColor,
IsShowPoint = false
};
@@ -144,7 +144,7 @@
Height = Application.GetRealHeight(52),
};
roomPageView.AddChidren(roomFloorChangeView);
- #region 鎴块棿搴曢儴鍒囨崲鏄剧ず鍖哄煙
+ #region 鎴块棿椤堕儴鍒囨崲鏄剧ず鍖哄煙
/// <summary>
/// 鎴块棿鍖哄煙锛岄《閮ㄥ尯鍩�
/// </summary>
@@ -183,16 +183,16 @@
/// <summary>
/// 鏄剧ず鏂瑰紡鍒囨崲鎸夐挳
/// </summary>
- btnSwitchDipaly = new Button()
- {
- X = Application.GetRealWidth(335),
- Y = Application.GetRealHeight(12),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
- UnSelectedImagePath = "Classification/ToggleDisplayThumbnail.png",//缂╃暐鍥�
- SelectedImagePath = "Classification/ToggleDisplayLarge.png",
- };
- roomFloorChangeView.AddChidren(btnSwitchDipaly);
+ //btnSwitchDipaly = new Button()
+ //{
+ // X = Application.GetRealWidth(335),
+ // Y = Application.GetRealHeight(12),
+ // Width = Application.GetMinRealAverage(28),
+ // Height = Application.GetMinRealAverage(28),
+ // UnSelectedImagePath = "Classification/ToggleDisplayThumbnail.png",//缂╃暐鍥�
+ // SelectedImagePath = "Classification/ToggleDisplayLarge.png",
+ //};
+ //roomFloorChangeView.AddChidren(btnSwitchDipaly);
#endregion
/// <summary>
@@ -215,7 +215,7 @@
/// <summary>
/// 鍔犺浇鎴块棿鍒楄〃鍖哄煙
/// </summary>
- void LoadRoomRows ()
+ void LoadRoomRows()
{
roomListView.RemoveAll();
foreach (var room in roomsShowed)
@@ -261,84 +261,83 @@
#region 鐜鏁版嵁
var environmentalView = new FrameLayout()
- {
- Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
- Height = Application.GetRealHeight(32),
- Tag = "EnvironmentalView",
- };
- roomView.AddChidren(environmentalView);
+ {
+ Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
+ Height = Application.GetRealHeight(32),
+ Tag = "EnvironmentalView",
+ };
+ roomView.AddChidren(environmentalView);
- Button btnTempIcon = new Button()
- {
- X = Application.GetRealWidth(12),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png",
- };
- environmentalView.AddChidren(btnTempIcon);
+ Button btnTempIcon = new Button()
+ {
+ X = Application.GetRealWidth(12),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png",
+ };
+ environmentalView.AddChidren(btnTempIcon);
- var btnTempValues = new Button()
- {
- X = btnTempIcon.Right + Application.GetRealWidth(4),
- Width = Application.GetRealWidth(30),
- Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- Text = "--掳",
- TextAlignment = TextAlignment.CenterLeft,
- Tag = "TempValues"
- };
- environmentalView.AddChidren(btnTempValues);
+ var btnTempValues = new Button()
+ {
+ X = btnTempIcon.Right + Application.GetRealWidth(4),
+ Width = Application.GetRealWidth(30),
+ Gravity = Gravity.CenterVertical,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = "--掳",
+ TextAlignment = TextAlignment.CenterLeft,
+ Tag = "TempValues"
+ };
+ environmentalView.AddChidren(btnTempValues);
- Button btnHumidityIcon = new Button()
- {
- X = btnTempValues.Right + Application.GetRealWidth(2),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
- };
- environmentalView.AddChidren(btnHumidityIcon);
+ Button btnHumidityIcon = new Button()
+ {
+ X = btnTempValues.Right + Application.GetRealWidth(2),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
+ };
+ environmentalView.AddChidren(btnHumidityIcon);
- var btnHumidityValues = new Button()
- {
- X = btnHumidityIcon.Right + Application.GetRealWidth(4),
- Width = Application.GetRealWidth(30),
- Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- Text = "--%",
- TextAlignment = TextAlignment.CenterLeft,
- Tag = "HumidityValues"
- };
- environmentalView.AddChidren(btnHumidityValues);
+ var btnHumidityValues = new Button()
+ {
+ X = btnHumidityIcon.Right + Application.GetRealWidth(4),
+ Width = Application.GetRealWidth(30),
+ Gravity = Gravity.CenterVertical,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = "--%",
+ TextAlignment = TextAlignment.CenterLeft,
+ Tag = "HumidityValues"
+ };
+ environmentalView.AddChidren(btnHumidityValues);
- Button btnPm25Icon = new Button()
- {
- X = btnHumidityValues.Right + Application.GetRealWidth(2),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png",
- };
- environmentalView.AddChidren(btnPm25Icon);
+ Button btnPm25Icon = new Button()
+ {
+ X = btnHumidityValues.Right + Application.GetRealWidth(2),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png",
+ };
+ environmentalView.AddChidren(btnPm25Icon);
- var btnPm25Values = new Button()
- {
- X = btnPm25Icon.Right + Application.GetRealWidth(4),
- Width = Application.GetRealWidth(30),
- Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- Text = "--",
- TextAlignment = TextAlignment.CenterLeft,
- Tag = "Pm25Values"
- };
- environmentalView.AddChidren(btnPm25Values);
- roomView.AddChidren(environmentalView);
+ var btnPm25Values = new Button()
+ {
+ X = btnPm25Icon.Right + Application.GetRealWidth(4),
+ Width = Application.GetRealWidth(30),
+ Gravity = Gravity.CenterVertical,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = "--",
+ TextAlignment = TextAlignment.CenterLeft,
+ Tag = "Pm25Values"
+ };
+ environmentalView.AddChidren(btnPm25Values);
+ roomView.AddChidren(environmentalView);
#endregion
-
var btnAllClose = new Button()
{
X = Application.GetRealWidth(282),
@@ -360,7 +359,11 @@
roomViewbgColor.MouseUpEventHandler += (sender, e) =>
{
- var view = new RoomPage(room);
+ Action<Room > ReloadRoomName = (obj) => {
+ btnFloorAndRoomName.Text = obj.floorName + obj.name;
+ };
+
+ var view = new RoomPage(room, ReloadRoomName);
MainPage.BasePageView.AddChidren(view);
view.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -477,7 +480,7 @@
if (functionCount == 0 && item != ShowFunction.Music)
{
- continue;
+ //continue;
}
functionCategoryCount++;
@@ -512,13 +515,6 @@
s2View.AddChidren(functionView);
}
- Button btnFunctionViewBg;
- btnFunctionViewBg = new Button()
- {
- Height = Application.GetRealWidth(161),
- UnSelectedImagePath = "FunctionIcon/FunctionBg/" + item + "FunctionBg.png",
- };
- functionView.AddChidren(btnFunctionViewBg);
Button btnName = new Button()
{
@@ -533,6 +529,15 @@
functionView.AddChidren(btnName);
+ Button btnFunctionViewBg;
+ btnFunctionViewBg = new Button()
+ {
+ Height = Application.GetRealWidth(161),
+ UnSelectedImagePath = "FunctionIcon/FunctionBg/" + item + "FunctionBg.png",
+ };
+ functionView.AddChidren(btnFunctionViewBg);
+
+ int functionPageTitleId = 0;
switch (item)
{
case ShowFunction.Light:
@@ -552,18 +557,13 @@
Tag = item + "_AllControl",
};
functionView.AddChidren(btnLightPower);
-
+
btnLightPower.MouseUpEventHandler = (sender, e) =>
{
LoadEvent_SwitchFunction(btnLightPower, item);
};
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- var skipView = new FunctionPage();
- MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage(StringId.Lights);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ functionPageTitleId = StringId.Lights;
+
#endregion
break;
case ShowFunction.AC:
@@ -587,13 +587,7 @@
{
LoadEvent_SwitchFunction(btnAcPower, item);
};
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- var skipView = new FunctionPage();
- MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage(StringId.AC);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ functionPageTitleId = StringId.AC;
#endregion
break;
case ShowFunction.Curtain:
@@ -610,8 +604,8 @@
Height = Application.GetRealWidth(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
- Tag = item + "_AllControl",
- IsSelected = functionOnCount > 0
+ //Tag = item + "_AllControl",
+ IsSelected = false
};
functionView.AddChidren(btnClose);
@@ -624,17 +618,12 @@
Height = Application.GetRealWidth(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
+ IsSelected = true,
};
functionView.AddChidren(btnOpen);
LoadEvent_CurtainSwitch(btnClose, btnOpen);
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- var skipView = new FunctionPage();
- MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage(StringId.Curtain);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ functionPageTitleId = StringId.Curtain;
#endregion
break;
case ShowFunction.FloorHeating:
@@ -658,13 +647,7 @@
{
LoadEvent_SwitchFunction(btnFhPower, item);
};
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- var skipView = new FunctionPage();
- MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage(StringId.FloorHeating);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ functionPageTitleId = StringId.FloorHeating;
#endregion
break;
case ShowFunction.DoorLock:
@@ -691,13 +674,7 @@
{
LoadEvent_SwitchFunction(btnElectricPower, item);
};
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- var skipView = new FunctionPage();
- MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage(StringId.Electric);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ functionPageTitleId = StringId.Electric;
#endregion
break;
case ShowFunction.EnergyMonitoring:
@@ -745,11 +722,22 @@
break;
}
+ //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
+ if (item != ShowFunction.Music && item != ShowFunction.Environmental)
+ {
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+ var skipView = new FunctionPage();
+ MainPage.BasePageView.AddChidren(skipView);
+ skipView.LoadPage(functionPageTitleId);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
if (item != ShowFunction.Environmental && functionCount != 0)
{
Button btnFunctionCount = new Button()
{
- X = Application.GetRealWidth(16)+ Application.GetRealWidth(7 * functionCount.ToString().Length),
+ X = Application.GetRealWidth(16) + Application.GetRealWidth(7 * functionCount.ToString().Length),
Y = btnName.Bottom,
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(24),
@@ -777,9 +765,10 @@
index++;
}
- if (functionCategoryCount> 4)
+ if (functionCategoryCount > 4)
{
- functionContentView.Height += Application.GetRealHeight((220 * (functionCategoryCount - 4 - 2) / 2) + 20);
+ functionContentView.Height = Application.GetRealHeight((220 * functionCategoryCount / 2) + 20);
+ s1View.Height = s2View.Height = functionContentView.Height;
}
#endregion
@@ -787,7 +776,7 @@
#region 鍒囨崲妤煎眰
/// <summary>
- /// 浣忓畢鍒楄〃鐐瑰嚮浜嬩欢
+ /// 妤煎眰鏄剧ず鍒囨崲
/// </summary>
void LoadDialog_ChangeFloor()
{
@@ -888,7 +877,7 @@
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(112),
Height = Application.GetRealHeight(1),
- BackgroundColor = CSS.CSS_Color.BackgroundColor
+ BackgroundColor = CSS_Color.BackgroundColor
});
}
var btnHomeName = new Button()
@@ -897,10 +886,10 @@
Width = Application.GetRealWidth(112),
Height = Application.GetRealHeight(44),
TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS.CSS_Color.FirstLevelTitleColor,
- SelectedTextColor = CSS.CSS_Color.MainColor,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ SelectedTextColor = CSS_Color.MainColor,
Text = floor,
- TextSize = CSS.CSS_FontSize.SubheadingFontSize,
+ TextSize = CSS_FontSize.SubheadingFontSize,
IsSelected = btnFloor.Text == floor,
IsMoreLines = true,
Tag = floor
@@ -943,4 +932,4 @@
}
#endregion
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0