From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL_ON/UI/Music/A31MusicSourcePage.cs | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/Music/A31MusicSourcePage.cs b/HDL_ON/UI/Music/A31MusicSourcePage.cs
index 86d9d12..03ed2c1 100644
--- a/HDL_ON/UI/Music/A31MusicSourcePage.cs
+++ b/HDL_ON/UI/Music/A31MusicSourcePage.cs
@@ -63,6 +63,7 @@
areaText.fLayout.Y = bluetoothNameView.fLayout.Bottom;
areaText.FrameLayoutView(fL1, false);
areaText.nextLevelBtn.X = Application.GetRealWidth(339);
+ areaText.nextLevelBtn.Y = Application.GetRealHeight(17);
areaText.nextLevelBtn.Width = Application.GetMinRealAverage(16);
areaText.nextLevelBtn.Height = Application.GetMinRealAverage(16);
areaText.nextLevelBtn.UnSelectedImagePath = "MusicIcon/sourceNetx.png";
@@ -188,8 +189,13 @@
};
///鎴戠殑鍠滅埍浜嬩欢
- myLoveView.clickBtn.MouseUpEventHandler += (sender, e) => {
-
+ myLoveView.clickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ A31LoveList a31LoveList = new A31LoveList();
+ MainPage.BasePageView.AddChidren(a31LoveList);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ a31LoveList.Show();
+ a31LoveList.UpdateSelectedFile();
};
///鎴戠殑鍒楄〃浜嬩欢
myListView.clickBtn.MouseUpEventHandler += (sender, e) =>
@@ -197,16 +203,22 @@
A31MyList a31MyList = new A31MyList();
MainPage.BasePageView.AddChidren(a31MyList);
a31MyList.Show();
+ a31MyList.UpdateSelectedFile();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
///鏈湴闊充箰浜嬩欢
- localMusicSourceView.clickBtn.MouseUpEventHandler += (sender, e) => {
-
+ localMusicSourceView.clickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ A31LocalMusicList a31LocalMusicList = new A31LocalMusicList();
+ MainPage.BasePageView.AddChidren(a31LocalMusicList);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ a31LocalMusicList.Show();
+ a31LocalMusicList.UpdateSelectedMusic();
};
///USB浜嬩欢
usbSourceView.clickBtn.MouseUpEventHandler += (sender, e) =>
{
- USBMusicList usbMusic = new USBMusicList();
+ A31USBMusicList usbMusic = new A31USBMusicList();
MainPage.BasePageView.AddChidren(usbMusic);
usbMusic.UIView();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -220,7 +232,7 @@
if (A31MusicModel.Current.USBList.Count == 0)
{
//杩涙潵璇讳竴娆�(娉ㄦ剰:鎾斁鍦板潃鍙兘浼氭敼鍙橈紝瀵艰嚧鎾斁涓嶄簡闊充箰;瑙ｅ喅:杩涙潵閮藉幓鍘昏鍙栨渶鏂版暟鎹�)
- var list = SendMethod.GetUsbList();
+ var list = SendMethod.GetUsbList(A31MusicModel.Current);
A31MusicModel.Current.USBList.AddRange(list);
}
}
@@ -239,8 +251,23 @@
});
};
///鍦ㄧ嚎鐢靛彴浜嬩欢
- radioSourceView.clickBtn.MouseUpEventHandler += (sender, e) => {
-
+ radioSourceView.clickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ Loading loading = new Loading();
+ this.AddChidren(loading);
+ loading.Start();
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ var radioList = SendMethod.ReadRadioList("http://opml.radiotime.com/Browse.ashx?partnerId=yvcOjvJP");
+ Application.RunOnMainThread(() =>
+ {
+ loading.Hide();
+ A31Radio a31Radio = new A31Radio();
+ MainPage.BasePageView.AddChidren(a31Radio);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ a31Radio.Show(radioList);
+ });
+ });
};
///QQ闊充箰浜嬩欢
qqMusicSourceView.clickBtn.MouseUpEventHandler += (sender, e) =>
@@ -253,14 +280,16 @@
CommonClass.OpenApp(str);
};
///钃濈墮浜嬩欢
- bluetoothNameView.clickBtn.MouseUpEventHandler += (sender, e) =>
+ bluetoothSourceView.clickBtn.MouseUpEventHandler += (sender, e) =>
{
+ this.RemoveFromParent();
string url = "http://" + A31MusicModel.Current.IPAddress + "/httpapi.asp?command=setPlayerCmd:switchmode:bluetooth";
SendMethod.SendCommand(url);
};
///绾胯矾杈撳叆浜嬩欢
lineSourceView.clickBtn.MouseUpEventHandler += (sender, e) =>
{
+ this.RemoveFromParent();
string url = "http://" + A31MusicModel.Current.IPAddress + "/httpapi.asp?command=setPlayerCmd:switchmode:line-in";
SendMethod.SendCommand(url);
};
--
Gitblit v1.8.0