2021-1-14-1

wjc

2022-01-14 80e4fc87ee91231d1b452c845ff8a57727d4dc44

2021-1-14-1

更新了

 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)

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -972,6 +972,7 @@
                        var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
                        if (localFunction == null)
                        {
                            Console.WriteLine("找不到音乐播放器添=======" + revString);
                            continue;
                        }
                        if (Ins.GatewayOnline_Local && isCloudData)//本地链接，除了涂鸦设备数据之外的云端数据不处理
@@ -998,7 +999,8 @@
                        {
                            localFunction.time_stamp = temp.time_stamp;
                            localFunction.SetAttrState(attr.key, attr.value);
                            
                            Console.WriteLine("音乐播放器添加缓存数据=======" + revString);

                        }

                        //更新界面状态

 HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs

@@ -13,7 +13,7 @@
        static readonly string a31MusiceModeListFilePath = "A31MusiceModeListFilePath";
        static A31MusicModel()
        {
            Refresh();
            //Refresh();
        }

     
@@ -78,12 +78,6 @@
        public bool IsCanShow = true;

        /// <summary>
        /// 是否在线，如果在线就允许读取信息
        /// </summary>
        public bool IsOnLine = true;


        /// <summary>
        /// 列表
        /// </summary>
        public List<PalyList> palyLists = new List<PalyList>(); 
@@ -92,11 +86,6 @@
        ///  喜爱音乐列表
        /// </summary>
        public List<Songs> LoveMusicInfoList = new List<Songs>();

        /// <summary>
        /// DLNA所有列表
        /// </summary>
        public List<Songs> dlnaMusicInfoLists = new List<Songs>();

        /// <summary>
        ///创建音乐文件列表
@@ -122,10 +111,7 @@
            }
            return list.songs;
        }
        /// <summary>
        /// 记录主播放器是否被收藏(秀桡定义的)
        /// </summary>
        public bool MainPlayCollection = false;
       

        public Slaves Slave = new Slaves();
        /// <summary>

 HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs

@@ -42,6 +42,7 @@

        public void Show()
        {

            ///1秒定时更新状态
            timerUpdateStatus();
            #region   ---界面布局---
@@ -292,7 +293,7 @@
                            playView.endTimeBtn.Text = totalTime;

                            topView.topNameBtn.Text = A31MusicModel.Current.functionMusic.name;

                            string s = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.mode);
                            switch (A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.mode))
                            {
                                case ValueProperty.list_cycle://列表循环
@@ -374,7 +375,7 @@
                            Volume.MusicVolume = playView.volSeekBar.Progress;
                            //当前播放音乐时间
                            //按道理不会为空，GetAttrState("playing_time")值可能为空，强制转换int.Parse(）会出现异常，不过也做了异常处理了
                            int playSecond = int.Parse(A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playing_time))/1000+ (int)(DateTime.Now - A31MusicModel.Current.LastDateTime).TotalSeconds;
                            int playSecond = int.Parse(A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playing_time))+ (int)(DateTime.Now - A31MusicModel.Current.LastDateTime).TotalSeconds;

                            int playMusicMinute = playSecond / 60;
                            //秒钟
@@ -398,7 +399,6 @@
                                    playView.diyArcSeekBar.Progress = (int)(playSecond * 100.0 / totalSecond);//+1
                                }

                                Console.WriteLine("打印时间======"+playTime);

                            }
                            else
@@ -559,6 +559,8 @@
        {
            UpdateThread.updateCurrMusicThread(frameLayout, middViewLayout, A31MusicModel.Current);
        }

     

    }
}

 HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs

@@ -102,10 +102,9 @@

            verticalRefresh.BeginHeaderRefreshingAction += () =>
            {

                SeachMusic();
                verticalRefresh.EndHeaderRefreshing();

                ////发送读取音乐播放器状态线程
                SeachMusic();
            };
            this.AddChidren(loading);
            SeachMusic();
@@ -116,15 +115,18 @@
        /// </summary>
        void SeachMusic()
        {

            Application.RunOnMainThread(() =>
            {
                verticalRefresh.RemoveAll();

                var musicListFunction = SendMethod.mMethod.GetMusicList;
                var musicListFunction = FunctionList.List.GetMusicList();
                for (int i = 0; i < musicListFunction.Count; i++)
                {
                    var function = musicListFunction[i];
                    var music = A31MusicModel.A31MusicModelList.Find((music) => music.functionMusic.deviceId == function.deviceId);
                    var music = A31MusicModel.A31MusicModelList.Find((music) =>
                   (music.functionMusic.deviceId == function.deviceId && function.spk == "music.standard") || (
                     music.functionMusic.deviceId == function.deviceId && function.spk == "av.music")
                    );
                    if (music == null)
                    {
                        A31MusicModel.A31MusicModelList.Add(new A31MusicModel { functionMusic = function });
@@ -144,6 +146,7 @@
                        //不在线不显示
                        continue;
                    }
                  
                    Application.RunOnMainThread(() =>
                    {
                        MusicListView(a31player);

 HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs

@@ -57,7 +57,7 @@
        {
            try
            {
                //RefreshDeviceStatus(functionIds);
               // RefreshDeviceStatus(functionIds);
                a31Music.LastDateTime = DateTime.Now;
                ///从缓存里面查找音乐播放器对象<缓存数据收到推送过来的状态会更新缓存数据>
                var allLocalFuntion = FunctionList.List.GetDeviceFunctionList();
@@ -68,6 +68,7 @@
                }
                ///更新的数据
                a31Music.functionMusic = localFunction;

            }
            catch { }
        }

 HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs

@@ -14,6 +14,8 @@
            Height = Application.GetRealHeight(526),
            Width = Application.GetRealWidth(327),
            BackgroundImagePath = "MusicIcon/playBj.png",
            Name="fl",
            
        };
        /// <summary>
        ///  音乐汉字
@@ -28,6 +30,7 @@
            TextSize = TextSize.Text24,
            TextAlignment = TextAlignment.CenterLeft,
            TextID = StringId.a31Music,
            Name = "musicname"
        };
        /// <summary>
        ///  区域名称
@@ -41,6 +44,7 @@
            TextColor = MusicColor.MusicNoTxetColor,
            TextSize = TextSize.Text12,
            TextAlignment = TextAlignment.CenterLeft,
            Name= "region",
        };
        /// <summary>
        ///收藏图标
@@ -53,6 +57,7 @@
            Height = Application.GetRealWidth(40),
            UnSelectedImagePath = "MusicIcon/collect.png",
            SelectedImagePath = "MusicIcon/collectSelected.png",
            Name = "collect"
        };
        /// <summary>
        ///快,退进度条父控件