From 1265d531759b5565e9f641b17045896b52dfdba8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 十二月 2020 18:37:47 +0800
Subject: [PATCH] 2020-12-03 1.主页增加未读消息查询和提示处理。2.房间和场景背景上传和下载和读取方法修改处理。3.头像上传和下载方案修改处理。4.增加子账号头像下载。5.Loading 调用方法修复。6.封装ImageUtlis 图片上传和下载管理工具类 7.读取本地住宅增加判空处理。
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index bb93ead..2bb3b9b 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -224,7 +224,7 @@
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(184),
+ Height = Application.GetRealWidth(192),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
Radius = (uint)Application.GetRealWidth(12),
Tag = room.sid,
};
@@ -233,11 +233,14 @@
var roomViewbg = new ImageView()
{
Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(184),
- ImagePath = room.backgroundImage,
+ Height = Application.GetRealWidth(192),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
+ //ImagePath = room.backgroundImage,
Radius = (uint)Application.GetRealWidth(12),
};
roomView.AddChidren(roomViewbg);
+
+ //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+ ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
var roomViewbgColor = new Button()
{
@@ -258,9 +261,9 @@
TextSize = CSS_FontSize.SubheadingFontSize,
};
roomView.AddChidren(btnFloorAndRoomName);
-#if stage2
+
#region 鐜鏁版嵁
- var environmentalView = new FrameLayout()
+ var environmentalView = new FrameLayout()
{
Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
Height = Application.GetRealHeight(32),
@@ -338,11 +341,10 @@
environmentalView.AddChidren(btnPm25Values);
roomView.AddChidren(environmentalView);
#endregion
-#endif
var btnAllClose = new Button()
{
X = Application.GetRealWidth(282),
- Y = Application.GetRealHeight(126),
+ Y = Application.GetRealWidth(126),
Width = Application.GetMinRealAverage(58),
Height = Application.GetMinRealAverage(58),
UnSelectedImagePath = "Classification/Room/AllCloseIcon.png",
@@ -354,13 +356,22 @@
var btn = new Button()
{
- Height = Application.GetRealHeight(20),
+ Height = Application.GetRealWidth(20),
};
roomListView.AddChidren(btn);
roomViewbgColor.MouseUpEventHandler += (sender, e) =>
{
- var view = new RoomPage(room);
+ Action ReloadRoomName = () => {
+ btnFloorAndRoomName.Text = room.floorName + room.name;
+ };
+
+ //鎴块棿鍒犻櫎浜嬩欢
+ Action deleteAction = () => {
+ roomView.RemoveFromParent();
+ };
+
+ var view = new RoomPage(room, ReloadRoomName, deleteAction);
MainPage.BasePageView.AddChidren(view);
view.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -422,25 +433,25 @@
case ShowFunction.Light:
#region Light
functionCount = DB_ResidenceData.functionList.lights.Count;
- functionOnCount = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ functionOnCount = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.AC:
#region AC
functionCount = DB_ResidenceData.functionList.aCs.Count;
- functionOnCount = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ functionOnCount = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.Curtain:
#region Curtain
functionCount = DB_ResidenceData.functionList.curtains.Count;
- functionOnCount = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ functionOnCount = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.FloorHeating:
#region 鍦扮儹
functionCount = DB_ResidenceData.functionList.floorHeatings.Count;
- functionOnCount = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ functionOnCount = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.DoorLock:
@@ -448,7 +459,7 @@
case ShowFunction.Electric:
#region 鐢靛櫒
functionCount = DB_ResidenceData.functionList.electricals.Count;
- functionOnCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ functionOnCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.EnergyMonitoring:
@@ -462,7 +473,7 @@
break;
case ShowFunction.Music:
functionCount = Music.A31MusicModel.A31MusicModelList.Count;
- functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
case ShowFunction.Panel:
break;
@@ -477,7 +488,7 @@
if (functionCount == 0 && item != ShowFunction.Music)
{
- continue;
+ //continue;
}
functionCategoryCount++;
@@ -541,7 +552,7 @@
#region Light
btnName.TextID = StringId.Lights;
functionCount = DB_ResidenceData.functionList.lights.Count;
- functionOnCount = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ functionOnCount = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnLightPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -567,7 +578,7 @@
#region AC
btnName.TextID = StringId.AC;
functionCount = DB_ResidenceData.functionList.aCs.Count;
- functionOnCount = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ functionOnCount = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnAcPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -591,7 +602,7 @@
#region Curtain
btnName.TextID = StringId.Curtain;
functionCount = DB_ResidenceData.functionList.curtains.Count;
- functionOnCount = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ functionOnCount = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnClose;
btnClose = new Button()
{
@@ -627,7 +638,7 @@
#region 鍦扮儹
btnName.TextID = StringId.FloorHeating;
functionCount = DB_ResidenceData.functionList.floorHeatings.Count;
- functionOnCount = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ functionOnCount = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnFhPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -654,7 +665,7 @@
#region 鐢靛櫒
btnName.TextID = StringId.Electric;
functionCount = DB_ResidenceData.functionList.electricals.Count;
- functionOnCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ functionOnCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnElectricPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -695,7 +706,7 @@
case ShowFunction.Music:
btnName.TextID = StringId.Music;
functionCount = Music.A31MusicModel.A31MusicModelList.Count;
- functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
var musicMain = new Music.MusicMain();
@@ -764,7 +775,8 @@
if (functionCategoryCount > 4)
{
- functionContentView.Height += Application.GetRealHeight((220 * (functionCategoryCount - 4) / 2) + 20);
+ functionContentView.Height = Application.GetRealHeight((220 * functionCategoryCount / 2) + 20);
+ s1View.Height = s2View.Height = functionContentView.Height;
}
#endregion
--
Gitblit v1.8.0