Revert "Merge branch 'tzy' into NewFilePath"

wxr

2020-12-17 1a13c963a5fb8cad92bf03667e411f46d6a6a843

 HDL_ON/DAL/Mqtt/MqttClient.cs

@@ -268,10 +268,10 @@
                                else
                                {
                                    SetGatewayOnlineResetCheck();
                                    var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, DB_ResidenceData.residenceData.HomeGateway.aesKey);
                                    var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, DB_ResidenceData.Instance.HomeGateway.aesKey);
                                    
                                    //bus数据解析
                                    if (DB_ResidenceData.residenceData.GatewayType == 0)
                                    if (DB_ResidenceData.Instance.GatewayType == 0)
                                    {
                                        var packet = new Packet();

@@ -289,7 +289,7 @@
                                    {
                                        //A协议数据处理
                                        var revString = Encoding.UTF8.GetString(bytes);
                                        Control.Ins.UpdataFunctionStatus(revString);
                                        Control.Ins.UpdataFunctionStatus(revString,null);
                                    }
                                }
                            }
@@ -310,11 +310,27 @@
                    if (RemoteMqttClient.ConnectedHandler == null)
                    {
                        RemoteMqttClient.UseConnectedHandler(async (e) => {
                            Control.Ins.GatewayOnline = true;
                            if (DB_ResidenceData.Instance.HomeGateway.gatewayStatus)
                            {
                                Control.Ins.GatewayOnline = true;
                            }
                            else
                            {
                                //new System.Threading.Thread(() => {
                                //    while(true)
                                //    {
                                //        System.Threading.Thread.Sleep(1000);
                                //        if (DB_ResidenceData.Instance.HomeGateway.GatewayOnline)
                                //        {
                                //            Control.Ins.GatewayOnline = true;
                                //            break;
                                //        }
                                //    }
                                //}) { IsBackground = true }.Start();
                            }
                            IfNeedReadAllDeviceStatus = true;
                            Utlis.WriteLine($"============>Mqtt远程连接成功");
                            SendPushSignOut();
                            FunctionList.List.ReadAllFunctionStatus();
                        });
                    }
                    #endregion
@@ -371,7 +387,7 @@
        {
            try
            {
                if (MqttInfoConfig.Current.HomeGatewayInfo != null && MqttInfoConfig.Current.HomeGatewayInfo.mac == Entity.DB_ResidenceData.residenceData.residenceGatewayMAC)
                if (MqttInfoConfig.Current.HomeGatewayInfo != null && MqttInfoConfig.Current.HomeGatewayInfo.mac == Entity.DB_ResidenceData.Instance.residenceGatewayMAC)
                {
                    await MQTTConnectAsync();
                }
@@ -524,7 +540,9 @@
        /// </summary>
        static void ReceiveNotifySqueezeAsync(string mMes)
        {

#if DEBUG
            return;
#endif
            if (mMes == PushSignStr) return;//是自己的登录推送不处理

            //断开远程连接
@@ -536,13 +554,15 @@

            DisConnectRemoteMqttClient("挤下线");

            UserInfo.Current.LastTime = DateTime.MinValue;
            UserInfo.Current.SaveUserInfo();
            HDLCommon.Current.CheckLogout();

            Application.RunOnMainThread(() => {
                MainPage.GoLoginPage(UserInfo.Current);
                //弹窗提示被挤下线
            });
            //UserInfo.Current.LastTime = DateTime.MinValue;
            //UserInfo.Current.SaveUserInfo();

            //Application.RunOnMainThread(() => {
            //    MainPage.GoLoginPage(UserInfo.Current);
            //    //弹窗提示被挤下线
            //});

            //2020-08-11 删除推送数据
            //HDLRequest.Current.PushserivceSignOut ();
@@ -654,10 +674,10 @@
                MqttInfoConfig.Current.mMqttInfo = mqttInfoRequestResult_Obj;
                await MQTTConnectAsync();
                //1.判断是否绑定了网关，获取网关远程连接的加密KEY
                if (DB_ResidenceData.residenceData.CheckWhetherGatewayIsBound())
                if (DB_ResidenceData.Instance.CheckWhetherGatewayIsBound())
                {
                    //2.找出是否存在匹配当前住宅的mac，存在再进行远程。
                    MqttInfoConfig.Current.HomeGatewayInfo = DB_ResidenceData.residenceData.HomeGateway;
                    MqttInfoConfig.Current.HomeGatewayInfo = DB_ResidenceData.Instance.HomeGateway;
                    //3.开始连接
                    await MQTTConnectAsync();
                }