2020-06-17-1

陈嘉乐

2020-06-17 56ad1b69f1fb2e6439e1a9ec2537ca709b575828

2020-06-17-1

替换全部图标

 HDL-ON_Android/Assets/Phone/MusicIcon/.DS_Store

Binary files differ

 HDL-ON_Android/Assets/Phone/MusicIcon/Merge.png

 HDL-ON_Android/Assets/Phone/MusicIcon/MusicBack.png

 HDL-ON_Android/Assets/Phone/MusicIcon/addMusic.png

 HDL-ON_Android/Assets/Phone/MusicIcon/addMusic1.png

 HDL-ON_Android/Assets/Phone/MusicIcon/bluetooth.png

 HDL-ON_Android/Assets/Phone/MusicIcon/clear.png

 HDL-ON_Android/Assets/Phone/MusicIcon/collect.png

 HDL-ON_Android/Assets/Phone/MusicIcon/collectSelected.png

 HDL-ON_Android/Assets/Phone/MusicIcon/edit.png

 HDL-ON_Android/Assets/Phone/MusicIcon/file.png

 HDL-ON_Android/Assets/Phone/MusicIcon/fileList.png

 HDL-ON_Android/Assets/Phone/MusicIcon/filePause.png

 HDL-ON_Android/Assets/Phone/MusicIcon/filePlay.png

 HDL-ON_Android/Assets/Phone/MusicIcon/line.png

 HDL-ON_Android/Assets/Phone/MusicIcon/list.png

 HDL-ON_Android/Assets/Phone/MusicIcon/localMusic.png

 HDL-ON_Android/Assets/Phone/MusicIcon/love.png

 HDL-ON_Android/Assets/Phone/MusicIcon/love1.png

 HDL-ON_Android/Assets/Phone/MusicIcon/loveMusic.png

 HDL-ON_Android/Assets/Phone/MusicIcon/loveRadio.png

 HDL-ON_Android/Assets/Phone/MusicIcon/loveSelected.png

 HDL-ON_Android/Assets/Phone/MusicIcon/loveSelected1.png

 HDL-ON_Android/Assets/Phone/MusicIcon/myList.png

 HDL-ON_Android/Assets/Phone/MusicIcon/myLove.png

 HDL-ON_Android/Assets/Phone/MusicIcon/next.png

 HDL-ON_Android/Assets/Phone/MusicIcon/next1.png

 HDL-ON_Android/Assets/Phone/MusicIcon/next1Selected.png

 HDL-ON_Android/Assets/Phone/MusicIcon/nextSelected.png

 HDL-ON_Android/Assets/Phone/MusicIcon/noSelectedIcon.png

 HDL-ON_Android/Assets/Phone/MusicIcon/pause.png

 HDL-ON_Android/Assets/Phone/MusicIcon/pause1.png

 HDL-ON_Android/Assets/Phone/MusicIcon/play.png

 HDL-ON_Android/Assets/Phone/MusicIcon/play1.png

 HDL-ON_Android/Assets/Phone/MusicIcon/playBj.png

 HDL-ON_Android/Assets/Phone/MusicIcon/playList.png

 HDL-ON_Android/Assets/Phone/MusicIcon/playStatus.png

 HDL-ON_Android/Assets/Phone/MusicIcon/prev.png

 HDL-ON_Android/Assets/Phone/MusicIcon/prevSeletced.png

 HDL-ON_Android/Assets/Phone/MusicIcon/progressIcon.png

 HDL-ON_Android/Assets/Phone/MusicIcon/prve1.png

 HDL-ON_Android/Assets/Phone/MusicIcon/prve1Selected.png

 HDL-ON_Android/Assets/Phone/MusicIcon/qqMusic.png

 HDL-ON_Android/Assets/Phone/MusicIcon/radio.png

 HDL-ON_Android/Assets/Phone/MusicIcon/radioIcon.png

 HDL-ON_Android/Assets/Phone/MusicIcon/random.png

 HDL-ON_Android/Assets/Phone/MusicIcon/selectedIcon.png

 HDL-ON_Android/Assets/Phone/MusicIcon/set.png

 HDL-ON_Android/Assets/Phone/MusicIcon/single.png

 HDL-ON_Android/Assets/Phone/MusicIcon/sourceNetx.png

 HDL-ON_Android/Assets/Phone/MusicIcon/usb.png

 HDL-ON_Android/Assets/Phone/MusicIcon/vol.png

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -393,7 +393,6 @@
    <AndroidAsset Include="Assets\Phone\MusicIcon\playList.png" />
    <AndroidAsset Include="Assets\Phone\MusicIcon\myLove.png" />
    <AndroidAsset Include="Assets\Phone\MusicIcon\radio.png" />
    <AndroidAsset Include="Assets\Phone\MusicIcon\.DS_Store" />
    <AndroidAsset Include="Assets\Phone\MusicIcon\filePlay.png" />
    <AndroidAsset Include="Assets\Phone\MusicIcon\collect.png" />
    <AndroidAsset Include="Assets\Phone\MusicIcon\loveMusic.png" />

 HDL-ON_Android/Resources/Resource.designer.cs

