From e93ed871c540afcb35dad21be0fe7a95904a2681 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 09 六月 2022 10:54:30 +0800
Subject: [PATCH] 2022年06月09日10:53:32
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs | 2
HDL-ON_Android/Assets/Language.ini | 9 ++
HDL-ON_iOS/HDL-ON_iOS.csproj | 2
HDL-ON_iOS/Resources/Phone/MusicIcon/order.png | 0
HDL-ON_iOS/Resources/Phone/MusicIcon/single.png | 0
HDL-ON_Android/Assets/Phone/MusicIcon/single_cycle.png | 0
HDL-ON_Android/HDL-ON_Android.csproj | 2
HDL-ON_Android/Assets/Phone/MusicIcon/single.png | 0
HDL-ON_iOS/Resources/Language.ini | 8 ++
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 87 +++++++++++++++++++++-------
HDL-ON_iOS/Resources/Phone/MusicIcon/single_cycle.png | 0
HDL-ON_Android/Assets/Phone/MusicIcon/order.png | 0
HDL_ON/Common/R.cs | 14 ++++
14 files changed, 97 insertions(+), 31 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 3c45ca3..2e71213 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -738,7 +738,7 @@
5015=Bluetooth
5016=Line input
5017=Revise the name
-5018=Single
+5018=Single loop
5019=Random play
5020=List
5021=Has shifted to
@@ -768,6 +768,9 @@
5045=General volume
5046=Adjust volume
5047="QQ music" has not installed in your cell phone, please proceed in App center.
+5048= Progressive cycle
+5049=Single play
+
6000=normal
6001=Device status
@@ -1898,7 +1901,7 @@
5015=钃濈墮
5016=绾胯矾杈撳叆
5017=淇敼鍚嶇О
-5018=鍗曟洸鎾斁
+5018=鍗曟洸寰幆鎾斁
5019=闅忔満鎾斁
5020=鍒楄〃鎾斁
5021=宸插垏鎹㈠埌
@@ -1928,6 +1931,8 @@
5045=鎬婚煶閲�
5046=璋冭妭闊抽噺
5047=浣犳墜鏈烘殏鏈畨瑁�"QQ闊充箰"{\r\n}璇峰墠寰�鎵嬫満鍟嗗満瀹夎
+5048=寰簭寰幆
+5049=鍗曟洸鎾斁
6000=姝ｅ父
diff --git a/HDL-ON_Android/Assets/Phone/MusicIcon/order.png b/HDL-ON_Android/Assets/Phone/MusicIcon/order.png
new file mode 100644
index 0000000..cfe4317
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/MusicIcon/order.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/MusicIcon/single.png b/HDL-ON_Android/Assets/Phone/MusicIcon/single.png
index 3d49095..e4153c4 100644
--- a/HDL-ON_Android/Assets/Phone/MusicIcon/single.png
+++ b/HDL-ON_Android/Assets/Phone/MusicIcon/single.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/MusicIcon/single_cycle.png b/HDL-ON_Android/Assets/Phone/MusicIcon/single_cycle.png
new file mode 100644
index 0000000..33ee323
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/MusicIcon/single_cycle.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index d236f95..933d606 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -243,6 +243,8 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Panel\PanelHelpNormalBgIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\screenpanel.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Panel\PanelEnviBg.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\order.png" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\single_cycle.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 8787622..c72dc16 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1404,6 +1404,8 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Panel\PanelHelpNormalBgIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\screenpanel.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Panel\PanelEnviBg.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\order.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\single_cycle.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 78daf8e..aa18fb0 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -738,7 +738,7 @@
5015=Bluetooth
5016=Line input
5017=Revise the name
-5018=Single
+5018=Single loop
5019=Random play
5020=List
5021=Has shifted to
@@ -768,6 +768,8 @@
5045=General volume
5046=Adjust volume
5047="QQ music" has not installed in your cell phone, please proceed in App center.
+5048= Progressive cycle
+5049=Single play
6000=normal
6001=Device status
@@ -1897,7 +1899,7 @@
5015=钃濈墮
5016=绾胯矾杈撳叆
5017=淇敼鍚嶇О
-5018=鍗曟洸鎾斁
+5018=鍗曟洸寰幆鎾斁
5019=闅忔満鎾斁
5020=鍒楄〃鎾斁
5021=宸插垏鎹㈠埌
@@ -1927,6 +1929,8 @@
5045=鎬婚煶閲�
5046=璋冭妭闊抽噺
5047=浣犳墜鏈烘殏鏈畨瑁�"QQ闊充箰"{\r\n}璇峰墠寰�鎵嬫満鍟嗗満瀹夎
+5048=寰簭寰幆
+5049=鍗曟洸寰幆
6000=姝ｅ父
diff --git a/HDL-ON_iOS/Resources/Phone/MusicIcon/order.png b/HDL-ON_iOS/Resources/Phone/MusicIcon/order.png
new file mode 100644
index 0000000..cfe4317
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/MusicIcon/order.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/MusicIcon/single.png b/HDL-ON_iOS/Resources/Phone/MusicIcon/single.png
index 3d49095..e4153c4 100644
--- a/HDL-ON_iOS/Resources/Phone/MusicIcon/single.png
+++ b/HDL-ON_iOS/Resources/Phone/MusicIcon/single.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/MusicIcon/single_cycle.png b/HDL-ON_iOS/Resources/Phone/MusicIcon/single_cycle.png
new file mode 100644
index 0000000..33ee323
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/MusicIcon/single_cycle.png
Binary files differ
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index d537d1f..7e86ec4 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -1632,9 +1632,9 @@
/// </summary>
public const int modifyName = 5017;
/// <summary>
- /// 鍗曟洸鎾斁
+ /// 鍗曟洸寰幆鎾斁
/// </summary>
- public const int singleMode = 5018;
+ public const int singleCycleMode = 5018;
/// <summary>
/// 闅忔満鎾斁
/// </summary>
@@ -1751,6 +1751,16 @@
/// 浣犳墜鏈烘殏鏈畨瑁�"QQ闊充箰"{\r\n}璇峰墠寰�鎵嬫満鍟嗗満瀹夎
/// </summary>
public const int qqMsuicTip = 5047;
+ /// <summary>
+ /// 寰簭寰幆
+ /// </summary>
+ public const int orderMode =5048;
+ /// <summary>
+ /// 鍗曟洸鎾斁
+ /// </summary>
+ public const int single =5049;
+
+
/// <summary>
/// 姝ｅ父
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index ce16936..82b6dd0 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index f5f1c5d..6bcea7c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -4,6 +4,7 @@
using System.Collections.Generic;
using System.Security;
using HDL_ON.UI.UI2.FuntionControlView.Music;
+using HDL_ON.Entity;
namespace HDL_ON.UI.Music
{
@@ -90,34 +91,62 @@
///鍒囨崲鎾斁妯″紡鐐瑰嚮浜嬩欢;
playView.playOrderBtn.MouseUpEventHandler += (sender, e) =>
{
- string modeValueString = string.Empty;
string msg = Language.StringByID(StringId.switchTo);
- string modeKeyValue = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.mode);
- switch (modeKeyValue)
+ //鑾峰彇褰撳墠鎾斁妯″紡
+ string currModeKeyValue = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.mode);
+ //鑾峰彇闊充箰鎾斁妯″紡鍒楄〃
+ var attributes = A31MusicModel.Current.functionMusic.GetAttribute(KeyProperty.mode);
+ if (attributes==null) {
+ attributes=new FunctionAttributes();
+ }
+ var attributesList = attributes.value;
+ //鎵惧埌褰撳墠鎾斁妯″紡绱㈠紩鍊�
+ int currModeIndexe = attributesList.IndexOf(currModeKeyValue);
+ //璁板綍閫変腑鐨勬挱鏀炬ā寮忕殑绱㈠紩鍊�
+ int count = 0;
+ if (currModeIndexe >= attributesList.Count-1)
+ {
+ //閲嶇疆绱㈠紩鍊�
+ count = 0;
+ }
+ else
+ {
+ count = currModeIndexe + 1;
+ }
+ //閫氳繃绱㈠紩鍊兼壘鍒版ā寮弙alue鍊�
+ string modeValueString = attributesList[count];
+ switch (modeValueString)
{
//list_cycle鍒楄〃寰幆锛宻ingle_cycle鍗曟洸寰幆锛宺andom闅忔満鎾斁;
case ValueProperty.list_cycle:
- modeValueString=ValueProperty.single_cycle;
- playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/single.png";
- msg += Language.StringByID(StringId.singleMode);
+ playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/list.png";
+ msg += Language.StringByID(StringId.listMode);
break;
case ValueProperty.single_cycle:
- modeValueString =ValueProperty.random;
+ playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/single_cycle.png";
+ msg += Language.StringByID(StringId.singleCycleMode);
+ break;
+ case ValueProperty.random:
playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/random.png";
msg += Language.StringByID(StringId.randomMode);
break;
- case ValueProperty.random:
- modeValueString = ValueProperty.list_cycle;
- playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/list.png";
- msg += Language.StringByID(StringId.listMode);
+ case ValueProperty.single:
+ playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/single.png";
+ msg += Language.StringByID(StringId.single);
break;
-
+ case ValueProperty.order:
+ playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/order.png";
+ msg += Language.StringByID(StringId.orderMode);
+ break;
+
}
+ //鍐欏叆缂撳瓨
A31MusicModel.Current.functionMusic.SetAttrState(KeyProperty.mode, modeValueString);
- new PublicAssmebly().TipMsgAutoClose(msg, false,1000);
+ new PublicAssmebly().TipMsgAutoClose(msg, false, 1000);
Dictionary<string, string> dic = new Dictionary<string, string>();
- dic.Add(KeyProperty.mode,modeValueString);
- SendMethod.mMethod.SendControlCommand(A31MusicModel.Current.functionMusic,dic);
+ dic.Add(KeyProperty.mode, modeValueString);
+ //鍙戦�佹帶鍒舵寚浠�
+ SendMethod.mMethod.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
};
///娣诲姞鍠滅埍鐐瑰嚮浜嬩欢;
playView.loveBtn.MouseUpEventHandler += (sender, e) =>
@@ -318,22 +347,29 @@
int totalMusicMinute = totalSecond / 60;
//绉掗挓
int totalMusicSecond = totalSecond % 60;
-
+ //杞寲姝屾洸鎬绘椂闂存椂闂存牸寮�
string totalTime = (totalMusicMinute.ToString().Length < 2 ? "0" + totalMusicMinute.ToString() : totalMusicMinute.ToString()) + ":" + (totalMusicSecond.ToString().Length < 2 ? "0" + totalMusicSecond.ToString() : totalMusicSecond.ToString());
+ //鏄剧ず鎬绘椂闂�
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://鍒楄〃寰幆
playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/list.png";
break;
case ValueProperty.single_cycle://鍗曟洸寰幆
- playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/single.png";
+ playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/single_cycle.png";
break;
case ValueProperty.random://闅忔満鎾斁
playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/random.png";
+ break;
+ case ValueProperty.single:// 鍗曟洸<single>
+ playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/single.png";
+ break;
+ case ValueProperty.order://寰簭寰幆
+ playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/order.png";
break;
}
@@ -368,7 +404,9 @@
// playView.loveBtn.IsSelected = false;
// }
//}
+ //鏄剧ず鎾斁鍣ㄥ尯鍩�
playView.regionBtn.Text = A31MusicModel.Current.functionMusic.GetRoomListName();
+ //鏄剧ず鎾斁鍣ㄦ敹钘忕姸鎬佸浘鏍�
if (A31MusicModel.Current.functionMusic.collect)
{
playView.collectIconBtn.IsSelected = true;
@@ -428,21 +466,23 @@
int playMusicMinute = playSecond / 60;
//绉掗挓
int playMusicSecond = playSecond % 60;
+ //杞寲鎾斁鏃堕棿鏃堕棿鏍煎紡
string playTime = (playMusicMinute.ToString().Length < 2 ? "0" + playMusicMinute.ToString() : playMusicMinute.ToString()) + ":" + (playMusicSecond.ToString().Length < 2 ? "0" + playMusicSecond.ToString() : playMusicSecond.ToString());
if (A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.on_off) == ValueProperty.on)
{
+ //鏄剧ず鎾斁鐘舵�佸浘鏍�
playView.playBtn.IsSelected = true;
- //濡傛灉鍦ㄦ挱鏀撅紝鏃堕棿灏变笉鏂彉鍖�
+ //鏄剧ず鎾斁鏃堕棿
playView.startTimeBtn.Text = playTime;
if (totalSecond == 0)
{
- //姝屾洸杩涘害鏉�
+ //鏄剧ず姝屾洸杩涘害鏉�
playView.diyArcSeekBar.Progress = 0;
}
else
{
- //姝屾洸杩涘害鏉�
+ //鏄剧ず姝屾洸杩涘害鏉�
playView.diyArcSeekBar.Progress = (int)(playSecond * 100.0 / totalSecond);//+1
}
@@ -450,6 +490,7 @@
}
else
{
+ //鏄剧ず鎾斁鐘舵�佸浘鏍�
playView.playBtn.IsSelected = false;
//鍋滄鎾斁
playView.startTimeBtn.Text =playTime;
@@ -457,7 +498,9 @@
///璁板綍姝屾洸鏆傚仠鏃堕棿锛�<LastDateTime 璁＄畻鎾斁鏃堕棿鏈夌敤鍒�>
A31MusicModel.Current.LastDateTime = DateTime.Now;
}
+ //鏄剧ず姝屾洸鍚嶇О
playView.songNameTextView.Text = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.song_name) == null ? "Unkown" : A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.song_name);
+ //鏄剧ず姝屾墜鍚嶇О
playView.singerBtn.Text = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.song_name) == null ? "Unkown" : A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.song_name);
//鏇存柊婧愮殑鐣岄潰
// showSourcePage();
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs
index f6ec20b..fb6a925 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs
@@ -102,7 +102,7 @@
case ValueProperty.single_cycle:
orderIconBtn.UnSelectedImagePath = "MusicIcon/single.png";
- orderTxetBtn.Text = Language.StringByID(StringId.singleMode);
+ orderTxetBtn.Text = Language.StringByID(StringId.singleCycleMode);
break;
case ValueProperty.random:
--
Gitblit v1.8.0