From af4101b1d8461331bc3163b738fc75d4bf67c85c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 七月 2020 17:47:44 +0800
Subject: [PATCH] 2020-07-28-1
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
index 03ed2c1..5da6384 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
@@ -70,7 +70,7 @@
areaText.lineBtn.BackgroundColor = Color.WhiteColor;
areaText.textBtn.X = Application.GetRealWidth(16);
areaText.textBtn.TextID = StringId.region;
- areaText.inputTextBtn.TextID = StringId.region;
+ areaText.inputTextBtn.Text = A31MusicModel.Current.GetRoomListName();
#endregion
@@ -139,10 +139,10 @@
radioSourceView.fLayout.Y = usbSourceView.fLayout.Bottom;
radioSourceView.iconBtn.UnSelectedImagePath = "MusicIcon/radio.png";
radioSourceView.textBtn.TextID = StringId.radio;
- radioSourceView.FrameLayoutView(fL3);
+ //radioSourceView.FrameLayoutView(fL3);鏆傛椂闅愯棌鍦ㄧ嚎鐢靛彴
View.MusicSourceView qqMusicSourceView = new View.MusicSourceView();
- qqMusicSourceView.fLayout.Y = radioSourceView.fLayout.Bottom;
+ qqMusicSourceView.fLayout.Y = usbSourceView.fLayout.Bottom;
qqMusicSourceView.iconBtn.UnSelectedImagePath = "MusicIcon/qqMusic.png";
qqMusicSourceView.textBtn.TextID = StringId.qqMusic;
qqMusicSourceView.FrameLayoutView(fL3);
@@ -170,7 +170,6 @@
{
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;
@@ -188,14 +187,32 @@
});
};
+ ///鍖哄煙淇敼鐨勪簨浠�
+ areaText.clickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ ChooseRoomPage chooseRoomPage = new ChooseRoomPage(A31MusicModel.Current, () =>
+ {
+ areaText.inputTextBtn.Text = A31MusicModel.Current.GetRoomListName();
+ });
+ MainPage.BasePageView.AddChidren(chooseRoomPage);
+ chooseRoomPage.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
///鎴戠殑鍠滅埍浜嬩欢
myLoveView.clickBtn.MouseUpEventHandler += (sender, e) =>
{
- A31LoveList a31LoveList = new A31LoveList();
- MainPage.BasePageView.AddChidren(a31LoveList);
+ //A31LoveList a31LoveList = new A31LoveList();
+ //MainPage.BasePageView.AddChidren(a31LoveList);
+ //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //a31LoveList.Show();
+ //a31LoveList.UpdateSelectedFile();
+
+ A31LoveMusicList a31LoveMusicList = new A31LoveMusicList();
+ MainPage.BasePageView.AddChidren(a31LoveMusicList);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- a31LoveList.Show();
- a31LoveList.UpdateSelectedFile();
+ a31LoveMusicList.Show();
+ a31LoveMusicList.UpdateSelectedMusic();
+
};
///鎴戠殑鍒楄〃浜嬩欢
myListView.clickBtn.MouseUpEventHandler += (sender, e) =>
@@ -293,6 +310,8 @@
string url = "http://" + A31MusicModel.Current.IPAddress + "/httpapi.asp?command=setPlayerCmd:switchmode:line-in";
SendMethod.SendCommand(url);
};
+
+
#endregion
}
}
--
Gitblit v1.8.0