From 30741caa02ed108fb0fbbaeda91eb6dd7c33fc9f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 27 八月 2021 11:48:35 +0800
Subject: [PATCH] Merge branch 'CJL-Linphone' into wxr7
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index dc250ad..51e02a0 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -387,7 +387,15 @@
if (DB_ResidenceData.Instance.GatewayType == 1)
{
topView.AddChidren(btnSecurityStatus);
- btnSecurityStatus.IsSelected = SecurityCenter.Security.CurrentDefenseMode != null;
+ foreach (var temp in FunctionList.List.securities)
+ {
+ if (temp.status == "enable")
+ {
+ btnSecurityStatus.IsSelected = true;
+ break;
+ }
+ }
+
btnSecurityStatus.MouseUpEventHandler = (sender, e) => {
var page = new ArmCenterPage();
MainPage.BasePageView.AddChidren(page);
@@ -529,27 +537,39 @@
#if DEBUG
+
+
//FunctionList.List.Functions.Add(new Function()
//{
- // spk = SPK.AirFreshStandard,
- // name = "娴嬭瘯鏂伴",
+ // spk = SPK.AirSwitch,
+ // name = "鏅鸿兘绌哄紑",
// attributes = new List<FunctionAttributes>()
// {
// new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "fan",curValue= "on",state = "on" ,value = new List<string>(){ "high","low" } },
// },
//});
FunctionList.List.Functions.Add(new Function()
{
- spk = SPK.SensorGas,
- name = "鐕冩皵浼犳劅鍣�",
+ spk = SPK.AirFreshStandard,
+ name = "娴嬭瘯鏂伴",
attributes = new List<FunctionAttributes>()
{
- new FunctionAttributes(){ key = "enable",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
- new FunctionAttributes(){ key = "status",curValue= "normal",state = "normal" ,value = new List<string>(){ "alarm", "normal" } },
+ new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ new FunctionAttributes(){ key = "fan",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low" } },
},
});
+
+ //FunctionList.List.Functions.Add(new Function()
+ //{
+ // spk = SPK.SensorGas,
+ // name = "鐕冩皵浼犳劅鍣�",
+ // attributes = new List<FunctionAttributes>()
+ // {
+ // new FunctionAttributes(){ key = "enable",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
+ // new FunctionAttributes(){ key = "status",curValue= "normal",state = "normal" ,value = new List<string>(){ "alarm", "normal" } },
+ // },
+ //});
//FunctionList.List.Functions.Add(new Function() { spk = SPK.PjtIr, name = "娴嬭瘯鎶曞奖浠�",
// attributes = new List<FunctionAttributes>() {
@@ -675,7 +695,11 @@
GetUnreadPushMessages();
RegisterGetPushMessageAction();
- waitPage.Hide();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
});
}
catch (Exception ex) {
--
Gitblit v1.8.0