From d53f7315de145266e6465d9f95d11d1712b9a91b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 18 十二月 2020 20:55:28 +0800
Subject: [PATCH] 20201218-6
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index aeb9b39..6844db7 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -20,8 +20,14 @@
Application.RunOnMainThread(() => {
if (bodyView == null)
return;
- UpdataFunctionOnCount(function.functionCategory,function.functionType);
- UpdataCloseAllButton(function);
+ try
+ {
+ UpdataFunctionOnCount(function.functionCategory, function.functionType);
+ UpdataCloseAllButton(function);
+ }
+ catch
+ {
+ }
});
}
@@ -48,7 +54,7 @@
if (view2.GetChildren(k).GetType() == typeof(FrameLayout))
{
var view3 = view2.GetChildren(j) as FrameLayout;
- if(view3== null)
+ if (view3 == null)
{
continue;
}
@@ -68,21 +74,21 @@
switch (functionType)
{
case FunctionType.FloorHeating:
- btnText = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
+ btnText = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
break;
case FunctionType.AC:
- btnText = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
+ btnText = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
break;
}
break;
case FunctionCategory.Curtain:
- btnText = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
+ btnText = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
break;
case FunctionCategory.Light:
- btnText = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
+ btnText = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
break;
case FunctionCategory.Electrical:
- btnText = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
+ btnText = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
break;
}
btn.Text = btnText;
@@ -96,21 +102,21 @@
switch (functionType)
{
case FunctionType.FloorHeating:
- openCount = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ openCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
case FunctionType.AC:
- openCount = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ openCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
}
break;
case FunctionCategory.Curtain:
- openCount = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ openCount = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
case FunctionCategory.Light:
- openCount = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ openCount = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
case FunctionCategory.Electrical:
- openCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ openCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
}
btn.IsSelected = openCount != 0;
@@ -157,12 +163,12 @@
{
foreach (var rId in function.roomIds)
{
- if(rId == null)
+ if (rId == null)
{
continue;
}
- var r = DB_ResidenceData.Rooms.Find(s => s.uid == rId);
- if(r == null)
+ var r = SpatialInfo.CurrentSpatial.RoomList.Find(s => s.roomId == rId);
+ if (r == null)
{
continue;
}
@@ -209,7 +215,7 @@
foreach (var m in Music.A31MusicModel.A31MusicModelList)
{
- if (m.roomIds.Contains(room.uid))
+ if (m.roomIds.Contains(room.roomId))
{
Music.SendMethod.Pause(m);
}
@@ -219,7 +225,7 @@
btn.Visible = false;
};
- new PublicAssmebly().TipMsg(StringId.Tip, StringId.TipCloseAllFunctionInRoom, action);
+ new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.TipCloseAllFunctionInRoom, action);
};
foreach (var f in room.GetRoomFunctions(false))
{
@@ -256,7 +262,7 @@
{
contentPageView.PageChange = (sender, e) =>
{
- if(contentPageView.PageIndex == 0)
+ if (contentPageView.PageIndex == 0)
{
btnRoomTilte.IsSelected = true;
btnRoomTilte.TextSize = CSS_FontSize.HeadlineFontSize;
@@ -314,17 +320,17 @@
switch (functionCategory)
{
case ShowFunction.AC:
- foreach(var f in DB_ResidenceData.functionList.aCs)
+ foreach (var f in FunctionList.List.aCs)
{
f.trait_on_off.curValue = onoff;
//Control.Send(CommandType_A.write, f);
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("on_off", f.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
}
break;
case ShowFunction.Curtain:
- //foreach (var f in DB_ResidenceData.functionList.curtains)
+ //foreach (var f in FunctionList.List.curtains)
//{
// f.trait_on_off.value = onoff;
// //Control.Send(CommandType_A.write, f);
@@ -334,12 +340,20 @@
//}
break;
case ShowFunction.Light:
- foreach (var f in DB_ResidenceData.functionList.lights)
+ foreach (var f in FunctionList.List.lights)
{
f.trait_on_off.curValue = onoff;
- //Control.Send(CommandType_A.write, f);
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("on_off", f.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(f, d);
+ }
+ break;
+ case ShowFunction.Electric:
+ foreach (var f in FunctionList.List.electricals)
+ {
+ f.trait_on_off.curValue = onoff;
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
}
break;
@@ -356,7 +370,10 @@
{
btnOpen.MouseUpEventHandler = (sender, e) =>
{
- foreach (var f in DB_ResidenceData.functionList.curtains)
+ DB_ResidenceData.Instance.GlobalCurtainStatus = true;
+ btnOpen.IsSelected = true;
+ btnClose.IsSelected = false;
+ foreach (var f in FunctionList.List.curtains)
{
f.trait_on_off.curValue = "on";
f.percent = 100;
@@ -368,9 +385,12 @@
btnClose.MouseUpEventHandler = (sender, e) =>
{
- foreach (var f in DB_ResidenceData.functionList.curtains)
+ DB_ResidenceData.Instance.GlobalCurtainStatus = false;
+ btnClose.IsSelected = true;
+ btnOpen.IsSelected = false;
+ foreach (var f in FunctionList.List.curtains)
{
- f.trait_on_off.curValue = "off";
+ f.trait_on_off.curValue = "off";
f.percent = 0;
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", f.trait_on_off.curValue.ToString());
--
Gitblit v1.8.0