From ea0b1e8e5f43c5fd0a7d479e25ede3b8cbea464a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 02 十二月 2024 17:17:19 +0800
Subject: [PATCH] tcp;可视对讲；
---
HDL_ON/Entity/DB_ResidenceData.cs | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 338462b..cdfcc22 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -73,10 +73,14 @@
ShowFunction.EnergyMonitoring,ShowFunction.IpCam,
ShowFunction.FreshAir,ShowFunction.DoorLock,
ShowFunction.Panel,
- ShowFunction.Sensor,
+ ShowFunction.Sensor,ShowFunction.VideoIntercom,
ShowFunction.SecurityCenter,
+ ShowFunction.SecurityMonitoring,
ShowFunction.MechanicalArm ,
- ShowFunction.SecurityMonitoring,};
+ //ShowFunction.Series,
+ ShowFunction.Aks,
+ ShowFunction.VideoDoorLock,
+ };
}
return dddd;
}
@@ -93,7 +97,7 @@
{
instance = new DB_ResidenceData();
instance.SaveResidenceData();
- instance.residenceImage = "Classification/Room/Roombg8.png";
+ instance.residenceImage = "Classification/Room/HomePagebg.png";
instance.HomeGateway = new HomeGatewayInfo()
{
homeId = "1396717478877241345",
@@ -132,7 +136,7 @@
instance = new DB_ResidenceData { };
return instance;
}
- instance.residenceImage = "Classification/Room/Roombg8.png";
+ instance.residenceImage = "Classification/Room/HomePagebg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
SpatialInfo.CurrentSpatial.InitRoomListFunctions();
@@ -159,10 +163,10 @@
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>
@@ -176,14 +180,9 @@
public bool SupportVisitorManage = false;
/// <summary>
- /// 鏄惁鏀寔鍏ㄨ閫�
- /// </summary>
- public bool SupportFVDevice = false;
-
- /// <summary>
/// 缃戝叧璇︾粏淇℃伅
/// </summary>
- public HomeGatewayInfo HomeGateway;
+ public HomeGatewayInfo HomeGateway;// = new HomeGatewayInfo ();
/// <summary>
/// 0:涓�绔彛
@@ -504,5 +503,10 @@
}
}
+ /// <summary>
+ /// 绗竴娆＄敵璇峰畾浣嶆潈闄愶紝鐢ㄦ埛鎷掔粷涔嬪悗锛屼笉鑳藉啀娆＄敵璇凤紙Android锛�
+ /// </summary>
+ public bool CheckGPS_IsFirst = true;
+
}
}
--
Gitblit v1.8.0