From b847c06d8617efb2cbbad6f11b0344b779138e92 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 14 十月 2024 18:03:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into feature/v2.7_迭代
---
HDL_ON/DAL/Mqtt/MqttClient.cs | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index cb8b7c4..429c0a7 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -59,7 +59,7 @@
/// <summary>
/// 鎺ㄩ�佹爣璇�
/// </summary>
- static string PushSignStr = DateTime.Now.Ticks.ToString();
+ static string PushSignStr = OnAppConfig.Instance.PushSignStr;
/// <summary>
/// 鏂紑杩滅▼Mqtt鐨勯摼鎺�
@@ -127,8 +127,6 @@
{
InitMqtt();
}
-
- public static bool IsInitMqtt = false;
static void InitMqtt()
{
@@ -872,21 +870,6 @@
});
}
- ///// <summary>
- ///// 鏀跺埌CheckGateway涓婚
- ///// </summary>
- //static void ReceiveCheckGateway(string mMes)
- //{
- // if (!Control.Ins.IsRemote) return;
-
- // Utlis.WriteLine("ReceiveCheckGateway锛�");
-
- // //CheckIfNeedReadAllDeviceStatus ();
-
- // //var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(mMes);
- // Control.Ins.GatewayOnline = true;
- //}
-
/// <summary>
/// 鎺ㄩ�佹尋涓嬬嚎涓婚
/// </summary>
@@ -901,6 +884,7 @@
{
case "15626203746":
case "13580507523":
+ case "18475593023":
return;
}
--
Gitblit v1.8.0