From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 215 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 168 insertions(+), 47 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 688c27e..565f759 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -105,26 +105,24 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(32),
- Width = Application.GetRealWidth(200),
+ Width = Application.GetRealWidth(400),
Height = Application.GetRealHeight(33),
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.EmphasisFontSize_FirstLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
Text = DB_ResidenceData.residenceData.residecenInfo.Name,
IsBold = true
};
topView.AddChidren(btnResidenceName);
-#if DEBUG
+#if DEBUG11
btnResidenceName.MouseUpEventHandler = (sender, e) =>
{
System.Threading.Tasks.Task.Run(
async () => { await DAL.Net.MqttCommon.StartMqtt();
});
};
-
#endif
-
environmentalView = new FrameLayout()
{
@@ -148,9 +146,9 @@
X = btnTempIcon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(30),
Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- Text = MainPage.cityInfo.temperature,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = MainPage.cityInfo.temperature + "掳",
TextAlignment = TextAlignment.CenterLeft,
};
environmentalView.AddChidren(btnTempValues);
@@ -170,9 +168,9 @@
X = btnHumidityIcon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(30),
Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- Text = MainPage.cityInfo.humidity,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = MainPage.cityInfo.humidity + "%",
TextAlignment = TextAlignment.CenterLeft,
};
environmentalView.AddChidren(btnHumidityValues);
@@ -192,8 +190,8 @@
X = btnPm25Icon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(30),
Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
Text = MainPage.cityInfo.pm25,
TextAlignment = TextAlignment.CenterLeft,
};
@@ -213,7 +211,7 @@
var btngb = new Button()
{
- BackgroundColor = CSS.CSS_Color.MainColor,//0x3F4484F4,//
+ BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,
Alpha = 0.4f,
};
msgView.AddChidren(btngb);
@@ -236,8 +234,8 @@
X = Application.GetRealWidth(10) + btnMsgIcon.Right,
Width = Application.GetRealWidth(240),
Text = "鏃�",
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
};
msgView.AddChidren(btnMsg);
@@ -248,7 +246,7 @@
X = Application.GetRealWidth(299),
Width = Application.GetRealWidth(44),
Text = "00:00",
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
};
msgView.AddChidren(btnMsgTime);
@@ -271,9 +269,9 @@
{
Width = Application.GetRealWidth(114),
TextID = StringId.Functions,
- SelectedTextColor = CSS.CSS_Color.MainColor,
- TextColor = CSS.CSS_Color.PromptingColor1,
- TextSize = CSS.CSS_FontSize.HeadlineFontSize,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.HeadlineFontSize,
TextAlignment = TextAlignment.Center,
IsSelected = true,
IsBold = true
@@ -286,7 +284,7 @@
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth(1),
Height = Application.GetRealHeight(14),
- BackgroundColor = CSS.CSS_Color.PromptingColor1,
+ BackgroundColor = CSS_Color.PromptingColor1,
};
changeView.AddChidren(btnLine);
@@ -295,22 +293,19 @@
X = btnLine.Right,
Width = Application.GetRealWidth(114),
TextID = StringId.Scenes,
- SelectedTextColor = CSS.CSS_Color.MainColor,
- TextColor = CSS.CSS_Color.PromptingColor1,
- TextSize = CSS.CSS_FontSize.TextFontSize,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.TextFontSize,
TextAlignment = TextAlignment.Center,
};
changeView.AddChidren(btnChangeScene);
#endregion
- //bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(10), BackgroundColor = 0xAAF2F3F7 });
-
-
#region ContextView
contentView = new PageLayout()
{
Y = changeView.Bottom ,
- Height = Application.GetRealHeight(310 + 30), //20涓鸿秴鍑洪儴鍒�
+ Height = Application.GetRealHeight(310 + 30 + 10), //20涓鸿秴鍑洪儴鍒�
};
bodyView.AddChidren(contentView);
@@ -325,7 +320,7 @@
contentView.PageIndex = 0;
#endregion
- bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(7), BackgroundColor = 0xAAF2F3F7 });
+ bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(4), BackgroundColor = 0xAAF2F3F7 });
LoadEvent_ChangeShowedFunctionType();
}
@@ -349,12 +344,38 @@
int index = 0;
foreach (var function in DB_ResidenceData.residenceData.functionList.GetAllDeviceFunctionList())
{
- if (!function.collection)
- continue;
- if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
+ //闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
+ if (function.functionCategory == FunctionCategory.Music)
{
- function.collection = false;
- continue;
+ var music = function as Music.A31MusicModel;
+ if (music.ServerClientType == -1)
+ {
+ continue;
+ }
+ else if (music.ServerClientType == 1)
+ {
+ if (!music.MainPlayCollection)
+ {
+ continue;
+ }
+ }
+ else
+ {
+ if (!music.collection)
+ {
+ continue;
+ }
+ }
+ }
+ else
+ {
+ if (!function.collection)
+ continue;
+ if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
+ {
+ function.collection = false;
+ continue;
+ }
}
if (index % 2 == 0)
{
@@ -378,6 +399,7 @@
Tag = function.sid
};
rowView.AddChidren(functionView);
+
var btnbg = new Button()
{
UnSelectedImagePath = "Collection/Functionbg.png",
@@ -388,6 +410,33 @@
functionViews.Add(functionView);
LoadDeviceFunctionDiv(functionView, function);
index++;
+ }
+
+ if (index == 0)
+ {
+ var view = new FrameLayout();
+ deviceFunctionView.AddChidren(view);
+
+ var btnNoCollectionBg = new Button()
+ {
+ Y = Application.GetRealHeight(20),
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(180),
+ Height = Application.GetRealWidth(180),
+ UnSelectedImagePath = "Collection/NoCollectionBg.png",
+ };
+ view.AddChidren(btnNoCollectionBg);
+
+ var btnNoCollectionTip = new Button()
+ {
+ Height = Application.GetRealHeight(42),
+ Y = btnNoCollectionBg.Bottom,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextID = StringId.TipNoFunctionCollcetion,
+ };
+ view.AddChidren(btnNoCollectionTip);
}
}
catch (Exception ex)
@@ -442,6 +491,33 @@
LoadSceneFunctionDiv( functionView, function);
index++;
}
+
+ if (index == 0)
+ {
+ var view = new FrameLayout();
+ sceneFunctionView.AddChidren(view);
+
+ var btnNoCollectionBg = new Button()
+ {
+ Y = Application.GetRealHeight(20),
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(180),
+ Height = Application.GetRealWidth(180),
+ UnSelectedImagePath = "Collection/NoCollectionBg.png",
+ };
+ view.AddChidren(btnNoCollectionBg);
+
+ var btnNoCollectionTip = new Button()
+ {
+ Height = Application.GetRealHeight(42),
+ Y = btnNoCollectionBg.Bottom,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextID = StringId.TipNoSceneCollcetion,
+ };
+ view.AddChidren(btnNoCollectionTip);
+ }
}
catch (Exception ex)
{
@@ -475,8 +551,8 @@
Y = Application.GetRealWidth(10) + btnIcon.Bottom,
Text = function.name,
IsBold = true,
- TextColor = CSS.CSS_Color.FirstLevelTitleColor,
- TextSize = CSS.CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
Height = Application.GetRealWidth(24),
Width = Application.GetRealWidth(140),
TextAlignment = TextAlignment.CenterLeft,
@@ -490,10 +566,10 @@
Y = btnName.Bottom,
Height = Application.GetRealWidth(18),
Width = Application.GetRealWidth(113),
- TextColor = CSS.CSS_Color.PromptingColor1,
- TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextAlignment = TextAlignment.CenterLeft,
- SelectedTextColor = CSS.CSS_Color.MainBackgroundColor,
+ SelectedTextColor = CSS_Color.MainBackgroundColor,
Text = function.GetRoomListName()
};
view.AddChidren(btnZone);
@@ -505,9 +581,9 @@
Y = btnZone.Bottom,
Height = Application.GetRealWidth(18),
Width = Application.GetRealWidth(113),
- SelectedTextColor = CSS.CSS_Color.MainBackgroundColor,
+ SelectedTextColor = CSS_Color.MainBackgroundColor,
TextColor = 0x00000000,
- TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextAlignment = TextAlignment.CenterLeft,
Tag = "state",
Text = function.lastState
@@ -556,7 +632,9 @@
view.AddChidren(btnCurtainOpen);
LoadEvent_ControlCurtain(function as Curtain, btnCurtainClose, btnCurtainOpen);
- }else if(function.functionType== FunctionType.TV)
+ }
+
+ else if (function.functionType == FunctionType.TV)
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVIcon.png";
Button btnPower;
@@ -571,6 +649,49 @@
view.AddChidren(btnPower);
LoadEvent_ControlTV(function as TV, btnPower);
}
+
+ else if (function.functionCategory == FunctionCategory.Music)
+ {
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
+ Button btnPower;
+ btnPower = new Button()
+ {
+ X = Application.GetRealWidth(118),
+ Y = Application.GetRealWidth(83),
+ Width = Application.GetRealWidth(44),
+ Height = Application.GetRealWidth(44),
+ UnSelectedImagePath = "FunctionIcon/Music/MusicPlayIcon.png",
+ SelectedImagePath = "FunctionIcon/Music/MusicPlayOnIcon.png",
+ };
+ view.AddChidren(btnPower);
+ var a31player = (function as UI.Music.A31MusicModel);
+ btnState.Text = a31player.A31PlayStatus.Title;
+
+ btnState.SelectedTextColor = CSS_Color.MainBackgroundColor;
+ btnState.TextColor = CSS_Color.MainBackgroundColor;//PromptingColor1
+
+ //Music.SendMethod.ReadStatus(a31player);
+
+ btnPower.MouseUpEventHandler = (sender, e) => {
+ if (btnPower.IsSelected)
+ {
+ btnPower.IsSelected = false;
+ Music.SendMethod.Pause(a31player);
+ a31player.A31PlayStatus.status = "pause";
+ a31player.on_off = "off";
+ }
+ else
+ {
+ btnPower.IsSelected = true;
+ Music.SendMethod.Play(a31player);
+ a31player.A31PlayStatus.status = "play";
+ a31player.on_off = "on";
+ }
+ UpdataFunctionStates(a31player);
+ };
+ }
+
else
{
Button btnSwitch;
@@ -621,7 +742,7 @@
}
break;
case FunctionCategory.Electrical:
- switch(function.functionType)
+ switch (function.functionType)
{
case FunctionType.Fan:
btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanIcon.png";
@@ -678,10 +799,10 @@
Y = btnName.Bottom,
Height = Application.GetRealWidth(18),
Width = Application.GetRealWidth(113),
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextAlignment = TextAlignment.CenterLeft,
- SelectedTextColor = CSS.CSS_Color.MainBackgroundColor,
+ SelectedTextColor = CSS_Color.MainBackgroundColor,
Text = function.GetRoomListName(),
};
view.AddChidren(btnZone);
--
Gitblit v1.8.0