From 1b42f39e34492ba8d4ce6336cc913877b9e064cb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 15:30:05 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs | 4
HDL-ON_Android/Assets/Phone/.DS_Store | 0
HDL-ON_Android/Assets/Language.ini | 2
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm | 0
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs | 50 +++---
HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs | 28 ++--
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs | 22 --
HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs | 8
HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs | 111 +++++++++++----
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 18 +-
HDL-ON_Android/Assets/Phone/LogicIcon/time.png | 0
HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs | 2
HDL-ON_iOS/Resources/Language.ini | 2
HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs | 12
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 1
HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs | 24 +-
.vs/HDL_APP_Project/xs/sqlite3/storage.ide | 0
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 9
HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs | 12
HDL-ON_Android/Assets/Phone/LogicIcon/.DS_Store | 0
HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs | 12
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 2
/dev/null | 0
HDL-ON_iOS/Resources/Phone/LogicIcon/.DS_Store | 0
HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs | 8
HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs | 8
HDL-ON_iOS/Resources/Phone/LogicIcon/time.png | 0
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 16 --
HDL_ON/Common/R.cs | 4
HDL-ON_iOS/Resources/Phone/.DS_Store | 0
HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs | 12
HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs | 12
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal | 0
36 files changed, 210 insertions(+), 181 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
index eea8824..9d61356 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 d5b5a16..6c503f5 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 fddf59a..27564cf 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/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 143a78b..c4688fb 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -515,6 +515,8 @@
7066=绂诲紑
7067=涓�鑸�
7068=鏃堕棿
+7069=鏆傛湭璁剧疆鑷姩鍖栵紝璇峰墠寰�璁剧疆锛�
+7070=姝ゅ绌虹┖濡備篃~
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
diff --git a/HDL-ON_Android/Assets/Phone/.DS_Store b/HDL-ON_Android/Assets/Phone/.DS_Store
index 3d7015f..a91336c 100644
--- a/HDL-ON_Android/Assets/Phone/.DS_Store
+++ b/HDL-ON_Android/Assets/Phone/.DS_Store
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/LogicIcon/.DS_Store b/HDL-ON_Android/Assets/Phone/LogicIcon/.DS_Store
new file mode 100644
index 0000000..6f78e25
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/LogicIcon/.DS_Store
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/LogicIcon/delayed.png b/HDL-ON_Android/Assets/Phone/LogicIcon/delayed.png
deleted file mode 100755
index df66c33..0000000
--- a/HDL-ON_Android/Assets/Phone/LogicIcon/delayed.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/LogicIcon/time.png b/HDL-ON_Android/Assets/Phone/LogicIcon/time.png
new file mode 100755
index 0000000..0b6a887
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/LogicIcon/time.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/LogicIcon/timecondition.png b/HDL-ON_Android/Assets/Phone/LogicIcon/timecondition.png
deleted file mode 100755
index df66c33..0000000
--- a/HDL-ON_Android/Assets/Phone/LogicIcon/timecondition.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/LogicIcon/timeicon.png b/HDL-ON_Android/Assets/Phone/LogicIcon/timeicon.png
deleted file mode 100755
index df66c33..0000000
--- a/HDL-ON_Android/Assets/Phone/LogicIcon/timeicon.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 143a78b..c4688fb 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -515,6 +515,8 @@
7066=绂诲紑
7067=涓�鑸�
7068=鏃堕棿
+7069=鏆傛湭璁剧疆鑷姩鍖栵紝璇峰墠寰�璁剧疆锛�
+7070=姝ゅ绌虹┖濡備篃~
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
diff --git a/HDL-ON_iOS/Resources/Phone/.DS_Store b/HDL-ON_iOS/Resources/Phone/.DS_Store
index febdb73..71845ba 100644
--- a/HDL-ON_iOS/Resources/Phone/.DS_Store
+++ b/HDL-ON_iOS/Resources/Phone/.DS_Store
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/LogicIcon/.DS_Store b/HDL-ON_iOS/Resources/Phone/LogicIcon/.DS_Store
new file mode 100644
index 0000000..6e54d8c
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/LogicIcon/.DS_Store
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/LogicIcon/delayed.png b/HDL-ON_iOS/Resources/Phone/LogicIcon/delayed.png
deleted file mode 100755
index df66c33..0000000
--- a/HDL-ON_iOS/Resources/Phone/LogicIcon/delayed.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/LogicIcon/time.png b/HDL-ON_iOS/Resources/Phone/LogicIcon/time.png
new file mode 100755
index 0000000..0b6a887
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/LogicIcon/time.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/LogicIcon/timecondition.png b/HDL-ON_iOS/Resources/Phone/LogicIcon/timecondition.png
deleted file mode 100755
index df66c33..0000000
--- a/HDL-ON_iOS/Resources/Phone/LogicIcon/timecondition.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/LogicIcon/timeicon.png b/HDL-ON_iOS/Resources/Phone/LogicIcon/timeicon.png
deleted file mode 100755
index df66c33..0000000
--- a/HDL-ON_iOS/Resources/Phone/LogicIcon/timeicon.png
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 58cf187..377792c 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -509,7 +509,9 @@
public const int leaveMode = 7066;
public const int ordinaryMode = 7067;
public const int timeMode = 7068;
-
+ public const int logicnull = 7069;
+ public const int secnenull = 7070;
+
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
index eedaf35..200befd 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
@@ -31,7 +31,7 @@
//鏃堕棿
LogicView.SelectTypeView timeView = new LogicView.SelectTypeView();
timeView.btnText.TextID = StringId.time;
- timeView.btnIcon.UnSelectedImagePath = "LogicIcon/timeicon.png";
+ timeView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
viewLayout.AddChidren(timeView.FLayoutView());
//鍔熻兘
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index 133eb88..f8e11ad 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -611,21 +611,5 @@
return stateList;
}
- /// <summary>
- /// 鐏拌壊寮规鐖舵帶浠�
- /// </summary>
- /// <param name="frame">鏄剧ず鍦ㄥ摢涓晫闈�</param>
- /// <returns></returns>
- public FrameLayout GetFrame(FrameLayout frame, string tagKey)
- {
- FrameLayout fLayout = new FrameLayout
- {
- BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
- Tag = tagKey,
-
- };
- frame.AddChidren(fLayout);
- return fLayout;
- }
}
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
index 815d67d..20a1887 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
@@ -92,59 +92,114 @@
/// <param name="fLayout">寮规涓绘帶浠�</param>
public void SceneMethod(FrameLayout fLayout)
{
- LogicView.DateView dateView = new LogicView.DateView();
- dateView.btnTitle.TextID = StringId.addSceneLogic;
- dateView.FLayoutView(fLayout, 5);
- dateView.btnCancel.MouseUpEventHandler += (sender2, e2) =>
+ int line = 0;
+ var sceneList = LogicMethod.GetSceneList();
+ if (sceneList.Count == 0|| sceneList.Count>5)
+ {
+ line = 5;
+ }
+ else {
+ line = sceneList.Count;
+ }
+ LogicView.DateView view = new LogicView.DateView();
+ view.btnTitle.TextID = StringId.addSceneLogic;
+ view.FLayoutView(fLayout, line);
+
+ view.btnCancel.MouseUpEventHandler += (sender2, e2) =>
{
fLayout.RemoveFromParent();
};
+ FrameLayout frameL = new FrameLayout
+ {
+ Y = Application.GetRealHeight(56),
+ Height = Application.GetRealHeight(50 * line),
+ };
+
VerticalRefreshLayout verticalRefresh = new VerticalRefreshLayout
{
Y = Application.GetRealHeight(56),
Height = Application.GetRealHeight(50 * 5),
};
- dateView.frameLayout.AddChidren(verticalRefresh);
- //瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鐘舵��
- Button buttonClick = new Button();
- HDL_ON.Entity.Scene sceneSelecetd = null;
- var sceneList = LogicMethod.GetSceneList();
verticalRefresh.BeginHeaderRefreshingAction += () =>
{
//鍏抽棴鍒锋柊View锛�
verticalRefresh.EndHeaderRefreshing();
};
+
+ if (sceneList.Count == 0)
+ {
+ Button btnTipNot = new Button
+ {
+ X=Application.GetRealWidth(93),
+ Y = Application.GetRealHeight(80),
+ Width = Application.GetRealWidth(158),
+ Height = Application.GetRealWidth(158),
+ UnSelectedImagePath = "TipNot.png",
+
+ };
+ view.frameLayout.AddChidren(btnTipNot);
+
+ Button btnTipNotText = new Button()
+ {
+ Y = btnTipNot.Bottom+ Application.GetRealHeight(16),
+ Height = Application.GetRealHeight(20),
+ TextID = StringId.secnenull,
+ TextColor = CSS.CSS_Color.textColor,
+ TextSize =LogicView.TextSize.text14,
+ TextAlignment = TextAlignment.Center,
+ };
+ view.frameLayout.AddChidren(btnTipNotText);
+ }
+ else if (sceneList.Count <=5 ) {
+ view.frameLayout.AddChidren(frameL);
+ }
+ else if(sceneList.Count>5) {
+ view.frameLayout.AddChidren(verticalRefresh);
+
+ }
+
+
+ //瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鐘舵��
+ Button buttonClick = new Button();
+ HDL_ON.Entity.Scene sceneSelecetd = null;
+ verticalRefresh.BeginHeaderRefreshingAction += () =>
+ {
+ //鍏抽棴鍒锋柊View锛�
+ verticalRefresh.EndHeaderRefreshing();
+ };
+
for (int i = 0; i < sceneList.Count; i++)
{
var scene = sceneList[i];
- LogicView.SelectTypeView sceneView = new LogicView.SelectTypeView();
- sceneView.frameLayout.BackgroundColor = CSS.CSS_Color.viewTranslucence;
- sceneView.btnIcon.Visible = false;
- sceneView.btnText.X = Application.GetRealWidth(20);
+ LogicView.CheckView sceneView = new LogicView.CheckView();
sceneView.btnText.Text = scene.name;
- sceneView.btnLine.X = Application.GetRealWidth(20);
- sceneView.btnLine.Width = Application.GetRealWidth(303);
- sceneView.btnNextIcon.X = Application.GetRealWidth(303);
- sceneView.btnNextIcon.Width = Application.GetRealWidth(28);
- sceneView.btnNextIcon.Height = Application.GetRealWidth(28);
- sceneView.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png";
- sceneView.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png";
- verticalRefresh.AddChidren(sceneView.FLayoutView());
+ sceneView.btnText.TextSize = LogicView.TextSize.text14;
+ if (sceneList.Count <= 5)
+ {
+ sceneView.frameLayout.Y = Application.GetRealWidth(i*50);
+ frameL.AddChidren(sceneView.FLayoutView());
+ if (sceneList.Count-1==i) {
+ sceneView.btnLine.BackgroundColor = CSS.CSS_Color.view;
+ }
+ }
+ else
+ {
+ verticalRefresh.AddChidren(sceneView.FLayoutView());
+ }
sceneView.btnClick.Tag = scene;//鏍囪绱㈠紩
-
//鍦烘櫙鐨勭偣鍑讳簨浠�
sceneView.btnClick.MouseUpEventHandler += (sender, e) =>
{
buttonClick.IsSelected = false;
- sceneView.btnNextIcon.IsSelected = true;
- buttonClick = sceneView.btnNextIcon;
- sceneSelecetd =sceneView.btnClick.Tag as HDL_ON.Entity.Scene;
+ sceneView.btnCheckIcon.IsSelected = true;
+ buttonClick = sceneView.btnCheckIcon;
+ sceneSelecetd = sceneView.btnClick.Tag as HDL_ON.Entity.Scene;
};
}
//纭鐐瑰嚮浜嬩欢
- dateView.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
+ view.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
{
if (sceneSelecetd == null)
{
@@ -154,7 +209,7 @@
Output outputDevice = new Output();
outputDevice.target_type = "2";
outputDevice.sid = sceneSelecetd.sid;
- //娌″暐浣滅敤锛屼负浜嗘暟鎹牸寮忕粺涓�,鍙戦�佹椂涓嶅啀鍒ゆ柇
+ //娌″暐浣滅敤锛屼负浜嗗彂閫佹暟鎹牸寮忕粺涓�;
outputDevice.status = new List<Dictionary<string, string>> { new Dictionary<string, string> { { "key", "scene"},{ "value", "0" } } };
AddOutput(outputDevice);
fLayout.RemoveFromParent();
@@ -201,7 +256,7 @@
foreach (var dic in dicList)
{
string timeValue = dic["value"];
- int hIndex = timePointView.GetValueIndex(timeValue, 0, 1, timePointView.GethIntList0());
+ int hIndex = timePointView.GetValueIndex(timeValue, 0, 1, timePointView.GethIntList());
int mIndex = timePointView.GetValueIndex(timeValue, 1, 0, timePointView.GetmIntList());
//鏇存柊鍒濆鐘舵��
timePointView.mUIPickerView.setCurrentItems(hIndex, mIndex, 0);
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index eedb16c..e429b56 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -29,7 +29,7 @@
{
case "1":
{
- inputView.btnIcon.UnSelectedImagePath = "LogicIcon/timecondition.png";
+ inputView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
foreach (var dic in dicList)
{
string value = dic["value"];
@@ -40,7 +40,7 @@
break;
case "2":
{
- inputView.btnIcon.UnSelectedImagePath = "LogicIcon/timecondition.png";
+ inputView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
foreach (var dic in dicList)
{
string value = dic["value"];
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
index 28ddfa1..0dce8c7 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
@@ -88,7 +88,7 @@
{
//鍒濆鍖栧垪琛�
var hList = new List<string>();
- for (int i = 1; i < 24; i++)
+ for (int i = 0; i < 24; i++)
{
if (i < 10)
{
@@ -165,28 +165,11 @@
/// 鑾峰彇023灏忔椂鍒楄〃
/// </summary>
/// <returns></returns>
- public List<int> GethIntList0()
- {
- //鍒濆鍖栧垪琛�
- var hList = new List<int>();
- for (int i = 1; i < 24; i++)
- {
- //娣诲姞鏁版嵁
- hList.Add(i);
- }
- return hList;
-
-
- }
- /// <summary>
- /// 鑾峰彇24灏忔椂鍒楄〃
- /// </summary>
- /// <returns></returns>
public List<int> GethIntList()
{
//鍒濆鍖栧垪琛�
var hList = new List<int>();
- for (int i = 1; i < 24; i++)
+ for (int i = 0; i < 24; i++)
{
//娣诲姞鏁版嵁
hList.Add(i);
@@ -195,6 +178,7 @@
}
+
/// <summary>
/// 鑾峰彇60鍒嗛挓鍒楄〃
/// </summary>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 101d71f..167b476 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -34,8 +34,8 @@
};
//鑾峰彇鑷姩鍖栧垪琛�
GetLogicList();
- // for (int i = Logic.LogicList.Count-1; i >= 0; i--)闄嶅簭鎺掑垪
- for (int i = 0; i < Logic.LogicList.Count; i++)
+ for (int i = Logic.LogicList.Count-1; i >= 0; i--)//闄嶅簭鎺掑垪
+ //for (int i = 0; i < Logic.LogicList.Count; i++)
{
var currLogic = Logic.LogicList[i];
///涓婁笅闂撮殧12鍍忕礌
@@ -81,8 +81,8 @@
{ IsBackground = true }.Start();
};
GetSelectIcon(logicView.frameLayout, currLogic);
- //if (i==0)闄嶅簭鎺掑垪
- if (Logic.LogicList.Count - 1 == i)
+ if (i==0)//闄嶅簭鎺掑垪
+ //if (Logic.LogicList.Count - 1 == i)
{
///鏈�鍚庝竴涓窛绂绘渶搴曢儴12,鐣岄潰鏄剧ず鏁堟灉浣滅敤;
vv.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12) });
@@ -110,12 +110,12 @@
automationPage.AddChidren(btnTipNot);
Button btnTipNotText = new Button()
{
- Y = btnTipNot.Bottom,
- Height = Application.GetRealWidth(100),
- TextID = StringId.ContentIsEmpty,
+ Y = btnTipNot.Bottom + Application.GetRealHeight(16),
+ Height = Application.GetRealHeight(20),
+ TextID = StringId.logicnull,
TextAlignment = TextAlignment.Center,
- TextColor = CSS.CSS_Color.TextualColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
+ TextSize = LogicView.TextSize.text14,
+ TextColor = CSS.CSS_Color.textConfirmColor,
};
automationPage.AddChidren(btnTipNotText);
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index fe9cf05..fed922d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -14,7 +14,7 @@
/// <param name="stateText">涔嬪墠鐘舵�佹枃鏈�</param>
/// <param name="action">杩斿洖鍊�</param>
/// <param name="textSize">鏄剧ず鏂囨湰瀛椾綋澶у皬</param>
- public void SingleSelectionShow(FrameLayout frameLayout, List<string> list, string titleText, string stateText,Action<string> action, int textSize=LogicView.TextSize.text14)
+ public void SingleSelectionShow(FrameLayout frameLayout, List<string> list, string titleText, string stateText, Action<string> action, int textSize = LogicView.TextSize.text14)
{
LogicView.DateView view = new LogicView.DateView();
view.btnTitle.Text = titleText;
@@ -69,6 +69,7 @@
};
}
+
/// <summary>
/// 澶氶�夋嫨
/// </summary>
@@ -149,7 +150,7 @@
/// </summary>
/// <param name="frameLayout">鐖舵帶浠�</param>
/// <param name="action">鏄剧ず鏂囨湰瀛椾綋澶у皬</param>
- public void MonSelectShow(FrameLayout frameLayout,Logic logic, Action<List<string>> action)
+ public void MonSelectShow(FrameLayout frameLayout, Logic logic, Action<List<string>> action)
{
LogicView.MonView monView = new LogicView.MonView();
monView.btnTitle.TextID = StringId.monthly;
@@ -237,12 +238,14 @@
//鎻愮ず锛氳繕娌￠�変腑鎵ц鍛ㄦ湡
return;
}
-
+
action(monList);
frameLayout.RemoveFromParent();
};
}
+
+
}
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 95c6385..00271c2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -278,7 +278,7 @@
speedTypeView.btnText.Text = speedStr[i];
speedTypeView.btnClick.Tag = speedStr[i];//鏍囪
- if (acModehView.btnState.Text == speedStr[i])
+ if (acSpeedView.btnState.Text == speedStr[i])
{
//鏄剧ず涔嬪墠鐨勯�変腑鐘舵��
checkBtn.IsSelected = false;
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
index 9727a29..9d37ba1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
@@ -107,9 +107,9 @@
var systeMinute = DateTime.Now.Minute;//鑾峰彇鍒嗛挓
int systemHourIndex = 0;
int systeMinuteIndex = 0;
- for (int i = 0; i < timePointView.GethIntList0().Count; i++)
+ for (int i = 0; i < timePointView.GethIntList().Count; i++)
{
- var currhour = timePointView.GethIntList0()[i];
+ var currhour = timePointView.GethIntList()[i];
if (systemHour == currhour)
{
systemHourIndex = i;
@@ -160,7 +160,7 @@
int hIndex = timePointView.GetValueIndex(timeValue, 0, 1, timePointView.GethIntList());
int mIndex = timePointView.GetValueIndex(timeValue, 1, 0, timePointView.GetmIntList());
//鏇存柊鍒濆鐘舵��
- timePointView.mUIPickerView.setCurrentItems(hIndex - 1, mIndex, 0);
+ timePointView.mUIPickerView.setCurrentItems(hIndex, mIndex, 0);
timepoint = timeValue;
}
}
@@ -378,9 +378,9 @@
var systeMinute = DateTime.Now.Minute;//鑾峰彇鍒嗛挓
int systemHourIndex = 0;
int systeMinuteIndex = 0;
- for (int i = 0; i < timePointView.GethIntList0().Count; i++)
+ for (int i = 0; i < timePointView.GethIntList().Count; i++)
{
- var currhour = timePointView.GethIntList0()[i];
+ var currhour = timePointView.GethIntList()[i];
if (systemHour == currhour)
{
systemHourIndex = i;
@@ -447,7 +447,7 @@
int hourIndex = timePointView.GetValueIndex(timepoint, 0, 1, timePointView.GethIntList());
int minuteIndex = timePointView.GetValueIndex(timepoint, 1, 0, timePointView.GetmIntList());
//鏇存柊鐘舵��
- timePointView.mUIPickerView.setCurrentItems(hourIndex - 1, minuteIndex, 0);
+ timePointView.mUIPickerView.setCurrentItems(hourIndex, minuteIndex, 0);
}
//閫変腑鏃堕棿鍥炶皟鏂规硶,鏃堕棿鍙樺寲涓�娆″洖璋冧竴娆�
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs
index 47dff85..17e903c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs
@@ -67,8 +67,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(88),
- Height = Application.GetMinRealAverage(88),
+ Width = Application.GetRealWidth(88),
+ Height = Application.GetRealWidth(88),
};
addFlieRow.AddChidren(fileIconBtn);
@@ -77,8 +77,8 @@
{
X = Application.GetRealWidth(78),
Y = Application.GetRealHeight(70),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "MusicIcon/filePause.png",
SelectedImagePath = "MusicIcon/filePlay.png",
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs
index 5767ca5..4369486 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs
@@ -80,8 +80,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(18),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "MusicIcon/radioIcon.png",
};
radioViewFl.AddChidren(radioIconBtn);
@@ -104,8 +104,8 @@
{
X = Application.GetRealWidth(335),
Y = Application.GetRealHeight(20),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/loveSelected.png",
};
radioViewFl.AddChidren(loveIcon);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
index 95b2b2e..3db0642 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
@@ -64,8 +64,8 @@
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.Width = Application.GetRealWidth(16);
+ areaText.nextLevelBtn.Height = Application.GetRealWidth(16);
areaText.nextLevelBtn.UnSelectedImagePath = "MusicIcon/sourceNetx.png";
areaText.lineBtn.BackgroundColor = MusicColor.WhiteColor;
areaText.textBtn.X = Application.GetRealWidth(16);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs
index f871783..2e8ac86 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs
@@ -40,8 +40,8 @@
{
X = Application.GetRealWidth(336),
Y = Application.GetRealHeight(30),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/addMusic.png",
};
topView.TopFLayoutView().AddChidren(addIconBtn);
@@ -96,8 +96,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(88),
- Height = Application.GetMinRealAverage(88),
+ Width = Application.GetRealWidth(88),
+ Height = Application.GetRealWidth(88),
UnSelectedImagePath = "MusicIcon/fileList.png",
};
addFlieRow.AddChidren(fileIconBtn);
@@ -106,8 +106,8 @@
{
X = Application.GetRealWidth(78),
Y = Application.GetRealHeight(70),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "MusicIcon/filePause.png",
SelectedImagePath = "MusicIcon/filePlay.png",
Tag= list,
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index e637068..d651ae9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -39,7 +39,6 @@
public void Show()
{
-
///1绉掑畾鏃舵洿鏂扮姸鎬�
timerUpdateStatus();
#region ---鐣岄潰甯冨眬---
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs
index 072c1ff..bd119b9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs
@@ -64,8 +64,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(62),
- Height = Application.GetMinRealAverage(62),
+ Width = Application.GetRealWidth(62),
+ Height = Application.GetRealWidth(62),
UnSelectedImagePath = "MusicIcon/file.png",
};
addFlieRow.AddChidren(fileIconBtn);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs
index 1379d33..9ad5b09 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs
@@ -71,8 +71,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(18),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "MusicIcon/radioIcon.png",
};
radioViewFl.AddChidren(radioIconBtn);
@@ -96,8 +96,8 @@
{
X = Application.GetRealWidth(335),
Y = Application.GetRealHeight(20),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/love.png",
SelectedImagePath = "MusicIcon/loveSelected.png",
};
@@ -185,8 +185,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(62),
- Height = Application.GetMinRealAverage(62),
+ Width = Application.GetRealWidth(62),
+ Height = Application.GetRealWidth(62),
UnSelectedImagePath = "MusicIcon/file.png",
};
addFlieRow.AddChidren(fileIconBtn);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
index 9423667..1c15666 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
@@ -80,8 +80,8 @@
{
X = Application.GetRealWidth(304),
Y = Application.GetRealHeight(20),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/addMusic.png",
};
topFra.AddChidren(addIconBtn);
@@ -132,8 +132,8 @@
{
X = Application.GetRealWidth(12),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(62),
- Height = Application.GetMinRealAverage(62),
+ Width = Application.GetRealWidth(62),
+ Height = Application.GetRealWidth(62),
UnSelectedImagePath = "MusicIcon/file.png",
};
addFlieRow.AddChidren(fileIconBtn);
@@ -352,8 +352,8 @@
{
X = Application.GetRealWidth(303),
Y = Application.GetRealHeight(11),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/noSelectedIcon.png",
SelectedImagePath = "MusicIcon/selectedIcon.png",
};
@@ -626,8 +626,8 @@
{
X = Application.GetRealWidth(303),
Y = Application.GetRealHeight(11),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/noSelectedIcon.png",
SelectedImagePath = "MusicIcon/selectedIcon.png",
Tag = player,
@@ -812,8 +812,8 @@
{
X = Application.GetRealWidth(303),
Y = Application.GetRealHeight(11),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/noSelectedIcon.png",
SelectedImagePath = "MusicIcon/selectedIcon.png",
};
@@ -1284,8 +1284,8 @@
IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
ProgressBarColor = MusicColor.SelectedColor,//閫変腑杩涘害鏉￠鑹�
ThumbImagePath = "MusicIcon/progressIcon.png",//杩涘害鏉℃寜閽浘鏍�
- ThumbImageHeight = Application.GetMinRealAverage(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
- SeekBarViewHeight = Application.GetMinRealAverage(8),//杩涘害鏉＄殑楂樺害
+ ThumbImageHeight = Application.GetRealWidth(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+ SeekBarViewHeight = Application.GetRealWidth(8),//杩涘害鏉＄殑楂樺害
Progress = int.Parse(a31player.A31PlayStatus.vol),
SeekBarPadding = Application.GetRealWidth(20),
//ProgressChangeDelayTime=
@@ -1347,8 +1347,8 @@
IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
ProgressBarColor = MusicColor.SelectedColor,//閫変腑杩涘害鏉￠鑹�
ThumbImagePath = "MusicIcon/progressIcon.png",//杩涘害鏉℃寜閽浘鏍�
- ThumbImageHeight = Application.GetMinRealAverage(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
- SeekBarViewHeight = Application.GetMinRealAverage(8),//杩涘害鏉＄殑楂樺害
+ ThumbImageHeight = Application.GetRealWidth(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+ SeekBarViewHeight = Application.GetRealWidth(8),//杩涘害鏉＄殑楂樺害
Progress = int.Parse(player.A31PlayStatus.vol),
SeekBarPadding = Application.GetRealWidth(20),
//ProgressChangeDelayTime=
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs
index 6cb0965..2c622a0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs
@@ -20,8 +20,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(13),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
};
/// <summary>
///鏂囨湰
@@ -58,8 +58,8 @@
{
X = Application.GetRealWidth(339),
Y = Application.GetRealHeight(17),
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
UnSelectedImagePath = "MusicIcon/sourceNetx.png",
};
@@ -104,8 +104,8 @@
fLayout.AddChidren(inputTextBtn);
nextLevelBtn.X = Application.GetRealWidth(333);
nextLevelBtn.Y = Application.GetRealHeight(11);
- nextLevelBtn.Width = Application.GetMinRealAverage(28);
- nextLevelBtn.Height = Application.GetMinRealAverage(28);
+ nextLevelBtn.Width = Application.GetRealWidth(28);
+ nextLevelBtn.Height = Application.GetRealWidth(28);
nextLevelBtn.UnSelectedImagePath = "MusicIcon/edit.png";
}
fLayout.AddChidren(textBtn);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
index 7304bb9..cb68d38 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
@@ -32,8 +32,8 @@
{
X = Application.GetRealWidth(10),
Y = Application.GetRealHeight(15),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "MusicIcon/playStatus.png",
};
/// <summary>
@@ -55,8 +55,8 @@
{
X = Application.GetRealWidth(214 + 13),
Y = Application.GetRealHeight(18 + 5),
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
UnSelectedImagePath = "MusicIcon/Merge.png",
};
/// <summary>
@@ -80,8 +80,8 @@
{
X = Application.GetRealWidth(299),
Y = Application.GetRealHeight(10),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
UnSelectedImagePath = "MusicIcon/collect.png",
SelectedImagePath = "MusicIcon/collectSelected.png",
};
@@ -157,8 +157,8 @@
{
X = Application.GetRealWidth(163),
Y = Application.GetRealHeight(101),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "MusicIcon/prev.png",
SelectedImagePath = "MusicIcon/prevSeletced.png",
};
@@ -169,8 +169,8 @@
{
X = Application.GetRealWidth(233),
Y = Application.GetRealHeight(101),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "MusicIcon/pause.png",
SelectedImagePath = "MusicIcon/play.png",
};
@@ -181,8 +181,8 @@
{
X = Application.GetRealWidth(303),
Y = Application.GetRealHeight(101),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "MusicIcon/next.png",
SelectedImagePath = "MusicIcon/nextSelected.png",
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs
index a7516e7..c9b4aab 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs
@@ -40,8 +40,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(11),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
};
/// <summary>
/// 妯″紡鏂囨湰鎺т欢
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
index 438e708..e368d4f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
@@ -51,8 +51,8 @@
{
X = Application.GetRealWidth(273),
Y = Application.GetRealHeight(14),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
UnSelectedImagePath = "MusicIcon/collect.png",
SelectedImagePath = "MusicIcon/collectSelected.png",
};
@@ -61,20 +61,18 @@
/// </summary>
public FrameLayout fra = new FrameLayout
{
- X = Application.GetRealWidth(63 + 2),
+ X = Application.GetRealWidth(57),
Y = Application.GetRealHeight(72),
Width = Application.GetRealWidth(202+12),
- Height = Application.GetRealHeight(202+12),
+ Height = Application.GetRealWidth(202+12),
};
/// <summary>
///鏄剧ず鎾斁闊充箰鍥炬爣
/// </summary>
public Button musicIconBtn = new Button
{
- //X = Application.GetRealWidth(63 + 2+20),
- //Y = Application.GetRealHeight(72 + 6+20),
- Width = Application.GetMinRealAverage(158),
- Height = Application.GetMinRealAverage(158),
+ Width = Application.GetRealWidth(158),
+ Height = Application.GetRealWidth(158),
UnSelectedImagePath = "MusicIcon/musicIcon.png",
Gravity = Gravity.Center,
};
@@ -83,8 +81,8 @@
/// </summary>
public DiyArcSeekBar diyArcSeekBar = new DiyArcSeekBar
{
- Width = Application.GetMinRealAverage(202),
- Height = Application.GetMinRealAverage(202),
+ Width = Application.GetRealWidth(202),
+ Height = Application.GetRealWidth(202),
ProgressBarColor = MusicColor.SelectedColor,
OpenAngle = 0,//寮�鍙ｈ搴�
ArcWidth = Application.GetRealWidth(4),//杩涘害瀹藉害
@@ -156,8 +154,8 @@
{
X = Application.GetRealWidth(70),
Y = Application.GetRealHeight(355),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/list.png",
};
/// <summary>
@@ -167,8 +165,8 @@
{
X = Application.GetRealWidth(150),
Y = Application.GetRealHeight(355),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/love1.png",
SelectedImagePath = "MusicIcon/loveSelected1.png",
};
@@ -179,8 +177,8 @@
{
X = Application.GetRealWidth(230),
Y = Application.GetRealHeight(355),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/playList.png",
};
/// <summary>
@@ -190,8 +188,8 @@
{
X = Application.GetRealWidth(24),
Y = Application.GetRealHeight(414),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "MusicIcon/vol.png",
};
/// <summary>
@@ -207,8 +205,8 @@
IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
ProgressBarColor = MusicColor.SelectedColor,//閫変腑杩涘害鏉￠鑹�
ThumbImagePath = "MusicIcon/progressIcon.png",//杩涘害鏉℃寜閽浘鏍�
- ThumbImageHeight = Application.GetMinRealAverage(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
- SeekBarViewHeight = Application.GetMinRealAverage(8),//杩涘害鏉＄殑楂樺害
+ ThumbImageHeight = Application.GetRealWidth(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+ SeekBarViewHeight = Application.GetRealWidth(8),//杩涘害鏉＄殑楂樺害
ProgressChangeDelayTime = 300,//0.3绉掑彂閫佷竴娆�
SeekBarPadding = Application.GetRealWidth(20),
};
@@ -233,8 +231,8 @@
{
X = Application.GetRealWidth(64),
Y = Application.GetRealHeight(466),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
UnSelectedImagePath = "MusicIcon/prve1.png",
SelectedImagePath = "MusicIcon/prve1Selected.png",
};
@@ -245,8 +243,8 @@
{
X = Application.GetRealWidth(144),
Y = Application.GetRealHeight(466),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
UnSelectedImagePath = "MusicIcon/pause1.png",
SelectedImagePath = "MusicIcon/play1.png",
};
@@ -257,8 +255,8 @@
{
X = Application.GetRealWidth(224),
Y = Application.GetRealHeight(466),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
UnSelectedImagePath = "MusicIcon/next1.png",
SelectedImagePath = "MusicIcon/next1Selected.png",
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
index 8be5b91..cc67593 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
@@ -21,8 +21,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(10),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "MusicIcon/playStatus.png",
Visible = false,
Name = "playStatus",
@@ -64,8 +64,8 @@
{
X = Application.GetRealWidth(291),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/love.png",
SelectedImagePath = "MusicIcon/loveSelected.png",
};
@@ -77,8 +77,8 @@
{
X = Application.GetRealWidth(335),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/addMusic1.png",
};
/// <summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs
index 56bcb04..82ae30a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs
@@ -92,8 +92,8 @@
{
X = Application.GetRealWidth(194),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "MusicIcon/clear.png",
};
editBjView.AddChidren(clearIconBtn);
@@ -264,8 +264,8 @@
{
X = Application.GetRealWidth(194),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "MusicIcon/clear.png",
};
editBjView.AddChidren(clearIconBtn);
--
Gitblit v1.8.0