From 917c28d31963e893d7dd26f933adfa3bde3cf260 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:54:29 +0800
Subject: [PATCH] feature 门锁不支持一键开锁设备按钮置灰&&门锁呼叫
---
HDL_ON/Entity/DB_ResidenceData.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 3a0e4ee..8b5e4cb 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -76,7 +76,10 @@
ShowFunction.Sensor,ShowFunction.VideoIntercom,
ShowFunction.SecurityCenter,ShowFunction.Acst,
ShowFunction.MechanicalArm ,
- ShowFunction.SecurityMonitoring,};
+ ShowFunction.SecurityMonitoring,
+ ShowFunction.VideoDoorLock,
+ ShowFunction.Series,
+ };
}
return dddd;
}
@@ -159,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>
@@ -183,7 +186,7 @@
/// <summary>
/// 缃戝叧璇︾粏淇℃伅
/// </summary>
- public HomeGatewayInfo HomeGateway;
+ public HomeGatewayInfo HomeGateway;// = new HomeGatewayInfo ();
/// <summary>
/// 0:涓�绔彛
@@ -504,5 +507,10 @@
}
}
+ /// <summary>
+ /// 绗竴娆＄敵璇峰畾浣嶆潈闄愶紝鐢ㄦ埛鎷掔粷涔嬪悗锛屼笉鑳藉啀娆＄敵璇凤紙Android锛�
+ /// </summary>
+ public bool CheckGPS_IsFirst = true;
+
}
}
--
Gitblit v1.8.0