From 51f5f7a47d394163dccf2441cd04c2a19ceeda34 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 08 一月 2024 09:41:59 +0800
Subject: [PATCH] Merge branch 'Dev-Google-V2.4.3' into Google-2023-11-17-1
---
HDL_ON/Entity/DB_ResidenceData.cs | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 887d4a1..f80f413 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -74,10 +74,9 @@
ShowFunction.FreshAir,ShowFunction.DoorLock,
ShowFunction.Panel,
ShowFunction.Sensor,ShowFunction.VideoIntercom,
- ShowFunction.SecurityCenter,ShowFunction.Acst,
+ ShowFunction.SecurityCenter,
ShowFunction.MechanicalArm ,
- ShowFunction.SecurityMonitoring,
- ShowFunction.VideoDoorLock,
+ ShowFunction.Series,
};
}
return dddd;
@@ -95,7 +94,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",
@@ -134,7 +133,7 @@
instance = new DB_ResidenceData { };
return instance;
}
- instance.residenceImage = "Classification/Room/Roombg.png";
+ instance.residenceImage = "Classification/Room/HomePagebg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
SpatialInfo.CurrentSpatial.InitRoomListFunctions();
@@ -161,10 +160,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>
--
Gitblit v1.8.0