Merge remote-tracking branch 'origin/wjc' into feature/v2.7_迭代

wxr

2024-10-14 b847c06d8617efb2cbbad6f11b0344b779138e92

 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;
            }