From b4e5c0d769137131b0215a27a173659538c6b0bf Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 09 六月 2020 10:56:14 +0800
Subject: [PATCH] 2020-06-09-1
---
HDL_ON/UI/Music/A31MusicSourcePage.cs | 70 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/Music/A31MusicSourcePage.cs b/HDL_ON/UI/Music/A31MusicSourcePage.cs
index 52e37b5..03ed2c1 100644
--- a/HDL_ON/UI/Music/A31MusicSourcePage.cs
+++ b/HDL_ON/UI/Music/A31MusicSourcePage.cs
@@ -10,6 +10,8 @@
{
Tag = "Music";
}
+
+
public void Show()
{
#region 鐣岄潰甯冨眬------
@@ -61,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";
@@ -165,41 +168,57 @@
///鎾斁鍣ㄤ慨鏀瑰悕绉颁簨浠�
playNameView.clickBtn.MouseUpEventHandler += (sender, e) =>
{
- new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, A31MusicModel.Current.Name, (playerName) =>
+ new View.TipView().InputBox(StringId.modifyName, A31MusicModel.Current.Name, StringId.nameNull, (playerName) =>
{
+
playNameView.inputTextBtn.Text = playerName;
A31MusicModel.Current.Name = playerName;
string url = "http://" + A31MusicModel.Current.IPAddress + "/httpapi.asp?command=setDeviceName:" + A31MusicModel.Current.Name;
SendMethod.SendCommand(url);
-
});
+
};
///钃濈墮淇敼鍚嶇О浜嬩欢
bluetoothNameView.clickBtn.MouseUpEventHandler += (sender, e) =>
{
- new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, A31MusicModel.Current.Name, (playerName) =>
+ new View.TipView().InputBox(StringId.modifyName, A31MusicModel.Current.Name, StringId.nameNull, (bluetoothName) =>
{
- bluetoothNameView.inputTextBtn.Text = playerName;
- SendMethod.ModifyBluetoothName("MCU+PAS+BT" + playerName.Trim() + "*&");
-
+ bluetoothNameView.inputTextBtn.Text = bluetoothName;
+ SendMethod.ModifyBluetoothName("MCU+PAS+BT" + bluetoothName.Trim() + "*&");
});
+
};
///鎴戠殑鍠滅埍浜嬩欢
- 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) => {
-
+ myListView.clickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ 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;
@@ -213,7 +232,7 @@
if (A31MusicModel.Current.USBList.Count == 0)
{
//杩涙潵璇讳竴娆�(娉ㄦ剰:鎾斁鍦板潃鍙兘浼氭敼鍙橈紝瀵艰嚧鎾斁涓嶄簡闊充箰;瑙ｅ喅:杩涙潵閮藉幓鍘昏鍙栨渶鏂版暟鎹�)
- var list = SendMethod.GetUsbList();
+ var list = SendMethod.GetUsbList(A31MusicModel.Current);
A31MusicModel.Current.USBList.AddRange(list);
}
}
@@ -232,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) =>
@@ -246,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