From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/Entity/DB_ResidenceData.cs | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index b41e1dc..887d4a1 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -76,7 +76,9 @@
ShowFunction.Sensor,ShowFunction.VideoIntercom,
ShowFunction.SecurityCenter,ShowFunction.Acst,
ShowFunction.MechanicalArm ,
- ShowFunction.SecurityMonitoring,};
+ ShowFunction.SecurityMonitoring,
+ ShowFunction.VideoDoorLock,
+ };
}
return dddd;
}
@@ -152,7 +154,7 @@
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();
@@ -183,7 +185,7 @@
/// <summary>
/// 缃戝叧璇︾粏淇℃伅
/// </summary>
- public HomeGatewayInfo HomeGateway;
+ public HomeGatewayInfo HomeGateway;// = new HomeGatewayInfo ();
/// <summary>
/// 0:涓�绔彛
@@ -504,5 +506,10 @@
}
}
+ /// <summary>
+ /// 绗竴娆＄敵璇峰畾浣嶆潈闄愶紝鐢ㄦ埛鎷掔粷涔嬪悗锛屼笉鑳藉啀娆＄敵璇凤紙Android锛�
+ /// </summary>
+ public bool CheckGPS_IsFirst = true;
+
}
}
--
Gitblit v1.8.0