From 2d03454a09569c60ac1e658bacccd2bf0e2d0dfd Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 25 九月 2023 11:08:23 +0800
Subject: [PATCH] Merge branch 'wjc' into Dev-Branch
---
HDL_ON/Entity/DB_ResidenceData.cs | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 2f384e8..1f8b69d 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -70,12 +70,17 @@
ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
ShowFunction.FloorHeating,ShowFunction.Music,
ShowFunction.Electric,ShowFunction.Environmental,
- ShowFunction.EnergyMonitoring,
+ ShowFunction.EnergyMonitoring,ShowFunction.IpCam,
ShowFunction.FreshAir,ShowFunction.DoorLock,
- ShowFunction.Panel,ShowFunction.SecurityMonitoring,
+ ShowFunction.Panel,
ShowFunction.Sensor,ShowFunction.VideoIntercom,
ShowFunction.SecurityCenter,ShowFunction.Acst,
- ShowFunction.MechanicalArm ,ShowFunction.IpCam};
+ ShowFunction.MechanicalArm ,
+ ShowFunction.SecurityMonitoring,
+ ShowFunction.VideoDoorLock,
+ ShowFunction.Series,
+ ShowFunction.Aks,
+ };
}
return dddd;
}
@@ -92,7 +97,7 @@
{
instance = new DB_ResidenceData();
instance.SaveResidenceData();
- instance.residenceImage = "Classification/Room/Roombg.png";
+ instance.residenceImage = "Classification/Room/HomePagebg.png";
instance.HomeGateway = new HomeGatewayInfo()
{
homeId = "1396717478877241345",
@@ -131,7 +136,7 @@
instance = new DB_ResidenceData { };
return instance;
}
- instance.residenceImage = "Classification/Room/Roombg.png";
+ instance.residenceImage = "Classification/Room/HomePagebg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
SpatialInfo.CurrentSpatial.InitRoomListFunctions();
@@ -151,17 +156,17 @@
DriverLayer.Control.Ins.GatewayOnline_Cloud = false;
DriverLayer.Control.Ins.GatewayOnline_Local = false;
SpatialInfo.CurrentSpatial.Clear();
- FunctionList.List.Clear();
+ FunctionList.List.ClearDatas();
///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
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;
+ ////閫�鍑哄叏瑙嗛�氱櫥褰�
+ //Shared.IOS.HDLFVSDK.Video.Logout();
+ ////閲嶇疆榛樿涓嶆敮鎸佸叏瑙嗛��
+ //Entity.DB_ResidenceData.Instance.SupportFVDevice = false;
#endif
}
/// <summary>
@@ -182,7 +187,7 @@
/// <summary>
/// 缃戝叧璇︾粏淇℃伅
/// </summary>
- public HomeGatewayInfo HomeGateway;
+ public HomeGatewayInfo HomeGateway;// = new HomeGatewayInfo ();
/// <summary>
/// 0:涓�绔彛
@@ -297,16 +302,27 @@
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
WirteResidenceInfo(ssd);
}
- /// <summary>
- /// 褰撳墠閫夋嫨鐨勬ゼ灞�
- /// </summary>
- public string CurFoor = Language.StringByID(StringId.All);
+
+ SpatialInfo _CurFloor;
/// <summary>
/// 褰撳墠閫夋嫨鐨勬ゼ灞�
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public SpatialInfo CurFloor = new SpatialInfo() { roomId = "", roomName = Language.StringByID(StringId.All)};
+ public SpatialInfo CurFloor {
+ get
+ {
+ if(_CurFloor == null || _CurFloor.roomName == "")
+ {
+ _CurFloor = new SpatialInfo() { roomId = "", roomName = Language.StringByID(StringId.All) };
+ }
+ return _CurFloor;
+ }
+ set
+ {
+ _CurFloor = value;
+ }
+ }
/// <summary>
/// 鍒嗙被鐣岄潰鏄剧ず鐨勬ゼ灞�
/// </summary>
@@ -492,5 +508,10 @@
}
}
+ /// <summary>
+ /// 绗竴娆＄敵璇峰畾浣嶆潈闄愶紝鐢ㄦ埛鎷掔粷涔嬪悗锛屼笉鑳藉啀娆＄敵璇凤紙Android锛�
+ /// </summary>
+ public bool CheckGPS_IsFirst = true;
+
}
}
--
Gitblit v1.8.0