From c88a3777ab456af4ecf01604f4b2ae4762852148 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 14 二月 2023 15:02:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc
---
HDL_ON/DAL/DriverLayer/Control.cs | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index ec10084..f464f05 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();
@@ -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