From 80e4fc87ee91231d1b452c845ff8a57727d4dc44 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 14 一月 2022 13:10:28 +0800
Subject: [PATCH] 2021-1-14-1
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 8 +++++---
HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs | 5 +++++
HDL_ON/Common/ApiUtlis.cs | 1 +
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs | 18 ++----------------
HDL_ON/DAL/DriverLayer/Control.cs | 4 +++-
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 15 +++++++++------
HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs | 3 ++-
7 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index a863055..1421a8c 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -157,6 +157,7 @@
if (deviceResult.Code == StateCode.SUCCESS)
{
endTime = DateTime.Now.AddSeconds(100);
+
MainPage.Log($"璇诲彇璁惧淇℃伅鎴愬姛");
var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
if (deviceList == null)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 33ea1fa..cc8237a 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -972,6 +972,7 @@
var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
if (localFunction == null)
{
+ Console.WriteLine("鎵句笉鍒伴煶涔愭挱鏀惧櫒娣�=======" + revString);
continue;
}
if (Ins.GatewayOnline_Local && isCloudData)//鏈湴閾炬帴锛岄櫎浜嗘秱楦﹁澶囨暟鎹箣澶栫殑浜戠鏁版嵁涓嶅鐞�
@@ -998,7 +999,8 @@
{
localFunction.time_stamp = temp.time_stamp;
localFunction.SetAttrState(attr.key, attr.value);
-
+ Console.WriteLine("闊充箰鎾斁鍣ㄦ坊鍔犵紦瀛樻暟鎹�=======" + revString);
+
}
//鏇存柊鐣岄潰鐘舵��
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
index 16da59d..92009db 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
@@ -13,7 +13,7 @@
static readonly string a31MusiceModeListFilePath = "A31MusiceModeListFilePath";
static A31MusicModel()
{
- Refresh();
+ //Refresh();
}
@@ -78,12 +78,6 @@
public bool IsCanShow = true;
/// <summary>
- /// 鏄惁鍦ㄧ嚎锛屽鏋滃湪绾垮氨鍏佽璇诲彇淇℃伅
- /// </summary>
- public bool IsOnLine = true;
-
-
- /// <summary>
/// 鍒楄〃
/// </summary>
public List<PalyList> palyLists = new List<PalyList>();
@@ -92,11 +86,6 @@
/// 鍠滅埍闊充箰鍒楄〃
/// </summary>
public List<Songs> LoveMusicInfoList = new List<Songs>();
-
- /// <summary>
- /// DLNA鎵�鏈夊垪琛�
- /// </summary>
- public List<Songs> dlnaMusicInfoLists = new List<Songs>();
/// <summary>
///鍒涘缓闊充箰鏂囦欢鍒楄〃
@@ -122,10 +111,7 @@
}
return list.songs;
}
- /// <summary>
- /// 璁板綍涓绘挱鏀惧櫒鏄惁琚敹钘�(绉�妗″畾涔夌殑)
- /// </summary>
- public bool MainPlayCollection = false;
+
public Slaves Slave = new Slaves();
/// <summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index 855e266..90a7991 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -42,6 +42,7 @@
public void Show()
{
+
///1绉掑畾鏃舵洿鏂扮姸鎬�
timerUpdateStatus();
#region ---鐣岄潰甯冨眬---
@@ -292,7 +293,7 @@
playView.endTimeBtn.Text = totalTime;
topView.topNameBtn.Text = A31MusicModel.Current.functionMusic.name;
-
+ string s = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.mode);
switch (A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.mode))
{
case ValueProperty.list_cycle://鍒楄〃寰幆
@@ -374,7 +375,7 @@
Volume.MusicVolume = playView.volSeekBar.Progress;
//褰撳墠鎾斁闊充箰鏃堕棿
//鎸夐亾鐞嗕笉浼氫负绌猴紝GetAttrState("playing_time")鍊煎彲鑳戒负绌猴紝寮哄埗杞崲int.Parse(锛変細鍑虹幇寮傚父锛屼笉杩囦篃鍋氫簡寮傚父澶勭悊浜�
- int playSecond = int.Parse(A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playing_time))/1000+ (int)(DateTime.Now - A31MusicModel.Current.LastDateTime).TotalSeconds;
+ int playSecond = int.Parse(A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playing_time))+ (int)(DateTime.Now - A31MusicModel.Current.LastDateTime).TotalSeconds;
int playMusicMinute = playSecond / 60;
//绉掗挓
@@ -398,7 +399,6 @@
playView.diyArcSeekBar.Progress = (int)(playSecond * 100.0 / totalSecond);//+1
}
- Console.WriteLine("鎵撳嵃鏃堕棿======"+playTime);
}
else
@@ -559,6 +559,8 @@
{
UpdateThread.updateCurrMusicThread(frameLayout, middViewLayout, A31MusicModel.Current);
}
+
+
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index e1d37c4..2d2a565 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -102,10 +102,9 @@
verticalRefresh.BeginHeaderRefreshingAction += () =>
{
-
- SeachMusic();
verticalRefresh.EndHeaderRefreshing();
-
+ ////鍙戦�佽鍙栭煶涔愭挱鏀惧櫒鐘舵�佺嚎绋�
+ SeachMusic();
};
this.AddChidren(loading);
SeachMusic();
@@ -116,15 +115,18 @@
/// </summary>
void SeachMusic()
{
+
Application.RunOnMainThread(() =>
{
verticalRefresh.RemoveAll();
-
- var musicListFunction = SendMethod.mMethod.GetMusicList;
+ var musicListFunction = FunctionList.List.GetMusicList();
for (int i = 0; i < musicListFunction.Count; i++)
{
var function = musicListFunction[i];
- var music = A31MusicModel.A31MusicModelList.Find((music) => music.functionMusic.deviceId == function.deviceId);
+ var music = A31MusicModel.A31MusicModelList.Find((music) =>
+ (music.functionMusic.deviceId == function.deviceId && function.spk == "music.standard") || (
+ music.functionMusic.deviceId == function.deviceId && function.spk == "av.music")
+ );
if (music == null)
{
A31MusicModel.A31MusicModelList.Add(new A31MusicModel { functionMusic = function });
@@ -144,6 +146,7 @@
//涓嶅湪绾夸笉鏄剧ず
continue;
}
+
Application.RunOnMainThread(() =>
{
MusicListView(a31player);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
index 65c783a..70026c6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
@@ -57,7 +57,7 @@
{
try
{
- //RefreshDeviceStatus(functionIds);
+ // RefreshDeviceStatus(functionIds);
a31Music.LastDateTime = DateTime.Now;
///浠庣紦瀛橀噷闈㈡煡鎵鹃煶涔愭挱鏀惧櫒瀵硅薄<缂撳瓨鏁版嵁鏀跺埌鎺ㄩ�佽繃鏉ョ殑鐘舵�佷細鏇存柊缂撳瓨鏁版嵁>
var allLocalFuntion = FunctionList.List.GetDeviceFunctionList();
@@ -68,6 +68,7 @@
}
///鏇存柊鐨勬暟鎹�
a31Music.functionMusic = localFunction;
+
}
catch { }
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
index 86aca36..9c9b11a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
@@ -14,6 +14,8 @@
Height = Application.GetRealHeight(526),
Width = Application.GetRealWidth(327),
BackgroundImagePath = "MusicIcon/playBj.png",
+ Name="fl",
+
};
/// <summary>
/// 闊充箰姹夊瓧
@@ -28,6 +30,7 @@
TextSize = TextSize.Text24,
TextAlignment = TextAlignment.CenterLeft,
TextID = StringId.a31Music,
+ Name = "musicname"
};
/// <summary>
/// 鍖哄煙鍚嶇О
@@ -41,6 +44,7 @@
TextColor = MusicColor.MusicNoTxetColor,
TextSize = TextSize.Text12,
TextAlignment = TextAlignment.CenterLeft,
+ Name= "region",
};
/// <summary>
///鏀惰棌鍥炬爣
@@ -53,6 +57,7 @@
Height = Application.GetRealWidth(40),
UnSelectedImagePath = "MusicIcon/collect.png",
SelectedImagePath = "MusicIcon/collectSelected.png",
+ Name = "collect"
};
/// <summary>
///蹇�,閫�杩涘害鏉＄埗鎺т欢
--
Gitblit v1.8.0