From d4811b7d34b45ff6b21b97f11da128b5572ec526 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 03 三月 2021 16:03:03 +0800
Subject: [PATCH] 20210303-1
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 371 +++++++++++++++++++++++++++++-----------------------
1 files changed, 204 insertions(+), 167 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index b3c04ee..de798f2 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(SpatialInfo.CurrentSpatial.RoomList);
}
public void LoadPage()
@@ -177,7 +177,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = DB_ResidenceData.residenceData.CurFoor,
+ Text = DB_ResidenceData.Instance.CurFloor.roomName,
};
roomFloorChangeView.AddChidren(btnFloor);
/// <summary>
@@ -226,7 +226,7 @@
Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(192),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
Radius = (uint)Application.GetRealWidth(12),
- Tag = room.sid,
+ Tag = room.roomId,
};
roomListView.AddChidren(roomView);
@@ -234,10 +234,13 @@
{
Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(192),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
- ImagePath = room.backgroundImage,
+ //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,
@@ -260,83 +263,83 @@
roomView.AddChidren(btnFloorAndRoomName);
#region 鐜鏁版嵁
- var environmentalView = new FrameLayout()
- {
- Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
- Height = Application.GetRealHeight(32),
- Tag = "EnvironmentalView",
- };
- roomView.AddChidren(environmentalView);
+ //var environmentalView = new FrameLayout()
+ //{
+ // 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_Color.MainBackgroundColor,
- TextSize = 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_Color.MainBackgroundColor,
- TextSize = 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_Color.MainBackgroundColor,
- TextSize = 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()
{
@@ -359,16 +362,25 @@
roomViewbgColor.MouseUpEventHandler += (sender, e) =>
{
- Action ReloadRoomName = () => {
- btnFloorAndRoomName.Text = room.floorName + room.name;
+ Action ReloadRoomName = () =>
+ {
+ btnFloorAndRoomName.Text = room.floorName + room.roomName;
};
//鎴块棿鍒犻櫎浜嬩欢
- Action deleteAction = () => {
+ Action deleteAction = () =>
+ {
roomView.RemoveFromParent();
};
- var view = new RoomPage(room, ReloadRoomName, deleteAction);
+ //鎴块棿鑳屾櫙鍥句慨鏀逛簨浠跺洖璋�
+ Action modifyImageAction = () =>
+ {
+ //roomViewbg.ImagePath = room.backgroundImage;
+ ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
+ };
+
+ var view = new RoomPage(room, ReloadRoomName, deleteAction, modifyImageAction);
MainPage.BasePageView.AddChidren(view);
view.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -418,10 +430,11 @@
var lastY1 = Application.GetRealWidth(16);
var lastY2 = Application.GetRealWidth(16);
+ var functionContentViewHeight = Application.GetRealWidth(16);
var functionCategoryCount = 0;
- foreach (var item in DB_ResidenceData.residenceData.functionTypeList)
+ foreach (var item in DB_ResidenceData.Instance.functionTypeList)
{
int functionCount = 0;
int functionOnCount = 0;
@@ -429,41 +442,41 @@
{
case ShowFunction.Light:
#region Light
- functionCount = DB_ResidenceData.functionList.lights.Count;
- functionOnCount = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.lights.Count;
+ functionOnCount = FunctionList.List.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.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.aCs.Count;
+ functionOnCount = FunctionList.List.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.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.curtains.Count;
+ functionOnCount = FunctionList.List.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.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.floorHeatings.Count;
+ functionOnCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.DoorLock:
break;
case ShowFunction.Electric:
#region 鐢靛櫒
- functionCount = DB_ResidenceData.functionList.electricals.Count;
- functionOnCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.electricals.Count;
+ functionOnCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.EnergyMonitoring:
break;
case ShowFunction.Environmental:
#region 鐜鏁版嵁
- functionCount = DB_ResidenceData.functionList.sensorsEnvironmentalScience.Count;
+ functionCount = FunctionList.List.sensorsEnvironmentalScience.Count;
#endregion
break;
case ShowFunction.FreshAir:
@@ -475,18 +488,21 @@
case ShowFunction.Panel:
break;
case ShowFunction.SecurityMonitoring:
+ functionCount = 1;
break;
case ShowFunction.Sensor:
+ functionCount = FunctionList.List.sensorsArm.Count;
break;
case ShowFunction.VideoIntercom:
break;
}
- if (functionCount == 0 && item != ShowFunction.Music)
+ if(functionCount == 0)
{
- //continue;
+ continue;
}
+
functionCategoryCount++;
FrameLayout functionView = new FrameLayout()
@@ -519,6 +535,7 @@
{
s2View.AddChidren(functionView);
}
+ functionContentViewHeight = functionView.Bottom;
Button btnName = new Button()
@@ -532,6 +549,38 @@
TextAlignment = TextAlignment.CenterLeft,
};
functionView.AddChidren(btnName);
+
+ if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
+ && item != ShowFunction.SecurityMonitoring
+ && functionCount != 0)
+ {
+ Button btnFunctionCount = new Button()
+ {
+ X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * functionCount.ToString().Length),
+ Y = btnName.Bottom,
+ Width = Application.GetRealWidth(120),
+ Height = Application.GetRealHeight(24),
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "/" + functionCount,
+ };
+ functionView.AddChidren(btnFunctionCount);
+ Button btnOpenCount = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = btnName.Bottom,
+ Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
+ Height = Application.GetRealHeight(24),
+ TextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = functionOnCount.ToString(),
+ Tag = item + "_onCount",
+ BorderWidth = 0,
+ };
+ functionView.AddChidren(btnOpenCount);
+ }
Button btnFunctionViewBg;
@@ -548,8 +597,8 @@
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.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.lights.Count;
+ functionOnCount = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnLightPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -565,17 +614,17 @@
btnLightPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnLightPower, item);
+ LoadEvent_SwitchFunction(btnLightPower, item, functionView);
};
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.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.aCs.Count;
+ functionOnCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnAcPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -590,7 +639,7 @@
functionView.AddChidren(btnAcPower);
btnAcPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnAcPower, item);
+ LoadEvent_SwitchFunction(btnAcPower, item, functionView);
};
functionPageTitleId = StringId.AC;
#endregion
@@ -598,8 +647,8 @@
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.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.curtains.Count;
+ functionOnCount = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnClose;
btnClose = new Button()
{
@@ -609,8 +658,7 @@
Height = Application.GetRealWidth(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
- //Tag = item + "_AllControl",
- IsSelected = false
+ IsSelected = !DB_ResidenceData.Instance.GlobalCurtainStatus,
};
functionView.AddChidren(btnClose);
@@ -623,10 +671,10 @@
Height = Application.GetRealWidth(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
- IsSelected = true,
+ IsSelected = DB_ResidenceData.Instance.GlobalCurtainStatus,
};
functionView.AddChidren(btnOpen);
- LoadEvent_CurtainSwitch(btnClose, btnOpen);
+ LoadEvent_CurtainSwitch(btnClose, btnOpen, functionView);
functionPageTitleId = StringId.Curtain;
#endregion
@@ -634,8 +682,8 @@
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.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.floorHeatings.Count;
+ functionOnCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnFhPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -650,7 +698,7 @@
functionView.AddChidren(btnFhPower);
btnFhPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnFhPower, item);
+ LoadEvent_SwitchFunction(btnFhPower, item, functionView);
};
functionPageTitleId = StringId.FloorHeating;
#endregion
@@ -661,8 +709,8 @@
case ShowFunction.Electric:
#region 鐢靛櫒
btnName.TextID = StringId.Electric;
- functionCount = DB_ResidenceData.functionList.electricals.Count;
- functionOnCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.electricals.Count;
+ functionOnCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnElectricPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -677,7 +725,7 @@
functionView.AddChidren(btnElectricPower);
btnElectricPower.MouseUpEventHandler = (sender, e) =>
{
- LoadEvent_SwitchFunction(btnElectricPower, item);
+ LoadEvent_SwitchFunction(btnElectricPower, item, functionView);
};
functionPageTitleId = StringId.Electric;
#endregion
@@ -717,10 +765,27 @@
break;
case ShowFunction.SecurityMonitoring:
btnName.TextID = StringId.SecurityMonitoring;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+#if __IOS__
+ EZSDK.IOS.EZSDK.Go2EZvizMonitor();
+#else //瀹夊崜鎽勫儚澶�
+ ((BaseActivity)Shared.Application.Activity).SetCamera(b =>
+ {
+ if (b)
+ {
+ Android.Content.Intent intent = new Android.Content.Intent();
+ intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
+ Shared.Application.Activity.StartActivity(intent);
+ }
+ });
+
+#endif
+ };
break;
case ShowFunction.Sensor:
btnName.TextID = StringId.Sensor;
-
+ functionPageTitleId = StringId.Sensor;
break;
case ShowFunction.VideoIntercom:
btnName.TextID = StringId.VideoIntercom;
@@ -728,7 +793,7 @@
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
- if (item != ShowFunction.Music && item != ShowFunction.Environmental)
+ if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring)
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
@@ -738,48 +803,19 @@
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),
- Y = btnName.Bottom,
- Width = Application.GetRealWidth(120),
- Height = Application.GetRealHeight(24),
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft,
- Text = "/" + functionCount,
- };
- functionView.AddChidren(btnFunctionCount);
- Button btnOpenCount = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = btnName.Bottom,
- Width = Application.GetRealWidth(12 * functionCount.ToString().Length),
- Height = Application.GetRealHeight(24),
- TextColor = CSS_Color.MainColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft,
- Text = functionOnCount.ToString(),
- Tag = item + "_onCount",
- BorderWidth = 0,
- };
- functionView.AddChidren(btnOpenCount);
- }
index++;
}
- if (functionCategoryCount > 4)
+ //if (functionCategoryCount > 4)
{
- functionContentView.Height = Application.GetRealHeight((220 * functionCategoryCount / 2) + 20);
- s1View.Height = s2View.Height = functionContentView.Height;
+ //functionContentView.Height = functionContentViewHeight;// Application.GetRealWidth((240 * (functionCategoryCount / 2)));
+ s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight+ Application.GetRealWidth(40);
}
- #endregion
+#endregion
}
- #region 鍒囨崲妤煎眰
+#region 鍒囨崲妤煎眰
/// <summary>
/// 妤煎眰鏄剧ず鍒囨崲
/// </summary>
@@ -815,10 +851,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()
{
@@ -833,7 +869,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()
{
@@ -866,17 +902,18 @@
}
- List<string> chooseList = new List<string>();
- chooseList.Add(Language.StringByID(StringId.All));
- foreach (var f in DB_ResidenceData.residenceData.floors)
+ List<SpatialInfo> chooseList = new List<SpatialInfo>();
+ chooseList.Add(new SpatialInfo() { roomId = "", roomName = Language.StringByID(StringId.All) });
+ foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
{
- chooseList.Add(f.name);
+ chooseList.Add(f);
}
foreach (var floor in chooseList)
{
- if (floor != Language.StringByID(StringId.All))
+ if (!string.IsNullOrEmpty( floor.roomId))// != Language.StringByID(StringId.All))
{
+ //---鍒嗗壊绾�
contentView.AddChidren(new Button()
{
Gravity = Gravity.CenterHorizontal,
@@ -893,28 +930,28 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS_Color.MainColor,
- Text = floor,
+ Text = floor.roomName,
TextSize = CSS_FontSize.SubheadingFontSize,
- IsSelected = btnFloor.Text == floor,
- IsMoreLines = true,
- Tag = floor
+ IsSelected = floor.roomId == DB_ResidenceData.Instance.ClassificationChooseFloor.roomId,
+ //IsMoreLines = true,
};
contentView.AddChidren(btnHomeName);
btnHomeName.MouseUpEventHandler += (senderH, en) =>
{
dialog.Close();
- btnFloor.Text = floor;
+ btnFloor.Text = floor.roomName;
+ DB_ResidenceData.Instance.ClassificationChooseFloor = floor;
roomsShowed.Clear();
- if (floor == Language.StringByID(StringId.All))
+ if (string.IsNullOrEmpty(floor.roomId))
{
- roomsShowed.AddRange(DB_ResidenceData.rooms);
+ roomsShowed.AddRange(SpatialInfo.CurrentSpatial.RoomList);
}
else
{
- foreach (var room in DB_ResidenceData.rooms)
+ foreach (var room in SpatialInfo.CurrentSpatial.RoomList)
{
- if (room.floorName == floor)
+ if (room.parentId == floor.uid)
{
roomsShowed.Add(room);
}
@@ -935,6 +972,6 @@
{
}
- #endregion
+#endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0