From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/Entity/DB_ResidenceData.cs | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 67b7adf..f734255 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -76,10 +76,7 @@
ShowFunction.Sensor,ShowFunction.VideoIntercom,
ShowFunction.SecurityCenter,ShowFunction.Acst,ShowFunction.InverterJinmao,
ShowFunction.MechanicalArm ,
- ShowFunction.SecurityMonitoring,
- ShowFunction.VideoDoorLock,
ShowFunction.Series,
- ShowFunction.Aks,
};
}
return dddd;
@@ -159,7 +156,7 @@
FunctionList.List.ClearDatas();
///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
- HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
+ UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
#if IOS
--
Gitblit v1.8.0