From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 68 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 8bc0bf6..70c1aa9 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+20),
+ Height = Application.GetRealHeight(667 - 64-49+30),
BackgroundColor = CSS_Color.MainBackgroundColor,
IsShowPoint = false
};
@@ -202,7 +202,7 @@
{
Y = roomFloorChangeView.Bottom,
Height = Application.GetRealHeight(497 + 10 + 30),
- BackgroundColor = CSS_Color.MainBackgroundColor,
+ //BackgroundColor = CSS_Color.MainBackgroundColor,
};
roomPageView.AddChidren(roomListView);
LoadRoomRows();
@@ -225,21 +225,23 @@
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
Height = Application.GetRealHeight(184),
- Radius = (uint)Application.GetRealHeight(12),
- BorderColor = 0x00000000,
- BorderWidth = 1,
+ Radius = (uint)Application.GetRealWidth(12),
Tag = room.sid,
};
roomListView.AddChidren(roomView);
- var roomViewbg = new Button()
+ var roomViewbg = new ImageView()
{
- UnSelectedImagePath = room.backgroundImage,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(184),
+ ImagePath = room.backgroundImage,
+ Radius = (uint)Application.GetRealWidth(12),
};
roomView.AddChidren(roomViewbg);
var roomViewbgColor = new Button()
{
+ Radius = (uint)Application.GetRealWidth(12),
BackgroundColor = 0x19333333,
};
roomView.AddChidren(roomViewbgColor);
@@ -417,7 +419,7 @@
FrameLayout functionView = new FrameLayout()
{
Height = Application.GetRealWidth(161),
- Radius = (uint)Application.GetRealHeight(6),
+ Radius = (uint)Application.GetRealWidth(6),
BackgroundColor = CSS_Color.MainBackgroundColor,
Tag = item + "_View",
Y = index % 2 == 1 ? lastY2 : lastY1
@@ -639,14 +641,15 @@
break;
case ShowFunction.Music:
btnName.TextID = StringId.Music;
+ functionCount = Music.A31MusicModel.A31MusicModelList.Count;
+ functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.on_off == "on").Count;
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
- var musicMain = new HDL_ON.UI.Music.MusicMain();
+ var musicMain = new Music.MusicMain();
MainPage.BasePageView.AddChidren(musicMain);
musicMain.Show();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
-
break;
case ShowFunction.Panel:
btnName.TextID = StringId.Panel;
@@ -678,6 +681,7 @@
Tag = item + "_onCount"
};
functionView.AddChidren(btnFunctionCount);
+
}
index++;
}
@@ -703,8 +707,8 @@
X = Application.GetRealWidth(10),
Y = Application.GetRealHeight(100),
Width = Application.GetRealWidth(160),
- Height = Application.GetRealHeight(203),
- BackgroundImagePath = "PersonalCenter/HomeListbg.png",
+ Height = Application.GetRealHeight(110),
+ BackgroundImagePath = "PersonalCenter/HomeList1bg.png",
};
dialogBody.AddChidren(dispalyView);
@@ -713,10 +717,61 @@
X = Application.GetRealWidth(8),
Y = Application.GetRealHeight(15),
Width = Application.GetRealWidth(150),
- Height = Application.GetRealHeight(45 * 4),
+ Height = Application.GetRealHeight(45 * 2),
+ ScrollEnabled = false
};
dispalyView.AddChidren(contentView);
+ if (DB_ResidenceData.residenceData.floors.Count < 2)
+ {
+ }else if (DB_ResidenceData.residenceData.floors.Count < 3)
+ {
+ dispalyView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(100),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(155),
+ BackgroundImagePath = "PersonalCenter/HomeList2bg.png",
+ };
+ dialogBody.AddChidren(dispalyView);
+
+ contentView.Height = Application.GetRealHeight(45 * 3);
+ dispalyView.AddChidren(contentView);
+ }
+ else if (DB_ResidenceData.residenceData.floors.Count < 4)
+ {
+ dispalyView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(100),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(200),
+ BackgroundImagePath = "PersonalCenter/HomeList3bg.png",
+ };
+ dialogBody.AddChidren(dispalyView);
+
+ contentView.Height = Application.GetRealHeight(45 * 4);
+ dispalyView.AddChidren(contentView);
+ }
+ else
+ {
+ dispalyView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(100),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(245),
+ BackgroundImagePath = "PersonalCenter/HomeList4bg.png",
+ };
+ dialogBody.AddChidren(dispalyView);
+
+ contentView.Height = Application.GetRealHeight(45 * 5);
+ contentView.ScrollEnabled = true;
+ dispalyView.AddChidren(contentView);
+ }
+
+
List<string> chooseList = new List<string>();
chooseList.Add(Language.StringByID(StringId.All));
foreach (var f in DB_ResidenceData.residenceData.floors)
--
Gitblit v1.8.0