From d616b67bd6ea95562af73a00bf0aab38eec935df Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 11 十二月 2020 13:37:26 +0800
Subject: [PATCH] 2020-12-11 1.取消屏幕常亮。2.优化iOS接收推送处理。
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 331 +++++++++++++++++++++++++++---------------------------
1 files changed, 164 insertions(+), 167 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index b8f664b..4608ca6 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -71,7 +71,7 @@
{
bodyView = this;
roomsShowed = new List<Room>();
- roomsShowed.AddRange(DB_ResidenceData.rooms);
+ roomsShowed.AddRange(DB_ResidenceData.residenceData.Rooms);
}
public void LoadPage()
@@ -117,7 +117,7 @@
contentPageView = new PageLayout()
{
Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64-49+30),
+ Height = Application.GetRealHeight(667 - 64 - 49 + 30),
BackgroundColor = CSS_Color.MainBackgroundColor,
IsShowPoint = false
};
@@ -144,7 +144,7 @@
Height = Application.GetRealHeight(52),
};
roomPageView.AddChidren(roomFloorChangeView);
- #region 鎴块棿搴曢儴鍒囨崲鏄剧ず鍖哄煙
+ #region 鎴块棿椤堕儴鍒囨崲鏄剧ず鍖哄煙
/// <summary>
/// 鎴块棿鍖哄煙锛岄《閮ㄥ尯鍩�
/// </summary>
@@ -183,16 +183,16 @@
/// <summary>
/// 鏄剧ず鏂瑰紡鍒囨崲鎸夐挳
/// </summary>
- btnSwitchDipaly = new Button()
- {
- X = Application.GetRealWidth(335),
- Y = Application.GetRealHeight(12),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
- UnSelectedImagePath = "Classification/ToggleDisplayThumbnail.png",//缂╃暐鍥�
- SelectedImagePath = "Classification/ToggleDisplayLarge.png",
- };
- roomFloorChangeView.AddChidren(btnSwitchDipaly);
+ //btnSwitchDipaly = new Button()
+ //{
+ // X = Application.GetRealWidth(335),
+ // Y = Application.GetRealHeight(12),
+ // Width = Application.GetMinRealAverage(28),
+ // Height = Application.GetMinRealAverage(28),
+ // UnSelectedImagePath = "Classification/ToggleDisplayThumbnail.png",//缂╃暐鍥�
+ // SelectedImagePath = "Classification/ToggleDisplayLarge.png",
+ //};
+ //roomFloorChangeView.AddChidren(btnSwitchDipaly);
#endregion
/// <summary>
@@ -215,7 +215,7 @@
/// <summary>
/// 鍔犺浇鎴块棿鍒楄〃鍖哄煙
/// </summary>
- void LoadRoomRows ()
+ void LoadRoomRows()
{
roomListView.RemoveAll();
foreach (var room in roomsShowed)
@@ -224,20 +224,23 @@
{
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,
+ Tag = room.roomId,
};
roomListView.AddChidren(roomView);
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()
{
@@ -252,7 +255,7 @@
Y = Application.GetRealHeight(12 - 2),
Width = Application.GetRealWidth(266),
Height = Application.GetRealHeight(22 + 2 + 2),
- Text = room.floorName + room.name,
+ Text = room.floorName + room.roomName,
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -261,88 +264,87 @@
#region 鐜鏁版嵁
var environmentalView = new FrameLayout()
- {
- Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
- Height = Application.GetRealHeight(32),
- Tag = "EnvironmentalView",
- };
- roomView.AddChidren(environmentalView);
+ {
+ Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
+ Height = Application.GetRealHeight(32),
+ Tag = "EnvironmentalView",
+ };
+ roomView.AddChidren(environmentalView);
- Button btnTempIcon = new Button()
- {
- X = Application.GetRealWidth(12),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png",
- };
- environmentalView.AddChidren(btnTempIcon);
+ Button btnTempIcon = new Button()
+ {
+ X = Application.GetRealWidth(12),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png",
+ };
+ environmentalView.AddChidren(btnTempIcon);
- var btnTempValues = new Button()
- {
- X = btnTempIcon.Right + Application.GetRealWidth(4),
- Width = Application.GetRealWidth(30),
- Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- Text = "--掳",
- TextAlignment = TextAlignment.CenterLeft,
- Tag = "TempValues"
- };
- environmentalView.AddChidren(btnTempValues);
+ var btnTempValues = new Button()
+ {
+ X = btnTempIcon.Right + Application.GetRealWidth(4),
+ Width = Application.GetRealWidth(30),
+ Gravity = Gravity.CenterVertical,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = "--掳",
+ TextAlignment = TextAlignment.CenterLeft,
+ Tag = "TempValues"
+ };
+ environmentalView.AddChidren(btnTempValues);
- Button btnHumidityIcon = new Button()
- {
- X = btnTempValues.Right + Application.GetRealWidth(2),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
- };
- environmentalView.AddChidren(btnHumidityIcon);
+ Button btnHumidityIcon = new Button()
+ {
+ X = btnTempValues.Right + Application.GetRealWidth(2),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
+ };
+ environmentalView.AddChidren(btnHumidityIcon);
- var btnHumidityValues = new Button()
- {
- X = btnHumidityIcon.Right + Application.GetRealWidth(4),
- Width = Application.GetRealWidth(30),
- Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- Text = "--%",
- TextAlignment = TextAlignment.CenterLeft,
- Tag = "HumidityValues"
- };
- environmentalView.AddChidren(btnHumidityValues);
+ var btnHumidityValues = new Button()
+ {
+ X = btnHumidityIcon.Right + Application.GetRealWidth(4),
+ Width = Application.GetRealWidth(30),
+ Gravity = Gravity.CenterVertical,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = "--%",
+ TextAlignment = TextAlignment.CenterLeft,
+ Tag = "HumidityValues"
+ };
+ environmentalView.AddChidren(btnHumidityValues);
- Button btnPm25Icon = new Button()
- {
- X = btnHumidityValues.Right + Application.GetRealWidth(2),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png",
- };
- environmentalView.AddChidren(btnPm25Icon);
+ Button btnPm25Icon = new Button()
+ {
+ X = btnHumidityValues.Right + Application.GetRealWidth(2),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png",
+ };
+ environmentalView.AddChidren(btnPm25Icon);
- var btnPm25Values = new Button()
- {
- X = btnPm25Icon.Right + Application.GetRealWidth(4),
- Width = Application.GetRealWidth(30),
- Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- Text = "--",
- TextAlignment = TextAlignment.CenterLeft,
- Tag = "Pm25Values"
- };
- environmentalView.AddChidren(btnPm25Values);
- roomView.AddChidren(environmentalView);
+ var btnPm25Values = new Button()
+ {
+ X = btnPm25Icon.Right + Application.GetRealWidth(4),
+ Width = Application.GetRealWidth(30),
+ Gravity = Gravity.CenterVertical,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = "--",
+ TextAlignment = TextAlignment.CenterLeft,
+ Tag = "Pm25Values"
+ };
+ environmentalView.AddChidren(btnPm25Values);
+ roomView.AddChidren(environmentalView);
#endregion
-
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.roomName;
+ };
+
+ //鎴块棿鍒犻櫎浜嬩欢
+ 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++;
@@ -512,13 +523,6 @@
s2View.AddChidren(functionView);
}
- Button btnFunctionViewBg;
- btnFunctionViewBg = new Button()
- {
- Height = Application.GetRealWidth(161),
- UnSelectedImagePath = "FunctionIcon/FunctionBg/" + item + "FunctionBg.png",
- };
- functionView.AddChidren(btnFunctionViewBg);
Button btnName = new Button()
{
@@ -533,13 +537,22 @@
functionView.AddChidren(btnName);
+ Button btnFunctionViewBg;
+ btnFunctionViewBg = new Button()
+ {
+ Height = Application.GetRealWidth(161),
+ UnSelectedImagePath = "FunctionIcon/FunctionBg/" + item + "FunctionBg.png",
+ };
+ functionView.AddChidren(btnFunctionViewBg);
+
+ int functionPageTitleId = 0;
switch (item)
{
case ShowFunction.Light:
#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),
@@ -552,25 +565,20 @@
Tag = item + "_AllControl",
};
functionView.AddChidren(btnLightPower);
-
+
btnLightPower.MouseUpEventHandler = (sender, e) =>
{
LoadEvent_SwitchFunction(btnLightPower, item);
};
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- var skipView = new FunctionPage();
- MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage(StringId.Lights);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ functionPageTitleId = StringId.Lights;
+
#endregion
break;
case ShowFunction.AC:
#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),
@@ -587,20 +595,14 @@
{
LoadEvent_SwitchFunction(btnAcPower, item);
};
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- var skipView = new FunctionPage();
- MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage(StringId.AC);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ functionPageTitleId = StringId.AC;
#endregion
break;
case ShowFunction.Curtain:
#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()
{
@@ -610,8 +612,8 @@
Height = Application.GetRealWidth(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
- Tag = item + "_AllControl",
- IsSelected = functionOnCount > 0
+ //Tag = item + "_AllControl",
+ IsSelected = false
};
functionView.AddChidren(btnClose);
@@ -624,24 +626,19 @@
Height = Application.GetRealWidth(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
+ IsSelected = true,
};
functionView.AddChidren(btnOpen);
LoadEvent_CurtainSwitch(btnClose, btnOpen);
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- var skipView = new FunctionPage();
- MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage(StringId.Curtain);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ functionPageTitleId = StringId.Curtain;
#endregion
break;
case ShowFunction.FloorHeating:
#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),
@@ -658,13 +655,7 @@
{
LoadEvent_SwitchFunction(btnFhPower, item);
};
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- var skipView = new FunctionPage();
- MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage(StringId.FloorHeating);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ functionPageTitleId = StringId.FloorHeating;
#endregion
break;
case ShowFunction.DoorLock:
@@ -674,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),
@@ -691,13 +682,7 @@
{
LoadEvent_SwitchFunction(btnElectricPower, item);
};
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- var skipView = new FunctionPage();
- MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage(StringId.Electric);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ functionPageTitleId = StringId.Electric;
#endregion
break;
case ShowFunction.EnergyMonitoring:
@@ -721,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();
@@ -745,11 +730,22 @@
break;
}
+ //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
+ if (item != ShowFunction.Music && item != ShowFunction.Environmental)
+ {
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+ var skipView = new FunctionPage();
+ MainPage.BasePageView.AddChidren(skipView);
+ skipView.LoadPage(functionPageTitleId);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
if (item != ShowFunction.Environmental && functionCount != 0)
{
Button btnFunctionCount = new Button()
{
- X = Application.GetRealWidth(16)+ Application.GetRealWidth(7 * functionCount.ToString().Length),
+ X = Application.GetRealWidth(16) + Application.GetRealWidth(7 * functionCount.ToString().Length),
Y = btnName.Bottom,
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(24),
@@ -777,9 +773,10 @@
index++;
}
- if (functionCategoryCount> 4)
+ if (functionCategoryCount > 4)
{
- functionContentView.Height += Application.GetRealHeight((220 * (functionCategoryCount - 4 - 2) / 2) + 20);
+ functionContentView.Height = Application.GetRealHeight((220 * functionCategoryCount / 2) + 20);
+ s1View.Height = s2View.Height = functionContentView.Height;
}
#endregion
@@ -787,7 +784,7 @@
#region 鍒囨崲妤煎眰
/// <summary>
- /// 浣忓畢鍒楄〃鐐瑰嚮浜嬩欢
+ /// 妤煎眰鏄剧ず鍒囨崲
/// </summary>
void LoadDialog_ChangeFloor()
{
@@ -821,10 +818,10 @@
};
dispalyView.AddChidren(contentView);
- if (DB_ResidenceData.residenceData.floors.Count < 2)
+ if (SpatialInfo.CurrentSpatial.FloorList.Count < 2)
{
}
- else if (DB_ResidenceData.residenceData.floors.Count < 3)
+ else if (SpatialInfo.CurrentSpatial.FloorList.Count < 3)
{
dispalyView = new FrameLayout()
{
@@ -839,7 +836,7 @@
contentView.Height = Application.GetRealHeight(45 * 3);
dispalyView.AddChidren(contentView);
}
- else if (DB_ResidenceData.residenceData.floors.Count < 4)
+ else if (SpatialInfo.CurrentSpatial.FloorList.Count < 4)
{
dispalyView = new FrameLayout()
{
@@ -874,9 +871,9 @@
List<string> chooseList = new List<string>();
chooseList.Add(Language.StringByID(StringId.All));
- foreach (var f in DB_ResidenceData.residenceData.floors)
+ foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
{
- chooseList.Add(f.name);
+ chooseList.Add(f.roomName);
}
foreach (var floor in chooseList)
@@ -888,7 +885,7 @@
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(112),
Height = Application.GetRealHeight(1),
- BackgroundColor = CSS.CSS_Color.BackgroundColor
+ BackgroundColor = CSS_Color.BackgroundColor
});
}
var btnHomeName = new Button()
@@ -897,10 +894,10 @@
Width = Application.GetRealWidth(112),
Height = Application.GetRealHeight(44),
TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS.CSS_Color.FirstLevelTitleColor,
- SelectedTextColor = CSS.CSS_Color.MainColor,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ SelectedTextColor = CSS_Color.MainColor,
Text = floor,
- TextSize = CSS.CSS_FontSize.SubheadingFontSize,
+ TextSize = CSS_FontSize.SubheadingFontSize,
IsSelected = btnFloor.Text == floor,
IsMoreLines = true,
Tag = floor
@@ -914,11 +911,11 @@
roomsShowed.Clear();
if (floor == Language.StringByID(StringId.All))
{
- roomsShowed.AddRange(DB_ResidenceData.rooms);
+ roomsShowed.AddRange(DB_ResidenceData.residenceData.Rooms);
}
else
{
- foreach (var room in DB_ResidenceData.rooms)
+ foreach (var room in DB_ResidenceData.residenceData.Rooms)
{
if (room.floorName == floor)
{
@@ -943,4 +940,4 @@
}
#endregion
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0