From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs | 70 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
index e1895fa..2443d5c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
@@ -15,12 +15,12 @@
public class SmartSpeakerRoomListPage : FrameLayout
{
/// <summary>
- ///
+ /// bodyView
/// </summary>
FrameLayout bodyView;
/// <summary>
- /// 褰撳墠
+ /// 褰撳墠涓绘粦鍔╒iew
/// </summary>
VerticalScrolViewLayout bodyScrolView;
/// <summary>
@@ -29,8 +29,9 @@
SpeakerInfo speakerInfo;
/// <summary>
- ///
+ /// 鎴块棿鍒楄〃鍜屾棤鍖哄煙鍔熻兘椤甸潰
/// </summary>
+ /// <param name="speakerInfo">闊崇鍙傛暟</param>
public SmartSpeakerRoomListPage(SpeakerInfo speakerInfo)
{
bodyView = this;
@@ -39,7 +40,7 @@
}
/// <summary>
- ///
+ /// 鍔犺浇瑙嗗浘
/// </summary>
public void LoadPage()
{
@@ -55,13 +56,12 @@
};
bodyView.AddChidren(bodyScrolView);
-
- //LoadSmartSpeakertListView(bodyScrolView);
+ //鍔犺浇鎴块棿鍒楄〃
ShowRoomListView();
}
/// <summary>
- /// 鍔犺浇鎴块棿鍒楄〃,缁熻鍒嗕韩鐨勬暟鎹�
+ /// 鍔犺浇鎴块棿鍒楄〃
/// </summary>
void ShowRoomListView()
{
@@ -70,29 +70,39 @@
var titleView = new FrameLayout()
{
BackgroundColor = CSS_Color.MainBackgroundColor,
- Height = Application.GetRealWidth(44),
+ Height = Application.GetRealWidth(53),
};
bodyScrolView.AddChidren(titleView);
-
- var btnTitle = new Button()
+ //绠ご鍥炬爣
+ var btnResidenceDownIcon = new Button()
{
- X = Application.GetRealWidth(16),
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ X = Application.GetRealWidth(12),
+ Gravity = Gravity.CenterVertical,
+ UnSelectedImagePath = "Public/DownIcon.png",
+ };
+ titleView.AddChidren(btnResidenceDownIcon);
+ //浣忓畢鏍囬
+ var btnHomeTitle = new Button()
+ {
+ X = btnResidenceDownIcon.Right + Application.GetRealWidth(1),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.UseArea,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = DB_ResidenceData.Instance.CurrentRegion.homeName,
};
- titleView.AddChidren(btnTitle);
+ titleView.AddChidren(btnHomeTitle);
- var btnLine = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = titleView.Height - Application.GetRealHeight(2),
- Width = Application.GetRealWidth(360),
- Height = Application.GetRealHeight(1),
- BackgroundColor = CSS_Color.DividingLineColor,
- };
- titleView.AddChidren(btnLine);
+ //var btnLine = new Button()
+ //{
+ // X = Application.GetRealWidth(16),
+ // Y = titleView.Height - Application.GetRealHeight(2),
+ // Width = Application.GetRealWidth(360),
+ // Height = Application.GetRealHeight(1),
+ // BackgroundColor = CSS_Color.DividingLineColor,
+ //};
+ //titleView.AddChidren(btnLine);
//---------------------------------------------
//鏈垎閰嶅尯鍩熺殑鍔熻兘
@@ -103,11 +113,7 @@
foreach (var function in allFunctionList)
{
function.roomIds.Remove(null);
- if (function.roomIds.Count > 0)
- {
- //allocatedList.Add(function);
- }
- else
+ if (function.roomIds.Count == 0)
{
unallocatedList.Add(function);
}
@@ -123,11 +129,7 @@
//roomIds澶т簬0 浠ｈ〃鍒嗛厤鍒版埧闂�
mScene.roomIds.Remove(null);
- if (mScene.roomIds.Count > 0)
- {
- //allocatedList.Add(function);
- }
- else
+ if (mScene.roomIds.Count == 0)
{
globalSceneList.Add(mScene);
}
@@ -136,7 +138,7 @@
try
{
- //閬嶅巻鍔犺浇鎴块棿鍒嗕韩涓暟缁熻鐘舵�丷owLayout
+ //鎴块棿鍒楄〃
foreach (var room in SpatialInfo.CurrentSpatial.RoomList)
{
AddRoomFunctionRowLayout(room);
--
Gitblit v1.8.0