From 35aa462a50bb4bdf00534c80068455f0905cb582 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 16:01:22 +0800
Subject: [PATCH] 2020-08-11-1
---
/dev/null | 0
HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs | 7 ++++---
HDL-ON_Android/Properties/AndroidManifest.xml | 3 +--
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 2 +-
HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs | 8 ++++----
.vs/HDL_APP_Project/xs/sqlite3/storage.ide | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 17 ++++++++---------
7 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 30ce846..5065b1e 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,8 +1,8 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs" Line="152" Column="10" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs" Line="17" Column="23" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -11,10 +11,10 @@
<Node name="HDL_ON" expanded="True">
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
- <Node name="4-PersonalCenter" expanded="True" />
<Node name="FuntionControlView" expanded="True">
<Node name="Music" expanded="True">
- <Node name="SendMethod.cs" selected="True" />
+ <Node name="View" expanded="True" />
+ <Node name="A31PlayMusicPage.cs" selected="True" />
</Node>
</Node>
</Node>
@@ -23,15 +23,14 @@
<Node name="HDL-ON_Android" expanded="True">
<Node name="Properties" expanded="True" />
</Node>
- <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" PreferredExecutionTarget="Android.822QECU5228FU" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
index 77fa01a..d6a5b44 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
deleted file mode 100644
index 93d232e..0000000
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
+++ /dev/null
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
deleted file mode 100644
index 0562c13..0000000
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 2745575..13ae0f6 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -7,5 +7,4 @@
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
</provider>
</application>
- <!--鎾斁鏈湴闊充箰鏉冮檺-->鈥� <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
-</manifest>
\ No newline at end of file
+ <!--鎾斁鏈湴闊充箰鏉冮檺-->鈥� <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /></manifest>
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index 9a98f45..bdb1193 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -395,7 +395,7 @@
//闊抽噺杩涘害鏉�;
playView.volSeekBar.Progress = int.Parse(A31MusicModel.Current.A31PlayStatus.vol);
//鏄剧ず褰撳墠闊抽噺鍊�;
- playView.volValueBtn.Text = A31MusicModel.Current.A31PlayStatus.vol + "%";
+ playView.volValueBtn.Text = playView.volSeekBar.Progress.ToString() + "%";
}
//鏇存柊鎾斁鍣ㄩ煶閲忕粰绯荤粺闊抽噺
Volume.MusicVolume = playView.volSeekBar.Progress;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs
index 664c342..b492f49 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs
@@ -183,11 +183,12 @@
MainPage.BasePageView.RemoveViewByTag("Music");
System.Threading.Tasks.Task.Run(() =>
{
- if (musicSource == "鏈湴闊充箰"|| musicSource == "鎴戠殑鏈�鐖�"|| musicSource == "鎴戠殑鍒楄〃")
+
+ if (musicSource == "鏈湴闊充箰" || musicSource == "鎴戠殑鏈�鐖�" || musicSource == "鎴戠殑鍒楄〃")
{
- SendMethod.PushList(songs, listName, musicList, a31MusicModel,musicSource);
+ SendMethod.PushList(songs, listName, musicList, a31MusicModel, musicSource);
}
- else if (musicSource == "USB"|| musicSource == "鎾斁鍒楄〃")
+ else if (musicSource == "USB" || musicSource == "鎾斁鍒楄〃")
{
SendMethod.ListMusicPlay(listName, songView.clickBtn.Tag, A31MusicModel.Current);
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
index 27313be..f68924a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
@@ -186,7 +186,7 @@
/// </summary>
public Button volIconBtn = new Button
{
- X = Application.GetRealWidth(24),
+ X = Application.GetRealWidth(20),
Y = Application.GetRealHeight(414),
Width = Application.GetMinRealAverage(24),
Height = Application.GetMinRealAverage(24),
@@ -198,7 +198,7 @@
public DiyImageSeekBar volSeekBar = new DiyImageSeekBar
{
Y = Application.GetRealHeight(399),
- X = Application.GetRealWidth(58),
+ X = Application.GetRealWidth(50),
Width = Application.GetRealWidth(215),
Height = Application.GetRealHeight(54),//杩涘害鏉＄埗鎺т欢鑳屾櫙楂樺害
IsProgressTextShow = false,//鏄剧ず鐧惧垎姣�
@@ -215,9 +215,9 @@
/// </summary>
public Button volValueBtn = new Button
{
- X = Application.GetRealWidth(279 - 4),
+ X = Application.GetRealWidth(273-3),
Y = Application.GetRealHeight(418),
- Width = Application.GetRealWidth(26 + 4),
+ Width = Application.GetRealWidth(33+3),
Height = Application.GetRealHeight(17),
Text = "0%",
TextColor = MusicColor.MusicNoTxetColor,
--
Gitblit v1.8.0