From 66c0db35365980f240d7cfe6dd59961812f20c97 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 03 六月 2020 17:51:36 +0800
Subject: [PATCH] 2020-06-03-1
---
HDL_ON/UI/Music/MusicMain.cs | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/Music/MusicMain.cs b/HDL_ON/UI/Music/MusicMain.cs
index dff60b5..0f4d98f 100644
--- a/HDL_ON/UI/Music/MusicMain.cs
+++ b/HDL_ON/UI/Music/MusicMain.cs
@@ -45,7 +45,7 @@
/// <summary>
/// 鏄剧ず鍔犺浇鐣岄潰
/// </summary>
- public static Loading Loading = new Loading();
+ public static Loading loading = new Loading();
VerticalRefreshLayout verticalRefresh;
public void Show()
@@ -72,11 +72,10 @@
verticalRefresh.BeginHeaderRefreshingAction += () =>
{
- SeachMusic();
- verticalRefresh.EndHeaderRefreshing();
+ SeachMusic(false);
};
- this.AddChidren(Loading);
+ this.AddChidren(loading);
if (A31MusicModel.A31MusicModelList.Count == 0)
{
@@ -137,7 +136,7 @@
if (Yes)
{
//涓轰簡绗竴娆¤繘鏉og涓�涓�;
- Loading.Start();
+ loading.Start();
}
SendMethod.Seach((obj) =>
{
@@ -145,12 +144,17 @@
{
readServerOrClientMode();
A31MusicModel.Save();
+ if (!Yes)
+ {
+ ///绛夊緟璺戝畬鍦ㄥ叧闂�
+ verticalRefresh.EndHeaderRefreshing();
+ }
Application.RunOnMainThread(() =>
{
if (Yes)
{
//涓轰簡绗竴娆¤繘鏉og涓�涓�;
- Loading.Hide();
+ loading.Hide();
}
verticalRefresh.RemoveAll();
for (int i = 0; i < A31MusicModel.A31MusicModelList.Count; i++)
@@ -199,12 +203,20 @@
musicView.songNameBtn.Text = a31player.A31PlayStatus.Title;
musicView.musicNameBtn.Text = a31player.Name;
musicView.regionBtn.TextID = StringId.region;
-
+
EventHandler<MouseEventArgs> clickMergence = (sender, e) =>
{
- new View.DialogView { }.PlayMergence();
+ if (a31player.ServerClientType == 0)
+ {
+ new View.DialogView { }.PlayMergence();
+ }
+ else if (a31player.ServerClientType == 1)
+ {
+ new View.DialogView { }.DetachPlayMergence(a31player);
+
+ }
};
musicView.mergeBjBtn.MouseUpEventHandler += clickMergence;
musicView.mergeBtn.MouseUpEventHandler += clickMergence;
@@ -312,11 +324,11 @@
{
a31player.ServerClientType = 0;
var result = SendMethod.OpenWeb("http://" + a31player.IPAddress + "/httpapi.asp?command=multiroom:getSlaveList");
- if (result == null)
+ if (result == null && result == "Failed")
{
result = SendMethod.OpenWeb("http://" + a31player.IPAddress + "/httpapi.asp?command=multiroom:getSlaveList");
}
- if (result != null)
+ if (result != null && result != "Failed")
{
a31player.Slave = Newtonsoft.Json.JsonConvert.DeserializeObject<Slaves>(result);
}
@@ -383,10 +395,7 @@
}
}
- catch (Exception e)
- {
- var ss = e.Message;
- }
+ catch { }
}
}
--
Gitblit v1.8.0