Merge remote-tracking branch 'origin/wjc' into wxr0114

wxr

2022-01-14 0c1b0cdf903114c4214f6b9298ecd440972a42b5

 HDL_ON/Common/ApiUtlis.cs

@@ -157,6 +157,7 @@
                    if (deviceResult.Code == StateCode.SUCCESS)
                    {
                        endTime = DateTime.Now.AddSeconds(100);

                        MainPage.Log($"读取设备信息成功");
                        var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
                        if (deviceList == null)
@@ -369,8 +370,6 @@
                    if (DB_ResidenceData.Instance.CurrentRegion != null)
                    {
                        #region 读取本地数据
                        //读取音乐信息
                        UI.Music.A31MusicModel.ReadMusicStates();
                        //搜索网关
                        DriverLayer.Control.Ins.SearchLoaclGateway();
                        //重新连接mqtt