From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 246e637..3914880 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -240,11 +240,11 @@
//澶у浘鏄剧ず
if (OnAppConfig.Instance.IsShowBigPicture)
{
- LoadBigPirtureRoomRow(roomView, roomsShowed[i/2]);
+ LoadBigPirtureRoomRow(roomView, roomsShowed[i]);
}
else//鏃犲浘鏄剧ず
{
- LoadSmallPirtureRoomRow(roomView, roomsShowed[i/2]);
+ LoadSmallPirtureRoomRow(roomView, roomsShowed[i]);
}
}
@@ -269,7 +269,7 @@
}
});
runCount++;
- System.Threading.Thread.Sleep(8);
+ System.Threading.Thread.Sleep(12);
}
Application.RunOnMainThread(() =>
{
@@ -307,6 +307,7 @@
Height = Application.GetRealWidth(192 + 20),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
Radius = (uint)Application.GetRealWidth(12),
Tag = room.roomId,
+ BackgroundColor = CSS_Color.MainBackgroundColor,
};
roomListView.AddChidren(roomView);
@@ -323,7 +324,7 @@
Height = Application.GetRealWidth(70 + 20),
Radius = (uint)Application.GetRealWidth(12),
Tag = room.roomId,
- BackgroundColor = CSS_Color.BackgroundColor,
+ BackgroundColor = CSS_Color.MainBackgroundColor,
};
roomListView.AddChidren(roomView);
LoadSmallPirtureRoomRow(roomView, room);
@@ -509,9 +510,10 @@
roomView.RemoveAll();
roomFloorChangeView.BackgroundColor = roomListView.BackgroundColor = CSS_Color.BackgroundColor;
roomView.BackgroundColor = CSS_Color.BackgroundColor;
+ //roomView.BackgroundColor = CSS_Color.MainBackgroundColor;
- var viewbg = new ImageView()
+ var viewbg = new Button()
{
Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(70),
@@ -556,10 +558,10 @@
var btnAllClose = new Button()
{
- X = Application.GetRealWidth(288),
- Y = Application.GetRealWidth(10),
- Width = Application.GetMinRealAverage(58),
- Height = Application.GetMinRealAverage(58),
+ X = Application.GetRealWidth(278),
+ Y = Application.GetRealWidth(15),
+ Width = Application.GetMinRealAverage(50),
+ Height = Application.GetMinRealAverage(50),
UnSelectedImagePath = "Classification/Room/AllCloseIcon2.png",
Tag = "AllClose",
Visible = false
@@ -699,13 +701,10 @@
functionOnCount = FunctionList.List.GetAirFreshList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
case ShowFunction.Music:
- //functionCount = Music.A31MusicModel.A31MusicModelList.Count;
- //functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
- //if(functionCount == 0)
- //{
- // functionCount = FunctionList.List.GetMusicList().Count;
- //}
+ functionCount = FunctionList.List.GetMusicList().Count;
+#if DEBUG
functionCount = 1;
+#endif
break;
case ShowFunction.Panel:
break;
@@ -719,16 +718,17 @@
functionCount = FunctionList.List.GetArmSensorList().Count;
break;
case ShowFunction.VideoIntercom:
- if (FunctionList.List.videoIntercom != null)
+ if (FunctionList.List.videoIntercom != null && FunctionList.List.videoIntercom.Count > 0)
{
functionCount = 1;
}
break;
case ShowFunction.SecurityCenter:
functionCount = FunctionList.List.securities.Count;
-#if DEBUG
- functionCount = 1;
-#endif
+ //if (DB_ResidenceData.Instance.GatewayType == 1)
+ //{
+ // functionCount = 1;
+ //}
break;
}
@@ -974,6 +974,7 @@
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
var skipView = new EnvironmentalPage();// EnvironmentalSciencePage();
+ //var skipView = new A_EnvironmentalDataCenter();// EnvironmentalSciencePage();
MainPage.BasePageView.AddChidren(skipView);
skipView.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -1028,12 +1029,12 @@
btnName.TextID = StringId.Sensor;
functionPageTitleId = StringId.Sensor;
break;
- case ShowFunction.VideoIntercom:
+ case ShowFunction.VideoIntercom://鍙瀵硅
btnName.TextID = StringId.VideoIntercom;
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
var videoMethod = new UI2.FuntionControlView.Video.VideoMethod();
- videoMethod.MianView(this,FunctionList.List.videoIntercom);
+ videoMethod.MianView(this);
};
break;
case ShowFunction.SecurityCenter:
--
Gitblit v1.8.0