From b002d7e8709e4d6566124bdf7daa4bc3c3fd05d5 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 16 三月 2023 09:55:20 +0800
Subject: [PATCH] 1.新增大华摄像头dll及相关功能 2.更换LCVideoOnsdk.dll(跟大华摄像头有冲突) 3.修改适配版本为12.2(含有swift，需12.2以上支持)
---
HDL_ON/DAL/DriverLayer/Control.cs | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index ec10084..652bc0d 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -1071,7 +1071,7 @@
//2021-09-23 鏂板鑾峰彇褰撳墠缃戝叧鏄惁鏈湴鍔犲瘑
Ins.IsLocalEncrypt = device.isLocalEncrypt;
//MainPage.Log("缃戝叧鏈湴鍔犲瘑鐘舵�侊細" + device.local_encrypt.ToString());
-
+ //鐧诲綍缃戝叧Tcp
OpenTcpClent();
@@ -1399,7 +1399,7 @@
EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
//A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(localFunction);
break;
- case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
case SPK.SensorEnvironment2:
case SPK.SensorEnvironment3:
if (localFunction.GetAttributes().Contains(FunctionAttributeKey.Temperature))
@@ -1494,14 +1494,12 @@
//wjc
break;
case SPK.Inverter:
- MainPage.Log("閫嗗彉鍣ㄦ暟鎹洿鏂�");
+ case SPK.InverterRst:
var status = new Dictionary<string, object> { ["method"] = "status", ["data"] = temp.objects };
- MainPage.Log("閫嗗彉鍣ㄦ暟鎹洿鏂�1");
Application.RunOnMainThread(() =>
{
Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
});
- MainPage.Log("閫嗗彉鍣ㄦ暟鎹洿鏂�2");
break;
}
--
Gitblit v1.8.0