From 83dcb19ea8481a8ae38ef75359dadbf0bf61d3b3 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 01 二月 2021 18:20:25 +0800
Subject: [PATCH] 2021-02-01 1.更新
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 112 ++++++++++++++++++++++++-------------------------------
1 files changed, 49 insertions(+), 63 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index f333a9b..c44b3d0 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -373,7 +373,14 @@
roomView.RemoveFromParent();
};
- var view = new RoomPage(room, ReloadRoomName, deleteAction);
+ //鎴块棿鑳屾櫙鍥句慨鏀逛簨浠跺洖璋�
+ Action modifyImageAction = () =>
+ {
+ //roomViewbg.ImagePath = room.backgroundImage;
+ ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
+ };
+
+ var view = new RoomPage(room, ReloadRoomName, deleteAction, modifyImageAction);
MainPage.BasePageView.AddChidren(view);
view.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -423,6 +430,7 @@
var lastY1 = Application.GetRealWidth(16);
var lastY2 = Application.GetRealWidth(16);
+ var functionContentViewHeight = Application.GetRealWidth(16);
var functionCategoryCount = 0;
@@ -488,31 +496,8 @@
}
- if (functionCount == 0 && item != ShowFunction.Music)
- {
- continue;
- }
functionCategoryCount++;
- //FunctionType ft = FunctionType.A31Music
- //switch (item)
- //{
- // case FunctionType.FloorHeating:
- // break;
- // case FunctionType.AC:
- // break;
- // case FunctionType.MotorCurtain:
- // case FunctionType.Curtain:
- // case FunctionType.RollingShutter:
- // break;
- // case FunctionType.Relay:
- // case FunctionType.Dimmer:
- // case FunctionType.RGB:
- // case FunctionType.ColorTemperature:
- // break;
- // case FunctionType.Socket:
- // break;
- //}
FrameLayout functionView = new FrameLayout()
{
Height = Application.GetRealWidth(161),
@@ -543,6 +528,7 @@
{
s2View.AddChidren(functionView);
}
+ functionContentViewHeight = functionView.Bottom;
Button btnName = new Button()
@@ -556,6 +542,36 @@
TextAlignment = TextAlignment.CenterLeft,
};
functionView.AddChidren(btnName);
+
+ if (item != ShowFunction.Environmental && functionCount != 0)
+ {
+ Button btnFunctionCount = new Button()
+ {
+ X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * functionCount.ToString().Length),
+ Y = btnName.Bottom,
+ Width = Application.GetRealWidth(120),
+ Height = Application.GetRealHeight(24),
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "/" + functionCount,
+ };
+ functionView.AddChidren(btnFunctionCount);
+ Button btnOpenCount = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = btnName.Bottom,
+ Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
+ Height = Application.GetRealHeight(24),
+ TextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = functionOnCount.ToString(),
+ Tag = item + "_onCount",
+ BorderWidth = 0,
+ };
+ functionView.AddChidren(btnOpenCount);
+ }
Button btnFunctionViewBg;
@@ -589,7 +605,7 @@
btnLightPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnLightPower, item);
+ LoadEvent_SwitchFunction(btnLightPower, item, functionView);
};
functionPageTitleId = StringId.Lights;
@@ -614,7 +630,7 @@
functionView.AddChidren(btnAcPower);
btnAcPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnAcPower, item);
+ LoadEvent_SwitchFunction(btnAcPower, item, functionView);
};
functionPageTitleId = StringId.AC;
#endregion
@@ -633,7 +649,6 @@
Height = Application.GetRealWidth(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
- //Tag = item + "_AllControl",
IsSelected = !DB_ResidenceData.Instance.GlobalCurtainStatus,
};
functionView.AddChidren(btnClose);
@@ -650,7 +665,7 @@
IsSelected = DB_ResidenceData.Instance.GlobalCurtainStatus,
};
functionView.AddChidren(btnOpen);
- LoadEvent_CurtainSwitch(btnClose, btnOpen);
+ LoadEvent_CurtainSwitch(btnClose, btnOpen, functionView);
functionPageTitleId = StringId.Curtain;
#endregion
@@ -674,7 +689,7 @@
functionView.AddChidren(btnFhPower);
btnFhPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnFhPower, item);
+ LoadEvent_SwitchFunction(btnFhPower, item, functionView);
};
functionPageTitleId = StringId.FloorHeating;
#endregion
@@ -701,7 +716,7 @@
functionView.AddChidren(btnElectricPower);
btnElectricPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnElectricPower, item);
+ LoadEvent_SwitchFunction(btnElectricPower, item, functionView);
};
functionPageTitleId = StringId.Electric;
#endregion
@@ -762,42 +777,13 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
}
- if (item != ShowFunction.Environmental && functionCount != 0)
- {
- Button btnFunctionCount = new Button()
- {
- X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * functionCount.ToString().Length),
- Y = btnName.Bottom,
- Width = Application.GetRealWidth(120),
- Height = Application.GetRealHeight(24),
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft,
- Text = "/" + functionCount,
- };
- functionView.AddChidren(btnFunctionCount);
- Button btnOpenCount = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = btnName.Bottom,
- Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
- Height = Application.GetRealHeight(24),
- TextColor = CSS_Color.MainColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft,
- Text = functionOnCount.ToString(),
- Tag = item + "_onCount",
- BorderWidth = 0,
- };
- functionView.AddChidren(btnOpenCount);
- }
index++;
}
- if (functionCategoryCount > 4)
+ //if (functionCategoryCount > 4)
{
- functionContentView.Height = Application.GetRealHeight((220 * functionCategoryCount / 2) + 20);
- s1View.Height = s2View.Height = functionContentView.Height;
+ //functionContentView.Height = functionContentViewHeight;// Application.GetRealWidth((240 * (functionCategoryCount / 2)));
+ s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight+ Application.GetRealWidth(40);
}
#endregion
@@ -921,7 +907,7 @@
Text = floor.roomName,
TextSize = CSS_FontSize.SubheadingFontSize,
IsSelected = floor.roomId == DB_ResidenceData.Instance.ClassificationChooseFloor.roomId,
- IsMoreLines = true,
+ //IsMoreLines = true,
};
contentView.AddChidren(btnHomeName);
--
Gitblit v1.8.0