From a7d20263f28aa009ef8e064a7f9700d7cd642492 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 10 六月 2020 10:06:47 +0800
Subject: [PATCH] 2020-06-10-1
---
HDL_ON/UI/Music/A31MyListMusic.cs | 8 ++--
HDL_ON/UI/Music/A31PlayMusicPage.cs | 57 +++++-----------------------
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm | 0
.vs/HDL_APP_Project/xs/sqlite3/storage.ide | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 17 +-------
HDL_ON/UI/Music/View/PlayView.cs | 2
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal | 0
7 files changed, 17 insertions(+), 67 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 4255481..aacabe0 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,16 +1,5 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/Music/View/PlayView.cs">
- <Files>
- <File FileName="HDL_ON/UI/Music/View/DialogView.cs" Line="988" Column="26" />
- <File FileName="HDL_ON/UI/Music/MusicMain.cs" Line="84" Column="17" />
- <File FileName="HDL_ON/UI/Music/SendMethod.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/Music/A31USBMusicList.cs" Line="217" Column="63" />
- <File FileName="HDL_ON/UI/Music/A31MusicSourcePage.cs" Line="163" Column="23" />
- <File FileName="HDL_ON/UI/Music/A31MusicModel.cs" Line="70" Column="33" />
- <File FileName="HDL_ON/UI/Music/View/MusicView.cs" Line="18" Column="19" />
- <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="31" Column="48" />
- <File FileName="HDL_ON/UI/Music/View/PlayView.cs" Line="185" Column="51" />
- </Files>
+ <MonoDevelop.Ide.Workbench>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -18,9 +7,7 @@
<Node name="HDL_ON" expanded="True">
<Node name="UI" expanded="True">
<Node name="Music" expanded="True">
- <Node name="View" expanded="True">
- <Node name="PlayView.cs" selected="True" />
- </Node>
+ <Node name="A31PlayMusicPage.cs" selected="True" />
</Node>
</Node>
</Node>
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
index 76cd244..731e3c1 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
index d6db201..7f39ae9 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
index 62bc6d7..1ae7d56 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
Binary files differ
diff --git a/HDL_ON/UI/Music/A31MyListMusic.cs b/HDL_ON/UI/Music/A31MyListMusic.cs
index 3f594f5..4a58f1d 100644
--- a/HDL_ON/UI/Music/A31MyListMusic.cs
+++ b/HDL_ON/UI/Music/A31MyListMusic.cs
@@ -265,10 +265,10 @@
{
for (int i = 0; i < middViewLayout.ChildrenCount; i++)
{
- FrameLayout view = (FrameLayout)middViewLayout.GetChildren(i);
- var volIconBtn = (Button)view.GetChildren(0);//鐩存帴FrameLayout鐖舵帶浠舵壘鍒拌鎺т欢Button
- var songNameBtn = (Button)view.GetChildren(1);//鐩存帴FrameLayout鐖舵帶浠舵壘鍒拌鎺т欢Button
- var artistNameBtn = (Button)view.GetChildren(2);//鐩存帴FrameLayout鐖舵帶浠舵壘鍒拌鎺т欢Button
+ RowLayout view = (RowLayout)middViewLayout.GetChildren(i);
+ var volIconBtn = (Button)view.GetChildren(0);//鐩存帴RowLayout鐖舵帶浠舵壘鍒拌鎺т欢Button
+ var songNameBtn = (Button)view.GetChildren(1);//鐩存帴RowLayout鐖舵帶浠舵壘鍒拌鎺т欢Button
+ var artistNameBtn = (Button)view.GetChildren(2);//鐩存帴RowLayout鐖舵帶浠舵壘鍒拌鎺т欢Button
if (A31MusicModel.Current.A31PlayStatus.TrackURL == songNameBtn.Tag.ToString())
{
volIconBtn.Visible = true;
diff --git a/HDL_ON/UI/Music/A31PlayMusicPage.cs b/HDL_ON/UI/Music/A31PlayMusicPage.cs
index 4c7c132..b5c0cbe 100644
--- a/HDL_ON/UI/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/Music/A31PlayMusicPage.cs
@@ -26,29 +26,14 @@
}
catch { }
}
- if (VolumeThread != null)
- {
- try
- {
- if (VolumeThread.IsAlive)
- {
- VolumeThread.Abort();
- }
- }
- catch { }
- }
}
View.PlayView playView = new View.PlayView();
-
- int startVolume = 0;//涔嬪墠鐨勯煶閲�
- int endVolume = 0;//鐜板湪鐨勯煶閲�
+
public void Show()
{
///1绉掑畾鏃舵洿鏂扮姸鎬�
timerUpdateStatus();
- ///0.5绉掔洃鍚煶閲忕姸鎬�
- VolumeUpdateSend();
#region ---鐣岄潰甯冨眬---
this.BackgroundColor = Color.ViewColor;
var topView = new TopView();
@@ -359,18 +344,17 @@
}
};
///闊抽噺杩涘害鏉＄偣鍑讳簨浠�
- //int startVolume =0;//涔嬪墠鐨勯煶閲�
- //int endVolume = 0;
+ int startVolume =0;//涔嬪墠鐨勯煶閲�
+ //int endVolume = 0;//鐜板湪鐨勯煶閲�
EventHandler<int> progressClick = (sender, e) =>
{
playView.volValueBtn.Text = playView.volSeekBar.Progress + "%";
- endVolume = e;
- //if (startVolume != e)
- //{
- // startVolume = e;
- // SendMethod.ControlVolume(e, A31MusicModel.Current);
- // A31MusicModel.Current.A31PlayStatus.vol = e.ToString();
- //}
+ if (startVolume != e)
+ {
+ startVolume = e;
+ SendMethod.ControlVolume(e, A31MusicModel.Current);
+ A31MusicModel.Current.A31PlayStatus.vol = e.ToString();
+ }
};
playView.volSeekBar.OnProgressChangedEvent += progressClick;
playView.volSeekBar.OnStopTrackingTouchEvent += progressClick;
@@ -429,28 +413,7 @@
};
}
- System.Threading.Thread VolumeThread;
- /// <summary>
- /// 闊抽噺鍙戦��
- /// </summary>
- void VolumeUpdateSend()
- {
- VolumeThread = new System.Threading.Thread((obj) =>
- {
- while (true)
- {
- if (startVolume != endVolume)
- {
- startVolume = endVolume;
- SendMethod.ControlVolume(endVolume, A31MusicModel.Current);
- A31MusicModel.Current.A31PlayStatus.vol = endVolume.ToString();
- }
- System.Threading.Thread.Sleep(300);
- }
- })
- { IsBackground = true };
- VolumeThread.Start();
- }
+
System.Threading.Thread timerThread;
/// <summary>
/// 瀹氭椂鏇存柊鐘舵��
diff --git a/HDL_ON/UI/Music/View/PlayView.cs b/HDL_ON/UI/Music/View/PlayView.cs
index 622037b..e77fcd6 100644
--- a/HDL_ON/UI/Music/View/PlayView.cs
+++ b/HDL_ON/UI/Music/View/PlayView.cs
@@ -182,7 +182,7 @@
ThumbImagePath = "MusicIcon/progressIcon.png",//杩涘害鏉℃寜閽浘鏍�
ThumbImageHeight = Application.GetMinRealAverage(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
SeekBarViewHeight = Application.GetMinRealAverage(8),//杩涘害鏉＄殑楂樺害
- //ProgressChangeDelayTime=1000,//涓�绉掑彂閫佷竴娆�
+ ProgressChangeDelayTime=300,//0.3绉掑彂閫佷竴娆�
};
/// <summary>
--
Gitblit v1.8.0