From 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:55:30 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/Entity/DB_ResidenceData.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 887d4a1..3fe97ad 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -78,6 +78,7 @@
ShowFunction.MechanicalArm ,
ShowFunction.SecurityMonitoring,
ShowFunction.VideoDoorLock,
+ ShowFunction.Series,
};
}
return dddd;
@@ -95,7 +96,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 +135,7 @@
instance = new DB_ResidenceData { };
return instance;
}
- instance.residenceImage = "Classification/Room/Roombg.png";
+ instance.residenceImage = "Classification/Room/HomePagebg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
SpatialInfo.CurrentSpatial.InitRoomListFunctions();
@@ -161,10 +162,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