Diff too large

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -438,8 +438,6 @@
      <BundleResource Include="Resources\Phone\MusicIcon\localMusic.png" />
      <BundleResource Include="Resources\Phone\MusicIcon\next1.png" />
      <BundleResource Include="Resources\Phone\MusicIcon\loveSelected1.png" />
      <BundleResource Include="Resources\Phone\MusicIcon\selectedMusic.png" />
      <BundleResource Include="Resources\Phone\MusicIcon\noMusic.png" />
      <BundleResource Include="Resources\Phone\MusicIcon\addMusic.png" />
      <BundleResource Include="Resources\Phone\MusicIcon\playBj.png" />
      <BundleResource Include="Resources\Phone\MusicIcon\loveRadio.png" />

 HDL-ON_iOS/Resources/Phone/.DS_Store

Binary files differ

 HDL-ON_iOS/Resources/Phone/MusicIcon/.DS_Store

Binary files differ

 HDL-ON_iOS/Resources/Phone/MusicIcon/Merge.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/MusicBack.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/addMusic.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/addMusic1.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/bluetooth.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/clear.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/collect.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/collectSelected.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/edit.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/file.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/fileList.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/filePause.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/filePlay.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/line.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/list.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/localMusic.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/love.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/love1.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/loveMusic.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/loveRadio.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/loveSelected.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/loveSelected1.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/myList.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/myLove.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/next.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/next1.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/next1Selected.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/nextSelected.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/noMusic.png

Binary files differ

 HDL-ON_iOS/Resources/Phone/MusicIcon/noSelectedIcon.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/pause.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/pause1.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/play.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/play1.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/playBj.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/playList.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/playStatus.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/prev.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/prevSeletced.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/progressIcon.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/prve1.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/prve1Selected.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/qqMusic.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/radio.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/radioIcon.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/random.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/selectedIcon.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/selectedMusic.png

Binary files differ

 HDL-ON_iOS/Resources/Phone/MusicIcon/set.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/single.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/sourceNetx.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/usb.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/vol.png

 HDL_APP_Project.sln

@@ -13,9 +13,9 @@
EndProject

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Droid", "Shared.Droid\Shared.Droid.csproj", "{B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}"

EndProject

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Droid.TouchID", "Shared.Droid.TouchID\Shared.Droid.TouchID.csproj", "{693D1597-F3B8-4994-A82D-0BAE73E73230}"

EndProject

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Droid.HDLWidget", "Shared.Droid.HDLWidget\Shared.Droid.HDLWidget.csproj", "{CAC13D54-CD90-4C90-8B3C-ECCFF6A7CA34}"

EndProject

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Droid.TouchID", "Shared.Droid.TouchID\Shared.Droid.TouchID.csproj", "{693D1597-F3B8-4994-A82D-0BAE73E73230}"

EndProject

Global

    GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -87,18 +87,6 @@
        {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Debug|iPhone.Build.0 = Debug|Any CPU

        {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Release|iPhone.ActiveCfg = Release|Any CPU

        {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Release|iPhone.Build.0 = Release|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Debug|Any CPU.Build.0 = Debug|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Release|Any CPU.ActiveCfg = Release|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Release|Any CPU.Build.0 = Release|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Release|iPhoneSimulator.Build.0 = Release|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Debug|iPhone.ActiveCfg = Debug|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Debug|iPhone.Build.0 = Debug|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Release|iPhone.ActiveCfg = Release|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Release|iPhone.Build.0 = Release|Any CPU

        {CAC13D54-CD90-4C90-8B3C-ECCFF6A7CA34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

        {CAC13D54-CD90-4C90-8B3C-ECCFF6A7CA34}.Debug|Any CPU.Build.0 = Debug|Any CPU

        {CAC13D54-CD90-4C90-8B3C-ECCFF6A7CA34}.Release|Any CPU.ActiveCfg = Release|Any CPU

@@ -111,5 +99,17 @@
        {CAC13D54-CD90-4C90-8B3C-ECCFF6A7CA34}.Debug|iPhone.Build.0 = Debug|Any CPU

        {CAC13D54-CD90-4C90-8B3C-ECCFF6A7CA34}.Release|iPhone.ActiveCfg = Release|Any CPU

        {CAC13D54-CD90-4C90-8B3C-ECCFF6A7CA34}.Release|iPhone.Build.0 = Release|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Debug|Any CPU.Build.0 = Debug|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Release|Any CPU.ActiveCfg = Release|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Release|Any CPU.Build.0 = Release|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Release|iPhoneSimulator.Build.0 = Release|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Debug|iPhone.ActiveCfg = Debug|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Debug|iPhone.Build.0 = Debug|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Release|iPhone.ActiveCfg = Release|Any CPU

        {693D1597-F3B8-4994-A82D-0BAE73E73230}.Release|iPhone.Build.0 = Release|Any CPU

    EndGlobalSection

EndGlobal


 HDL_ON/UI/UI2/FuntionControlView/Music/.DS_Store

Binary files differ

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

@@ -213,7 +213,7 @@
        void MusicListView(A31MusicModel a31player)
        {


            
            MusicView musicView = new MusicView();
            musicView.View(verticalRefresh);
            musicView.singerBtn.Text = a31player.A31PlayStatus.Artist;