From 07b0239f824ddb5a0cadf93f20ff6247f72baca2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 一月 2022 11:32:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr0114' into wjc
---
HDL_ON/DAL/Mqtt/MqttClient.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index b638339..c74affe 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -454,10 +454,10 @@
var securityString = Encoding.UTF8.GetString(securityBytes);
var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityStatusObj>(securityString);
MainPage.Log($"瀹夐槻鐘舵�佸彉鍖栵細{securityString}");
+ //Control.Ins.MsgInfoList.Add($"杩滅▼瀹夐槻鐘舵�佸彉鍖栵細{securityString}" + "\r\n");
if (temp != null)
{
- Control_Udp.ReceiveRepeatManager(temp.id, null);
foreach (var updataSecurity in temp.objects)
{
var updataLocalSecurity = FunctionList.List.securities.Find((obj) => obj.sid == updataSecurity.sid);
@@ -484,6 +484,7 @@
var revString = Encoding.UTF8.GetString(bytes);
MainPage.Log($"mqtt 鐘舵�佹洿鏂�:{revString}");
Control.Ins.UpdataFunctionStatus(revString, null, true);
+ //Control.Ins.MsgInfoList.Add(revString + "\r\n");
}
//涓�绔彛鏁版嵁瑙ｆ瀽
else
@@ -752,6 +753,9 @@
/// </summary>
static void ReceiveNotifySqueezeAsync(string mMes)
{
+#if DEBUG
+ return;
+#endif
if (mMes == PushSignStr) return;//鏄嚜宸辩殑鐧诲綍鎺ㄩ�佷笉澶勭悊//鎴栬�呭綋鍓嶄笉鏄繙绋嬮摼鎺ョ姸鎬�
//娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
switch (UserInfo.Current.userMobileInfo)
@@ -808,7 +812,9 @@
static void SendPushSignOut()
{
byte[] message = Encoding.UTF8.GetBytes(PushSignStr);
+#if DEBUG
MqttRemoteSend(message, 4);
+#endif
}
/// <summary>
--
Gitblit v1.8.0