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/ClassificationPageBLL.cs | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 933574f..6e5a4e0 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -68,21 +68,21 @@
switch (functionType)
{
case FunctionType.FloorHeating:
- btnText = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count.ToString();
+ 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.value.ToString() == "on").Count.ToString();
+ btnText = DB_ResidenceData.functionList.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.value.ToString() == "on").Count.ToString();
+ btnText = DB_ResidenceData.functionList.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.value.ToString() == "on").Count.ToString();
+ btnText = DB_ResidenceData.functionList.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.value.ToString() == "on").Count.ToString();
+ btnText = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
break;
}
btn.Text = btnText;
@@ -96,21 +96,21 @@
switch (functionType)
{
case FunctionType.FloorHeating:
- openCount = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ 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.value.ToString() == "on").Count;
+ openCount = DB_ResidenceData.functionList.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.value.ToString() == "on").Count;
+ openCount = DB_ResidenceData.functionList.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.value.ToString() == "on").Count;
+ openCount = DB_ResidenceData.functionList.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.value.ToString() == "on").Count;
+ openCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
}
btn.IsSelected = openCount != 0;
@@ -140,7 +140,7 @@
if (bodyView.roomListView.GetChildren(i).GetType() == typeof(FrameLayout))
{
var view1 = bodyView.roomListView.GetChildren(i) as FrameLayout;
- if (!function.roomIdList.Contains(view1.Tag.ToString()))
+ if (!function.roomIds.Contains(view1.Tag.ToString()))
continue;
for (int j = 0; j < view1.ChildrenCount; j++)
{
@@ -149,24 +149,24 @@
var btn = view1.GetChildren(j) as Button;
if (btn.Tag != null && btn.Tag.ToString() == "AllClose")
{
- if (function.trait_on_off.value.ToString() == "on")
+ if (function.trait_on_off.curValue.ToString() == "on")
{
btn.Visible = true;
}
else
{
- foreach (var rId in function.roomIdList)
+ foreach (var rId in function.roomIds)
{
if(rId == null)
{
continue;
}
- var r = DB_ResidenceData.rooms.Find(s => s.sid == rId);
+ var r = DB_ResidenceData.residenceData.Rooms.Find(s => s.roomId == rId);
if(r == null)
{
continue;
}
- var ssd = r.GetRoomFunctions(false).FindAll((obj) => obj.trait_on_off.value.ToString() == "on" && obj.functionCategory != FunctionCategory.Scene);
+ var ssd = r.GetRoomFunctions(false).FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on" && obj.functionCategory != FunctionCategory.Scene);
var sss = ssd.Count;
if (sss == 0)
{
@@ -201,15 +201,15 @@
continue;
}
- f.trait_on_off.value = "off";
+ f.trait_on_off.curValue = "off";
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("on_off", f.trait_on_off.value.ToString());
+ d.Add("on_off", f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
}
foreach (var m in Music.A31MusicModel.A31MusicModelList)
{
- if (m.roomIdList.Contains(room.sid))
+ if (m.roomIds.Contains(room.roomId))
{
Music.SendMethod.Pause(m);
}
@@ -227,7 +227,7 @@
{
continue;
}
- if (f.trait_on_off.value.ToString() == "on")
+ if (f.trait_on_off.curValue.ToString() == "on")
{
btn.Visible = true;
break;
@@ -316,10 +316,10 @@
case ShowFunction.AC:
foreach(var f in DB_ResidenceData.functionList.aCs)
{
- f.trait_on_off.value = onoff;
+ 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.value.ToString());
+ d.Add("on_off", f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
}
break;
@@ -336,10 +336,10 @@
case ShowFunction.Light:
foreach (var f in DB_ResidenceData.functionList.lights)
{
- f.trait_on_off.value = onoff;
+ 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.value.ToString());
+ d.Add("on_off", f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
}
break;
@@ -358,10 +358,10 @@
{
foreach (var f in DB_ResidenceData.functionList.curtains)
{
- f.trait_on_off.value = "on";
+ f.trait_on_off.curValue = "on";
f.percent = 100;
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("on_off", f.trait_on_off.value.ToString());
+ d.Add("on_off", f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
}
};
@@ -370,10 +370,10 @@
{
foreach (var f in DB_ResidenceData.functionList.curtains)
{
- f.trait_on_off.value = "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.value.ToString());
+ d.Add("on_off", f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
}
};
--
Gitblit v1.8.0