2020-05-26-2

陈嘉乐

2020-05-26 cc02eeece31d38a0e855280609e415a3d1a18941

2020-05-26-2

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,7 +1,7 @@
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/Music/A31PlayMusicPage.cs">
    <Files>
      <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="32" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -11,13 +11,16 @@
              <Node name="Common" expanded="True" />
              <Node name="UI" expanded="True">
                <Node name="Music" expanded="True">
                  <Node name="View" expanded="True" />
                  <Node name="A31PlayMusicPage.cs" selected="True" />
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="Assets" expanded="True">
                <Node name="Phone" expanded="True" />
                <Node name="Phone" expanded="True">
                  <Node name="MusicIcon" expanded="True" />
                </Node>
              </Node>
            </Node>
          </Node>

 .vs/HDL_APP_Project/xs/sqlite3/storage.ide

Binary files differ

 .vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm

Binary files differ

 .vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal

Binary files differ

 HDL-ON_Android/Assets/Phone/.DS_Store

Binary files differ

 HDL_ON/UI/.DS_Store

Binary files differ

 HDL_ON/UI/Music/.DS_Store

Binary files differ

 HDL_ON/UI/Music/A31PlayMusicPage.cs

@@ -156,7 +156,7 @@
                    Width = Application.GetRealWidth(344),
                    Height = Application.GetRealHeight(460),
                    BackgroundColor = Color.WhiteColor,
                    Radius=(uint)Application.GetRealHeight(12),
                    Radius = (uint)Application.GetRealHeight(12),
                };
                popFra.AddChidren(dialogFra);
                dialogFra.AddChidren(loading);//dialogFra刷新图标父控件
@@ -210,7 +210,7 @@
                    Y = Application.GetRealHeight(15),
                    Width = Application.GetRealWidth(28 + 12),//28
                    Height = Application.GetRealHeight(20),
                    TextID =StringId.cancelMusic,
                    TextID = StringId.cancelMusic,
                    TextColor = Color.MusicNoTxetColor,
                    TextSize = TextSize.Text14,
                    TextAlignment = TextAlignment.CenterLeft,
@@ -313,12 +313,11 @@
                });

            };

            ///音量进度条点击事件
            EventHandler<int> progressClick = (sender, e) =>
            {
                playView.volValueBtn.Text = playView.volSeekBar.Progress + "%";
                SendMethod.ControlVolume(playView.volSeekBar.Progress,A31MusicModel.Current);
                SendMethod.ControlVolume(playView.volSeekBar.Progress, A31MusicModel.Current);
                A31MusicModel.Current.A31PlayStatus.vol = playView.volSeekBar.Progress.ToString();
            };
            playView.volSeekBar.OnProgressChangedEvent += progressClick;
@@ -367,12 +366,11 @@
                    return;
                }
                playView.volSeekBar.Progress = volume;
                SendMethod.ControlVolume(playView.volSeekBar.Progress,A31MusicModel.Current);
                SendMethod.ControlVolume(playView.volSeekBar.Progress, A31MusicModel.Current);
                A31MusicModel.Current.A31PlayStatus.vol = playView.volSeekBar.Progress.ToString();
            };

        }

        System.Threading.Thread timerThread;
        /// <summary>
        /// 定时更新状态
