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

wxr

2022-01-23 e6156ab41aea16796798eb32fd7ce664345a8220

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -26,7 +26,7 @@

    public class Control
    {
       

        static Control _control;
        public static Control Ins
        {
@@ -866,7 +866,7 @@

                if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply || receiveObj.Topic == CommunicationTopic.GatewayBroadcast)
                {
                   

                    var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]);
                    if (bodyJObj == null)
                    {
@@ -980,7 +980,6 @@
                        var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
                        if (localFunction == null)
                        {
                            MainPage.Log("找不到音乐播放器添=======" + revString);
                            continue;
                        }
                        MainPage.Log(localFunction.name);
@@ -1195,7 +1194,7 @@
                            case SPK.AvMusic:
                            case SPK.MusicStandard:
                                //UI.Music.MusicMain.mMusicMain.RefreshView(updateTemp);
                                Console.WriteLine("音乐播放器显示状态======="+ revString);
                                //Console.WriteLine("音乐播放器显示状态======="+ revString);
                                //wjc
                                break;
                        }
@@ -1245,4 +1244,4 @@

        #endregion
    }
}
}