Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2022-04-21 df93e50c747a585aa3acad599ba9be7d9617872d

 HDL_ON/DAL/Mqtt/MqttClient.cs

@@ -357,20 +357,20 @@
                                {
                                    try
                                    {
                                        var mMes = Encoding.UTF8.GetString(e.ApplicationMessage.Payload);
                                        Newtonsoft.Json.Linq.JObject pairs = Newtonsoft.Json.Linq.JObject.Parse(mMes);
                                        var pairSid = pairs.GetValue("sid").ToString();
                                        var pairOnline = pairs.GetValue("online");
                                        if (!string.IsNullOrEmpty(pairSid.ToString()))
                                        {
                                            var function_online = FunctionList.List.Functions.Find((obj) => obj.sid == pairSid);
                                            if (function_online != null){
                                                function_online.online2d = (bool)pairOnline;
                                                HomePage.LoadEvent_RefreshDevcieOnline(function_online);
                                                FunctionPage.UpdataOnline(function_online);
                                                RoomPage.UpdataOnline(function_online);
                                            }
                                        }
                                        //var mMes = Encoding.UTF8.GetString(e.ApplicationMessage.Payload);
                                        //Newtonsoft.Json.Linq.JObject pairs = Newtonsoft.Json.Linq.JObject.Parse(mMes);
                                        //var pairSid = pairs.GetValue("sid").ToString();
                                        //var pairOnline = pairs.GetValue("online");
                                        //if (!string.IsNullOrEmpty(pairSid.ToString()))
                                        //{
                                        //    var function_online = FunctionList.List.Functions.Find((obj) => obj.sid == pairSid);
                                        //    if (function_online != null){
                                        //        function_online.online = (bool)pairOnline;
                                        //        HomePage.LoadEvent_RefreshDevcieOnline(function_online);
                                        //        FunctionPage.UpdataOnline(function_online);
                                        //        RoomPage.UpdataOnline(function_online);
                                        //    }
                                        //}

                                    }
                                    catch(Exception ex)
@@ -511,6 +511,7 @@
                                }
                                #endregion
                                //A网关设备状态-包含涂鸦设备
                                //Tag 网络状态解析
                                else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/property/send")
                                {
                                    var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey);