wxr
2024-10-25 9b76aa77b9c5bf8ccb373cb30e3dca85d224175e
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()
        {
@@ -406,7 +404,7 @@
                            try
                            {
                                var topic = e.ApplicationMessage.Topic;
                                MainPage.Log($"收到mqtt主题:{topic}");
                                //MainPage.Log($"收到mqtt主题:{topic}");
                                //一端口主题处理
                                if (DB_ResidenceData.Instance.GatewayType == 0 && !DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
                                {
@@ -861,6 +859,10 @@
        static void ReceiveNotifySqueezeAsync(string mMes)
        {
            MainPage.Log($"推送标识:{mMes};本地标识:{PushSignStr}");
#if DEBUG
            MainPage.Log("调试模式,不触发挤下线。");
            return;
#endif
            if (mMes == PushSignStr) return;//是自己的登录推送不处理//或者当前不是远程链接状态
            DisConnectRemoteMqttClient("挤下线");
@@ -871,21 +873,6 @@
                HDLCommon.Current.CheckLogout();
            });
        }
        ///// <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>
        /// 推送挤下线主题
@@ -901,6 +888,7 @@
            {
                case "15626203746":
                case "13580507523":
                case "18475593023":
                    return;
            }