From 8960f866958ece0900b0ee13e70c9320507f98db Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 二月 2023 18:50:23 +0800
Subject: [PATCH] 2023年02月07日18:50:21
---
HDL_ON/Entity/DB_ResidenceData.cs | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 75d6fc6..5030525 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -54,11 +54,33 @@
}
}
+ private List<ShowFunction> dddd;
+
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public List<ShowFunction> functionTypeList = new List<ShowFunction>();
+ public List<ShowFunction> ShowFunctionTypeList
+ {
+ get
+ {
+ if (dddd == null)
+ {
+ dddd = new List<ShowFunction>(){
+ ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
+ ShowFunction.FloorHeating,ShowFunction.Music,
+ ShowFunction.Electric,ShowFunction.Environmental,
+ ShowFunction.EnergyMonitoring,ShowFunction.IpCam,
+ ShowFunction.FreshAir,ShowFunction.DoorLock,
+ ShowFunction.Panel,
+ ShowFunction.Sensor,ShowFunction.VideoIntercom,
+ ShowFunction.SecurityCenter,ShowFunction.Acst,
+ ShowFunction.MechanicalArm ,
+ ShowFunction.SecurityMonitoring,};
+ }
+ return dddd;
+ }
+ }
static DB_ResidenceData instance;
public static DB_ResidenceData Instance
@@ -70,16 +92,6 @@
if(MainPage.NoLoginMode)
{
instance = new DB_ResidenceData();
- instance.functionTypeList.AddRange(new List<ShowFunction> {
- ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
- ShowFunction.FloorHeating,ShowFunction.Music,
- ShowFunction.Electric,ShowFunction.Environmental,
- ShowFunction.EnergyMonitoring,
- ShowFunction.FreshAir,ShowFunction.DoorLock,
- ShowFunction.Panel,ShowFunction.SecurityMonitoring,
- ShowFunction.Sensor,ShowFunction.VideoIntercom,
- ShowFunction.SecurityCenter
- });
instance.SaveResidenceData();
instance.residenceImage = "Classification/Room/Roombg.png";
instance.HomeGateway = new HomeGatewayInfo()
@@ -111,16 +123,6 @@
{
instance = temp;
}
- instance.functionTypeList.AddRange(new List<ShowFunction> {
- ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
- ShowFunction.FloorHeating,ShowFunction.Music,
- ShowFunction.Electric,ShowFunction.Environmental,
- ShowFunction.EnergyMonitoring,
- ShowFunction.FreshAir,ShowFunction.DoorLock,
- ShowFunction.Panel,ShowFunction.SecurityMonitoring,
- ShowFunction.Sensor,ShowFunction.VideoIntercom,
- ShowFunction.SecurityCenter
- });
instance.SupportFacePass = false;
instance.SaveResidenceData();
}
@@ -156,11 +158,12 @@
HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
+#if IOS
//閫�鍑哄叏瑙嗛�氱櫥褰�
Shared.IOS.HDLFVSDK.Video.Logout();
//閲嶇疆榛樿涓嶆敮鎸佸叏瑙嗛��
Entity.DB_ResidenceData.Instance.SupportFVDevice = false;
-
+#endif
}
/// <summary>
/// 鏄惁鏀寔浜鸿劯閫氳
@@ -415,7 +418,7 @@
}
- #region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
+#region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
/// <summary>
/// oid鏁版嵁淇濆瓨鐨勬枃浠跺悕
/// </summary>
@@ -467,8 +470,12 @@
Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes);
}
- #endregion
+#endregion
+ /// <summary>
+ /// 鍦烘櫙绛涢�夋椂锛岄�夋嫨鐨勬埧闂�
+ /// </summary>
+ public string sceneChooseRoomId = "";
/// <summary>
--
Gitblit v1.8.0