From 792ca2a402feb952ef890d653f2e049c1230baf1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:48:33 +0800
Subject: [PATCH] 1111
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 158 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 104 insertions(+), 54 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index aeb9b39..db6eb88 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -20,8 +20,39 @@
Application.RunOnMainThread(() => {
if (bodyView == null)
return;
- UpdataFunctionOnCount(function.functionCategory,function.functionType);
- UpdataCloseAllButton(function);
+ try
+ {
+ ShowFunction vv = ShowFunction.Light;
+ switch (function.spk)
+ {
+ case SPK.FloorHeatStandard:
+ vv = ShowFunction.FloorHeating;
+ break;
+ case SPK.AcStandard:
+ vv = ShowFunction.AC;
+ break;
+ case SPK.CurtainRoller:
+ case SPK.CurtainShades:
+ case SPK.CurtainSwitch:
+ case SPK.CurtainTrietex:
+ vv = ShowFunction.Curtain;
+ break;
+ case SPK.LightCCT:
+ case SPK.LightDimming:
+ case SPK.LightRGB:
+ case SPK.LightSwitch:
+ vv = ShowFunction.Light;
+ break;
+ case SPK.ElectricSocket:
+ vv = ShowFunction.Electric;
+ break;
+ }
+ UpdataFunctionOnCount(vv, function.functionType);
+ UpdataCloseAllButton(function);
+ }
+ catch
+ {
+ }
});
}
@@ -29,7 +60,7 @@
/// 鏇存柊鍔熻兘鎵撳紑鏁伴噺
/// </summary>
/// <param name="functionCategory"></param>
- static void UpdataFunctionOnCount(FunctionCategory functionCategory, FunctionType functionType)
+ static void UpdataFunctionOnCount(ShowFunction functionCategory, FunctionType functionType)
{
try
{
@@ -47,9 +78,14 @@
{
if (view2.GetChildren(k).GetType() == typeof(FrameLayout))
{
- var view3 = view2.GetChildren(j) as FrameLayout;
- if(view3== null)
+ var view3 = view2.GetChildren(k) as FrameLayout;
+ if (view3 == null)
{
+ continue;
+ }
+ if (view3.Tag == null || view3.Tag.ToString() != functionCategory + "_View")
+ {
+ //MainPage.Log($"i={i}:j={j}:k={k} view3 tag : {view3.Tag.ToString()}");
continue;
}
for (var o = 0; o < view3.ChildrenCount; o++)
@@ -64,25 +100,20 @@
string btnText = "0";
switch (functionCategory)
{
- case FunctionCategory.Thermostat:
- switch (functionType)
- {
- case FunctionType.FloorHeating:
- btnText = DB_ResidenceData.functionList.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();
- break;
- }
+ case ShowFunction.FloorHeating:
+ btnText = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
break;
- case FunctionCategory.Curtain:
- btnText = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
+ case ShowFunction.AC:
+ btnText = FunctionList.List.aCs.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();
+ case ShowFunction.Curtain:
+ btnText = FunctionList.List.curtains.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();
+ case ShowFunction.Light:
+ btnText = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
+ break;
+ case ShowFunction.Electric:
+ btnText = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
break;
}
btn.Text = btnText;
@@ -92,25 +123,20 @@
var openCount = 0;
switch (functionCategory)
{
- case FunctionCategory.Thermostat:
- switch (functionType)
- {
- case FunctionType.FloorHeating:
- openCount = DB_ResidenceData.functionList.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;
- break;
- }
+ case ShowFunction.FloorHeating:
+ openCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
- case FunctionCategory.Curtain:
- openCount = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ case ShowFunction.AC:
+ openCount = FunctionList.List.aCs.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;
+ case ShowFunction.Curtain:
+ openCount = FunctionList.List.curtains.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;
+ case ShowFunction.Light:
+ openCount = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ break;
+ case ShowFunction.Electric:
+ openCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
}
btn.IsSelected = openCount != 0;
@@ -127,7 +153,7 @@
}
catch (Exception ex)
{
- MainPage.Log($"鏇存柊鍏ㄥ叧鎸夐挳寮傚父 : {ex.Message}");
+ MainPage.Log($"鏇存柊鍏ㄥ叧鎸夐挳寮傚父 : {ex.Message} ");
}
}
/// <summary>
@@ -157,12 +183,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 +235,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 +245,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))
{
@@ -236,7 +262,7 @@
}
catch (Exception ex)
{
- MainPage.Log($"load close all function : {ex.Message}");
+ MainPage.Log($"load close all function : {ex.Message} ");
}
}
@@ -256,7 +282,7 @@
{
contentPageView.PageChange = (sender, e) =>
{
- if(contentPageView.PageIndex == 0)
+ if (contentPageView.PageIndex == 0)
{
btnRoomTilte.IsSelected = true;
btnRoomTilte.TextSize = CSS_FontSize.HeadlineFontSize;
@@ -314,17 +340,26 @@
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.FloorHeating:
+ foreach (var f in FunctionList.List.floorHeatings)
+ {
+ 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;
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 +369,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 +399,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 +414,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());
@@ -382,3 +431,4 @@
}
}
}
+
--
Gitblit v1.8.0