@@ -508,7 +506,8 @@
                            }
                            playView.songNameTextView.Text = (A31MusicModel.Current.A31PlayStatus.Title == null ? "Unkown" : A31MusicModel.Current.A31PlayStatus.Title);
                            playView.singerBtn.Text = (A31MusicModel.Current.A31PlayStatus.Artist == null ? "Unkown" : A31MusicModel.Current.A31PlayStatus.Artist.Trim());

                            //更新源的界面
                            showSourcePage();
                        }
                        catch (Exception e)
                        {
@@ -520,6 +519,150 @@
            })
            { IsBackground = true };
            timerThread.Start();
        }
        /// <summary>
        /// 更新不同音乐源界面图标状态
        /// </summary>
        void showSourcePage()
        {
            playView.loveBtn.Alpha = 1;
            playView.loveBtn.Enable = true;

            playView.playlistBtn.Alpha = 1;
            playView.playlistBtn.Enable = true;

            playView.prevBtn.Alpha = 1;
            playView.prevBtn.Enable = true;

            playView.nextBtn.Alpha = 1;
            playView.nextBtn.Enable = true;

            playView.playOrderBtn.Alpha = 1;
            playView.playOrderBtn.Enable = true;

            //btnPlay.Alpha = 1;
            //btnPlay.Enable = true;

            playView.volSeekBar.IsClickable = true;

            switch (A31MusicModel.Current.A31PlayStatus.Source)
            {

                case "QPLAY"://QQ音乐
                    //currentsource.UnSelectedImagePath = "MusicIcon/qqmusic1.png";
                    playView.loveBtn.Alpha = 0.5f;
                    playView.loveBtn.Enable = false;
                    break;
                case "AIRPLAY"://酷狗音乐
                    //currentsource.UnSelectedImagePath = "MusicIcon/kumusic.png";
                    playView.loveBtn.Alpha = 0.5f;
                    playView.loveBtn.Enable = false;
                    playView.volSeekBar.IsClickable = false;
                    break;
                case "SONGLIST-NETWORK"://本地音乐
                    //currentsource.UnSelectedImagePath = "MusicIcon/musicMusic1.png";
                    break;
                case "SONGLIST-LOCAL"://USB
                    //currentsource.UnSelectedImagePath = "MusicIcon/USB1.png";
                    break;
                case "RADIO-NETWORK"://在线电台
                    //currentsource.UnSelectedImagePath = "MusicIcon/local1.png";
                    playView.playlistBtn.Alpha = 1;
                    playView.playlistBtn.Enable = true;

                    playView.prevBtn.Alpha = 0.5f;
                    playView.prevBtn.Enable = false;

                    playView.nextBtn.Alpha = 0.5f;
                    playView.nextBtn.Enable = false;

                    playView.playOrderBtn.Alpha = 0.5f;
                    playView.playOrderBtn.Enable = false;
                    break;

                case "STATION-NETWORK"://Pandora电台
                    playView.volSeekBar.IsClickable = false;
                    //currentsource.UnSelectedImagePath = "MusicIcon/pandora1.png";
                    playView.loveBtn.Alpha = 0.5f;
                    playView.loveBtn.Enable = false;

                    playView.prevBtn.Alpha = 0.5f;
                    playView.prevBtn.Enable = false;

                    playView.playOrderBtn.Alpha = 0.5f;
                    playView.playOrderBtn.Enable = false;
                    break;

                case "BLUETOOTH"://蓝牙
                   // currentsource.UnSelectedImagePath = "MusicIcon/bluetooth1.png";
                    playView.loveBtn.Alpha = 0.5f;
                    playView.loveBtn.Enable = false;

                    playView.playlistBtn.Alpha = 0.5f;
                    playView.playlistBtn.Enable = false;

                    playView.prevBtn.Alpha = 0.5f;
                    playView.prevBtn.Enable = false;

                    playView.nextBtn.Alpha = 0.5f;
                    playView.nextBtn.Enable = false;

                    playView.playOrderBtn.Alpha = 0.5f;
                    playView.playOrderBtn.Enable = false;

                    //btnPlay.Alpha = 0.5f;
                    //btnPlay.Enable = false;
                    break;


                case "LINE-IN"://线路输入
                    // currentsource.UnSelectedImagePath = "MusicIcon/muiscline1.png";
                    playView.loveBtn.Alpha = 0.5f;
                    playView.loveBtn.Enable = false;

                    playView.playlistBtn.Alpha = 0.5f;
                    playView.playlistBtn.Enable = false;

                    playView.prevBtn.Alpha = 0.5f;
                    playView.prevBtn.Enable = false;

                    playView.nextBtn.Alpha = 0.5f;
                    playView.nextBtn.Enable = false;

                    playView.playOrderBtn.Alpha = 0.5f;
                    playView.playOrderBtn.Enable = false;

                    //btnPlay.Alpha = 0.5f;
                    //btnPlay.Enable = false;
                    break;

                default:
                    //currentsource.UnSelectedImagePath = "MusicIcon/dlna.png";
                    playView.volSeekBar.IsClickable = false;
                    playView.loveBtn.Alpha = 0.5f;
                    playView.loveBtn.Enable = false;

                    playView.playlistBtn.Alpha = 0.5f;
                    playView.playlistBtn.Enable = false;

                    playView.prevBtn.Alpha = 0.5f;
                    playView.prevBtn.Enable = false;

                    playView.nextBtn.Alpha = 0.5f;
                    playView.nextBtn.Enable = false;

                    playView.playOrderBtn.Alpha = 0.5f;
                    playView.playOrderBtn.Enable = false;
                    break;
            }
            //if (A31MusicModel.Current.A31PlayStatus.playSource == "UPnPServer")
            //{
            //    currentsource.UnSelectedImagePath = "MusicIcon/dlna.png";
            //}
            //else if (A31MusicModel.Current.A31PlayStatus.playSource == "Tidal")
            //{
            //    currentsource.UnSelectedImagePath = "MusicIcon/Tidal1.png";
            //}
        }
        /// <summary>
        /// 显示当前播放音乐View
@@ -636,7 +779,7 @@
                            A31MusicModel.Current.A31PlayStatus.Title = songBtn.Text;
                            System.Threading.Tasks.Task.Run(() =>
                            {
                                SendMethod.ListMusicPlay(playListName, clickBtn.Tag,A31MusicModel.Current);
                                SendMethod.ListMusicPlay(playListName, clickBtn.Tag, A31MusicModel.Current);
                            });
                        });
                    });

 HDL_ON/UI/Music/View/PlayView.cs

@@ -16,6 +16,7 @@
            Height = Application.GetRealHeight(526),
            Width = Application.GetRealWidth(327),
            BackgroundImagePath = "MusicIcon/playBj.png",
         
        };
        /// <summary>
        ///  音乐汉字
@@ -167,22 +168,21 @@
            UnSelectedImagePath = "MusicIcon/vol.png",
        };
        /// <summary>
        /// 声音进度条
        /// 音量进度条
        /// </summary>
        public DiyImageSeekBar volSeekBar = new DiyImageSeekBar
        {
            Y = Application.GetRealHeight(418),
            Y = Application.GetRealHeight(395),
            X = Application.GetRealWidth(58),
            Width = Application.GetRealWidth(215),
            Height = Application.GetRealHeight(8),
            Height = Application.GetRealHeight(54),//进度条父控件背景高度
            IsProgressTextShow = false,//显示百分比
            IsClickable = true,//进度条是否滑动
            ProgressBarColor = Color.SelectedColor,//选中进度条颜色
            ThumbImagePath = "MusicIcon/progressIcon.png",//进度条按钮图标
            ThumbImageHeight = Application.GetMinRealAverage(20),//进度条按钮图标的高度（默认正方形：宽和高一样）
            SeekBarViewHeight = Application.GetRealHeight(8),//进度条的高度
            ThumbImageHeight = Application.GetMinRealAverage(54),//进度条按钮图标的高度（默认正方形：宽和高一样）
            SeekBarViewHeight = Application.GetMinRealAverage(8),//进度条的高度
        };
        

        /// <summary>
        /// 音量值百分比;