Merge branch 'Dev-Wxr' into wjc

wjc

2023-04-11 e74f8bfbe6c52f220deef5fc99a53c3a7872808d

 HDL_ON/DAL/Mqtt/MqttClient.cs

@@ -269,7 +269,7 @@
                        deviceOnlinePush,
                        securityStatusChange});
                    //订阅群控状态
                    if (DB_ResidenceData.Instance.CurrentRegion.isSupportGroupControl)
                    if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
                    {
                        await RemoteMqttClient.SubscribeAsync(groupControlStatus);
                    }
@@ -870,7 +870,7 @@
        static void ReceiveNotifySqueezeAsync(string mMes)
        {
#if DEBUG
            return;
            //return;
#endif
            if (mMes == PushSignStr) return;//是自己的登录推送不处理//或者当前不是远程链接状态
            //测试账号，不挤下线