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_Android/Assets/Language.ini | 3 ++-
HDL_ON/UI/Music/A31PlayMusicPage.cs | 2 +-
HDL_ON/UI/Music/View/MusicSourceView.cs | 4 ++--
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm | 0
HDL_ON/UI/Music/A31MusicSourcePage.cs | 1 +
CommonLib/.DS_Store | 0
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 2 +-
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 4 ++--
HDL_ON/.DS_Store | 0
HDL_ON/Common/R.cs | 2 +-
.DS_Store | 0
.vs/HDL_APP_Project/xs/sqlite3/storage.ide | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 24 ++++++++++++++++--------
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal | 0
HDL_ON/UI/Music/View/DialogView.cs | 3 +--
15 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index 7118bfb..b1ed519 100644
--- a/.DS_Store
+++ b/.DS_Store
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 9ae7b10..a3e2329 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,11 +1,14 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/Music/MusicMain.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/Music/View/DialogView.cs">
<Files>
- <File FileName="HDL_ON/UI/Music/View/DialogView.cs" Line="1305" Column="18" />
- <File FileName="HDL_ON/UI/Music/MusicMain.cs" Line="390" Column="10" />
- <File FileName="HDL_ON/UI/Music/SendMethod.cs" Line="291" Column="22" />
- <File FileName="HDL_ON/UI/Music/A31MusicModel.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="18" Column="37" />
+ <File FileName="HDL_ON/UI/Music/View/DialogView.cs" Line="1106" Column="24" />
+ <File FileName="HDL_ON/UI/Music/MusicMain.cs" />
+ <File FileName="HDL_ON/UI/Music/SendMethod.cs" />
+ <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="10" Column="6" />
+ <File FileName="HDL_ON/Common/R.cs" Line="249" Column="55" />
+ <File FileName="HDL-ON_Android/Assets/Language.ini" Line="156" Column="10" />
+ <File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" Line="591" Column="10" />
+ <File FileName="HDL_ON/UI/Music/A31MusicSourcePage.cs" Line="64" Column="50" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -15,8 +18,13 @@
<Node name="Common" expanded="True" />
<Node name="UI" expanded="True">
<Node name="Music" expanded="True">
- <Node name="View" expanded="True" />
- <Node name="MusicMain.cs" selected="True" />
+ <Node name="View" expanded="True">
+ <Node name="DialogView.cs" selected="True" />
+ </Node>
+ </Node>
+ <Node name="UI0-Public" expanded="True" />
+ <Node name="UI2" expanded="True">
+ <Node name="1-HomePage" expanded="True" />
</Node>
</Node>
</Node>
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
index c34ba87..f7a1a03 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
index 5ca52fd..ffda542 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
index 262c6af..277c62c 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
Binary files differ
diff --git a/CommonLib/.DS_Store b/CommonLib/.DS_Store
new file mode 100644
index 0000000..43a1384
--- /dev/null
+++ b/CommonLib/.DS_Store
Binary files differ
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 6fea727..0327e93 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -193,4 +193,5 @@
5042=閰嶇疆涓�...
5043=瑙ｉ櫎涓�...
5044=闊抽噺
-5045=鎬婚煶閲�
\ No newline at end of file
+5045=鎬婚煶閲�
+5046=璋冭妭闊抽噺
\ No newline at end of file
diff --git a/HDL_ON/.DS_Store b/HDL_ON/.DS_Store
index e73ff38..8226e8a 100644
--- a/HDL_ON/.DS_Store
+++ b/HDL_ON/.DS_Store
Binary files differ
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 0567fd0..4b6c4bb 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -248,6 +248,6 @@
public readonly static int lifting = 5043;
public readonly static int volumeMusic = 5044;
public readonly static int totalVolume = 5045;
-
+ public readonly static int volumeAdjustment = 5046;
}
}
\ No newline at end of file
diff --git a/HDL_ON/UI/Music/A31MusicSourcePage.cs b/HDL_ON/UI/Music/A31MusicSourcePage.cs
index cb3d9b2..03ed2c1 100644
--- a/HDL_ON/UI/Music/A31MusicSourcePage.cs
+++ b/HDL_ON/UI/Music/A31MusicSourcePage.cs
@@ -63,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";
diff --git a/HDL_ON/UI/Music/A31PlayMusicPage.cs b/HDL_ON/UI/Music/A31PlayMusicPage.cs
index 7805a56..8ede9e5 100644
--- a/HDL_ON/UI/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/Music/A31PlayMusicPage.cs
@@ -142,7 +142,7 @@
msg += Language.StringByID(StringId.listMode);
break;
}
- new PublicAssmebly().TipMsgAutoClose(msg, false);
+ new PublicAssmebly().TipMsgAutoClose(msg, false,1000);
string url = "http://" + A31MusicModel.Current.IPAddress + "/httpapi.asp?command=setPlayerCmd:" + "loopmode:" + A31MusicModel.Current.A31PlayStatus.loop;
SendMethod.SendCommand(url);
};
diff --git a/HDL_ON/UI/Music/View/DialogView.cs b/HDL_ON/UI/Music/View/DialogView.cs
index c87a513..b136a9a 100644
--- a/HDL_ON/UI/Music/View/DialogView.cs
+++ b/HDL_ON/UI/Music/View/DialogView.cs
@@ -1224,8 +1224,7 @@
TextColor = Color.TextColor,
TextSize = TextSize.Text16,
TextAlignment = TextAlignment.Center,
- //TextID = StringId.readyPlay,
- Text="璋冭妭闊抽噺",
+ TextID = StringId.volumeAdjustment,
IsBold = true,
};
topFra.AddChidren(txetBtn);
diff --git a/HDL_ON/UI/Music/View/MusicSourceView.cs b/HDL_ON/UI/Music/View/MusicSourceView.cs
index 49c3a21..8ca489d 100644
--- a/HDL_ON/UI/Music/View/MusicSourceView.cs
+++ b/HDL_ON/UI/Music/View/MusicSourceView.cs
@@ -94,7 +94,7 @@
fLayout.AddChidren(iconBtn);
textBtn.X = Application.GetRealWidth(56);
nextLevelBtn.X = Application.GetRealWidth(339);
- nextLevelBtn.Height = Application.GetRealHeight(17);
+ nextLevelBtn.Y = Application.GetRealHeight(17);
nextLevelBtn.Width = Application.GetMinRealAverage(16);
nextLevelBtn.Height = Application.GetMinRealAverage(16);
}
@@ -103,7 +103,7 @@
textBtn.X = Application.GetRealWidth(16);
fLayout.AddChidren(inputTextBtn);
nextLevelBtn.X = Application.GetRealWidth(333);
- nextLevelBtn.Height = Application.GetRealHeight(11);
+ nextLevelBtn.Y = Application.GetRealHeight(11);
nextLevelBtn.Width = Application.GetMinRealAverage(28);
nextLevelBtn.Height = Application.GetMinRealAverage(28);
nextLevelBtn.UnSelectedImagePath = "MusicIcon/edit.png";
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index cb4721e..9d10353 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -587,7 +587,7 @@
/// </summary>
/// <param name="msg"></param>
/// <param name="isWhite"></param>
- public void TipMsgAutoClose(string msg, bool isWhite)
+ public void TipMsgAutoClose(string msg, bool isWhite,int time=1500)
{
Dialog dialog = new Dialog()
{
@@ -629,7 +629,7 @@
new Thread(() =>
{
- Thread.Sleep(1500);
+ Thread.Sleep(time);
Application.RunOnMainThread(() =>
{
dialog.Close();
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index e3fef44..426b4e7 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -34,7 +34,7 @@
LoadSceneFunctionControlZone();
}
DB_ResidenceData.residenceData.SaveResidenceData();
- new PublicAssmebly().TipMsgAutoClose(msg, true);
+ new PublicAssmebly().TipMsgAutoClose(msg, true,1000);
};
}
--
Gitblit v1.8.0