From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 97 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 78 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index 1694d48..a390242 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
@@ -20,6 +20,10 @@
/// </summary>
Button btnFoorDownIcon;
/// <summary>
+ /// 鎴块棿閫夋嫨瑙﹀彂鍖哄煙
+ /// </summary>
+ Button btnRoomClickRow;
+ /// <summary>
/// 浼犳劅鍣ㄥ垪琛ㄥ尯鍩�
/// </summary>
FrameLayout sensorListView;
@@ -200,7 +204,7 @@
Y = Application.GetRealHeight(90),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
+ UnSelectedImagePath = "FunctionIcon/EnvironmentalScience/HumidityIcon.png",
};
topWeatherView.AddChidren(btnHumidityIcon);
@@ -223,7 +227,7 @@
Y = Application.GetRealHeight(90),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png",
+ UnSelectedImagePath = "FunctionIcon/EnvironmentalScience/Pm25Icon.png",
};
topWeatherView.AddChidren(btnPm25Icon);
@@ -306,6 +310,13 @@
Text = room.name,
};
contentView.AddChidren(btnRoom);
+
+ btnRoomClickRow = new Button()
+ {
+ Height = Application.GetRealHeight(40),
+ };
+ contentView.AddChidren(btnRoomClickRow);
+
#endregion
sensorListView = new FrameLayout()
@@ -368,27 +379,22 @@
}
sensorListView.AddChidren(sensorView);
- var arcBar = new ArcSeekBar()
+ var arcBar = new DiyArcSeekBar()
{
- ProgressBarUnitSring = "掳C",
X = Application.GetRealWidth(7),
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth(48),
Height = Application.GetRealWidth(48),
- OpenAngle = 1,
- ThumbColor = 0x00000000,
- ThumbModeFill = true,
+ OpenAngle = 10,
ProgressBarColor = sensor.levelColorList[sensor.curLevel - 1],
- ThumbRadius = 1,
- ArcWidthWithDefaultStyle = Application.GetRealWidth(3),
MinValue = 0,
MaxValue = 96,
Progress = (96 / sensor.levelColorList.Count) * sensor.curLevel,
- //ProgressBarUnitSring = "",
IsClickable = false,
- ProgressTextColor = 0x00000000,
ArcColor = CSS_Color.BackgroundColor,
- //BackgroundColor = 0x33FF0000,
+ ArcWidth = Application.GetRealWidth(4),
+ IsThumbImgBtnShow = false,
+ SeekBarPadding = Application.GetRealWidth(2),
};
sensorView.AddChidren(arcBar);
@@ -457,7 +463,8 @@
};
sensorView.AddChidren(btnLevel);
- Control.Send(CommandType_A.read, sensor);
+ //Control.Send(CommandType_A.read, sensor);
+ Control.SendReadCommand(sensor);
}
}
@@ -635,10 +642,10 @@
var dispalyView = new FrameLayout()
{
X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(266),
+ 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);
@@ -647,9 +654,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.rooms.Count < 2)
+ {
+ }
+ else if (DB_ResidenceData.residenceData.rooms.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.rooms.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);
+ }
+
foreach (var roomTemp in DB_ResidenceData.residenceData.rooms)
@@ -682,8 +741,8 @@
dialog.Show();
};
- btnRoom.MouseUpEventHandler = eventHandler;
- btnFoorDownIcon.MouseUpEventHandler = eventHandler;
+ btnRoomClickRow.MouseUpEventHandler = eventHandler;
+ //btnFoorDownIcon.MouseUpEventHandler = eventHandler;
}
--
Gitblit v1.8.0