From 8309664bc53f72b0c808c339329cabcee87657c5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 25 七月 2023 17:57:11 +0800
Subject: [PATCH] 移植库过来
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 543 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 438 insertions(+), 105 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 49647e1..255f9f7 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -70,15 +70,20 @@
/// <summary>
/// 鍒囨崲鏄剧ず鍔熻兘绫诲瀷鍖哄煙
/// </summary>
- FrameLayout changeView;
- /// <summary>
- /// 鍒囨崲鏄剧ず璁惧鍔熻兘鎸夐挳
- /// </summary>
- Button btnChangeFunction;
- /// <summary>
- /// 鍒囨崲鏄剧ず鍦烘櫙鍔熻兘鎸夐挳
- /// </summary>
- Button btnChangeScene;
+ FrameLayout changeBaseView;
+ //FrameLayout changeView;
+ ///// <summary>
+ ///// 鍒囨崲鏄剧ず璁惧鍔熻兘鎸夐挳
+ ///// </summary>
+ //Button btnChangeFunction;
+ ///// <summary>
+ ///// 鍒囨崲鏄剧ず鍦烘櫙鍔熻兘鎸夐挳
+ ///// </summary>
+ //Button btnChangeScene;
+ ///// <summary>
+ ///// 鍒囨崲鏄剧ず鍦虹粍鎺ф寜閽�
+ ///// </summary>
+ //Button btnChangeGroupControl;
/// <summary>
/// 鍔熻兘鏄剧ず鍖哄煙
/// </summary>
@@ -92,6 +97,10 @@
/// </summary>
VerticalScrolViewLayout sceneFunctionView;
/// <summary>
+ /// 缁勬帶鎺у埗鍖哄煙
+ /// </summary>
+ VerticalScrolViewLayout gcFunctionView;
+ /// <summary>
/// 鍔熻兘鍖哄煙闆嗗悎
/// </summary>
List<FrameLayout> functionViews;
@@ -100,16 +109,19 @@
#region 鍖哄煙鍙橀噺
/// <summary>
/// 褰撳墠鏄剧ず瀵规帶鍒剁被鍨嬫槸鍚︽槸璁惧鍔熻兘鎺у埗
+ /// 0 鍔熻兘
+ /// 1 鍦烘櫙
+ /// 2 缇ゆ帶
/// </summary>
- bool CurShowTypeIsFunction = true;
+ int CurShowTypeContent = 0;
#endregion
#region 鎶ヨ淇℃伅
- Button btnMsgBg;
- Button btnMsgTime;
- Button btnMsg;
+ //Button btnMsgBg;
+ //Button btnMsgTime;
+ //Button btnMsg;
Button btnMsgIcon;
-#endregion
+ #endregion
public HomePage()
{
@@ -149,21 +161,18 @@
bodyView.EndHeaderRefreshing();
Common.ApiUtlis.Ins.DownloadData();
LoadContentView();
- if (!CurShowTypeIsFunction)
- {
- contentView.PageIndex = 1;
- }
+ contentView.PageIndex = CurShowTypeContent;
};
topView = new FrameLayout()
{
- Height = Application.GetRealHeight(216),
+ Height = Application.GetRealHeight(113),//216),
BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
};
bodyView.AddChidren(topView);
#else
VerticalRefreshLayout refreshLayout = new VerticalRefreshLayout()
{
- Height = Application.GetRealHeight(216),
+ Height = Application.GetRealHeight(113),//216),
BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
};
bodyView.AddChidren(refreshLayout);
@@ -172,14 +181,11 @@
refreshLayout.EndHeaderRefreshing();
Common.ApiUtlis.Ins.DownloadData();
LoadContentView();
- if(!CurShowTypeIsFunction)
- {
- contentView.PageIndex = 1;
- }
+ contentView.PageIndex = CurShowTypeContent;
};
topView = new FrameLayout()
{
- Height = Application.GetRealHeight(216),
+ Height = Application.GetRealHeight(113),//216),
};
refreshLayout.AddChidren(topView);
#endif
@@ -503,57 +509,57 @@
#region msg
- FrameLayout msgView;
- msgView = new FrameLayout()
- {
- Y = Application.GetRealHeight(164),
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(28),
- };
- topView.AddChidren(msgView);
+ //FrameLayout msgView;
+ //msgView = new FrameLayout()
+ //{
+ // Y = Application.GetRealHeight(164),
+ // Gravity = Gravity.CenterHorizontal,
+ // Width = Application.GetRealWidth(343),
+ // Height = Application.GetRealHeight(28),
+ //};
+ //topView.AddChidren(msgView);
- btnMsgBg = new Button()
- {
- BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,
- Alpha = 0.4f,
- };
- msgView.AddChidren(btnMsgBg);
+ //btnMsgBg = new Button()
+ //{
+ // BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,
+ // Alpha = 0.4f,
+ //};
+ //msgView.AddChidren(btnMsgBg);
btnMsgIcon = new Button()
{
- X = Application.GetRealWidth(12),
- Gravity = Gravity.CenterVertical,
+ X = Application.GetRealWidth(290),
+ Y = Application.GetRealHeight(35),
Width = Application.GetMinRealAverage(24),
Height = Application.GetMinRealAverage(24),
UnSelectedImagePath = "Collection/MsgIcon.png",
SelectedImagePath = "Collection/MsgIconTip.png",
};
- msgView.AddChidren(btnMsgIcon);
+ topView.AddChidren(btnMsgIcon);
- btnMsg = new Button()
- {
- X = Application.GetRealWidth(10) + btnMsgIcon.Right,
- Width = Application.GetRealWidth(240),
- Text = "...",
- TextColor = CSS_Color.MainBackgroundColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft,
- };
- msgView.AddChidren(btnMsg);
+ //btnMsg = new Button()
+ //{
+ // X = Application.GetRealWidth(10) + btnMsgIcon.Right,
+ // Width = Application.GetRealWidth(240),
+ // Text = "...",
+ // TextColor = CSS_Color.MainBackgroundColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // TextAlignment = TextAlignment.CenterLeft,
+ //};
+ //msgView.AddChidren(btnMsg);
- btnMsgTime = new Button()
- {
- X = Application.GetRealWidth(299),
- Width = Application.GetRealWidth(44),
- Text = "00:00",
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft,
- };
- msgView.AddChidren(btnMsgTime);
+ //btnMsgTime = new Button()
+ //{
+ // X = Application.GetRealWidth(299),
+ // Width = Application.GetRealWidth(44),
+ // Text = "00:00",
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // TextAlignment = TextAlignment.CenterLeft,
+ //};
+ //msgView.AddChidren(btnMsgTime);
LoadEvent_GotoMessageCenterPage();
@@ -565,20 +571,69 @@
bodyView.AddChidren(new Button() { Height = Application.GetRealHeight(20), BackgroundColor = 0x00000000 });
- changeView = new FrameLayout()
+ loadNavView();
+
+ #endregion
+
+ #region ContextView
+
+
+ functionViews = new List<FrameLayout>();
+
+ LoadContentView();
+
+ #endregion
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
+ }
+
+
+ }
+
+ void loadNavView()
+ {
+ if(changeBaseView == null)
+ {
+ changeBaseView = new FrameLayout()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Height = Application.GetRealHeight(62),
+ };
+ bodyView.AddChidren(changeBaseView);
+ }
+ else
+ {
+ changeBaseView.RemoveAll();
+ }
+
+ if (contentView == null)
+ {
+ contentView = new PageLayout()
+ {
+ Height = Application.GetRealHeight(310 + 30 + 10 + 100), //20涓鸿秴鍑洪儴鍒�
+ IsShowPoint = false,
+ };
+ bodyView.AddChidren(contentView);
+ }
+
+ if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl && FunctionList.List.groupControls.Count > 0)
+ {
+ var changeView = new FrameLayout()
{
//Y = Application.GetRealHeight(20) + topView.Bottom,
Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(230),
+ Width = Application.GetRealWidth(334),
Height = Application.GetRealHeight(62),
BackgroundImagePath = "Collection/ChangeViewbg.png",
};
- bodyView.AddChidren(changeView);
+ changeBaseView.AddChidren(changeView);
- btnChangeFunction = new Button()
+ var btnChangeFunction = new Button()
{
X = Application.GetRealWidth(10),
- Width = Application.GetRealWidth(114-10),
+ Width = Application.GetRealWidth(114 - 10),
TextID = StringId.Functions,
SelectedTextColor = CSS_Color.MainColor,
TextColor = CSS_Color.PromptingColor1,
@@ -599,10 +654,10 @@
};
changeView.AddChidren(btnLine);
- btnChangeScene = new Button()
+ var btnChangeScene = new Button()
{
X = btnLine.Right,
- Width = Application.GetRealWidth(114-10),
+ Width = Application.GetRealWidth(114 - 10),
TextID = StringId.Scenes,
SelectedTextColor = CSS_Color.MainColor,
TextColor = CSS_Color.PromptingColor1,
@@ -610,30 +665,221 @@
TextAlignment = TextAlignment.Center,
};
changeView.AddChidren(btnChangeScene);
- #endregion
- #region ContextView
- contentView = new PageLayout()
+ Button btnLine2 = new Button()
{
- //Y = changeView.Bottom,
- Height = Application.GetRealHeight(310 + 30 + 10), //20涓鸿秴鍑洪儴鍒�
- IsShowPoint = false,
+ X = btnChangeScene.Right,
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth(1),
+ Height = Application.GetRealHeight(14),
+ BackgroundColor = CSS_Color.PromptingColor1,
};
- bodyView.AddChidren(contentView);
+ changeView.AddChidren(btnLine2);
- functionViews = new List<FrameLayout>();
+ var btnChangeGroupControl = new Button()
+ {
+ X = btnLine2.Right,
+ Width = Application.GetRealWidth(114 - 10),
+ TextID = StringId.GroupControl,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextAlignment = TextAlignment.Center,
+ };
+ changeView.AddChidren(btnChangeGroupControl);
- LoadContentView();
- #endregion
+
+ btnChangeGroupControl.MouseUpEventHandler = (sender, e) => {
+ btnChangeFunction.IsSelected = false;
+ btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeFunction.IsBold = false;
+ btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeScene.IsSelected = false;
+ btnChangeScene.IsBold = false;
+ btnChangeGroupControl.IsSelected = true;
+ btnChangeGroupControl.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
+ btnChangeGroupControl.IsBold = true;
+ CurShowTypeContent = 2;
+ contentView.PageIndex = 2;
+ };
+
+ btnChangeFunction.MouseUpEventHandler = (sender, e) => {
+ btnChangeFunction.IsSelected = true;
+ btnChangeFunction.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
+ btnChangeFunction.IsBold = true;
+ btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeScene.IsSelected = false;
+ btnChangeScene.IsBold = false;
+ CurShowTypeContent = 0;
+ contentView.PageIndex = 0;
+
+ btnChangeGroupControl.IsSelected = false;
+ btnChangeGroupControl.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeGroupControl.IsBold = false;
+ };
+ btnChangeScene.MouseUpEventHandler = (sender, e) => {
+ btnChangeScene.IsSelected = true;
+ btnChangeScene.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
+ btnChangeScene.IsBold = true;
+ btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeFunction.IsSelected = false;
+ btnChangeFunction.IsBold = false;
+ CurShowTypeContent = 1;
+ contentView.PageIndex = 1;
+
+ btnChangeGroupControl.IsSelected = false;
+ btnChangeGroupControl.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeGroupControl.IsBold = false;
+ };
+
+ contentView.PageChange = (sender, e) =>
+ {
+ if (contentView.PageIndex == 0)
+ {
+ btnChangeFunction.IsSelected = true;
+ btnChangeFunction.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
+ btnChangeFunction.IsBold = true;
+ btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeScene.IsSelected = false;
+ btnChangeScene.IsBold = false;
+ btnChangeGroupControl.IsSelected = false;
+ btnChangeGroupControl.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeGroupControl.IsBold = false;
+ }
+ else if (contentView.PageIndex == 1)
+ {
+ btnChangeScene.IsSelected = true;
+ btnChangeScene.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
+ btnChangeScene.IsBold = true;
+ btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeFunction.IsSelected = false;
+ btnChangeFunction.IsBold = false;
+ btnChangeGroupControl.IsSelected = false;
+ btnChangeGroupControl.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeGroupControl.IsBold = false;
+ }
+ else if (contentView.PageIndex == 2)
+ {
+ btnChangeFunction.IsSelected = false;
+ btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeFunction.IsBold = false;
+ btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeScene.IsSelected = false;
+ btnChangeScene.IsBold = false;
+ btnChangeGroupControl.IsSelected = true;
+ btnChangeGroupControl.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
+ btnChangeGroupControl.IsBold = true;
+ }
+ };
+
+
}
- catch (Exception ex)
+ else
{
- MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
+ var changeView = new FrameLayout()
+ {
+ //Y = Application.GetRealHeight(20) + topView.Bottom,
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(230),
+ Height = Application.GetRealHeight(62),
+ BackgroundImagePath = "Collection/ChangeViewbg.png",
+ };
+ changeBaseView.AddChidren(changeView);
+
+ var btnChangeFunction = new Button()
+ {
+ X = Application.GetRealWidth(10),
+ Width = Application.GetRealWidth(114 - 10),
+ TextID = StringId.Functions,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.HeadlineFontSize,
+ TextAlignment = TextAlignment.Center,
+ IsSelected = true,
+ IsBold = true,
+ };
+ changeView.AddChidren(btnChangeFunction);
+
+ Button btnLine = new Button()
+ {
+ X = btnChangeFunction.Right,
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth(1),
+ Height = Application.GetRealHeight(14),
+ BackgroundColor = CSS_Color.PromptingColor1,
+ };
+ changeView.AddChidren(btnLine);
+
+ var btnChangeScene = new Button()
+ {
+ X = btnLine.Right,
+ Width = Application.GetRealWidth(114 - 10),
+ TextID = StringId.Scenes,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextAlignment = TextAlignment.Center,
+ };
+ changeView.AddChidren(btnChangeScene);
+
+
+ btnChangeFunction.MouseUpEventHandler = (sender, e) =>
+ {
+
+ btnChangeFunction.IsSelected = true;
+ btnChangeFunction.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
+ btnChangeFunction.IsBold = true;
+ btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeScene.IsSelected = false;
+ btnChangeScene.IsBold = false;
+ CurShowTypeContent = 0;
+ contentView.PageIndex = 0;
+ };
+
+ btnChangeScene.MouseUpEventHandler = (sender, e) =>
+ {
+ btnChangeScene.IsSelected = true;
+ btnChangeScene.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
+ btnChangeScene.IsBold = true;
+ btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeFunction.IsSelected = false;
+ btnChangeFunction.IsBold = false;
+ CurShowTypeContent = 1;
+ contentView.PageIndex = 1;
+ };
+
+ contentView.PageChange = (sender, e) =>
+ {
+ if (contentView.PageIndex == 0)
+ {
+ btnChangeFunction.IsSelected = true;
+ btnChangeFunction.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
+ btnChangeFunction.IsBold = true;
+ btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeScene.IsSelected = false;
+ btnChangeScene.IsBold = false;
+ }
+ else if (contentView.PageIndex == 1)
+ {
+ btnChangeScene.IsSelected = true;
+ btnChangeScene.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
+ btnChangeScene.IsBold = true;
+ btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
+ btnChangeFunction.IsSelected = false;
+ btnChangeFunction.IsBold = false;
+ }
+ };
+
+
+
}
+
+ contentView.PageIndex = CurShowTypeContent;
}
+
/// <summary>
/// 鍔犺浇鍐呭鍖哄煙
/// </summary>
@@ -658,8 +904,10 @@
{
if (contentView == null)
{
+ waitPage.Hide();
return;
}
+ loadNavView();
contentView.RemoveAll();
deviceFunctionView = new VerticalScrolViewLayout();
contentView.AddChidren(deviceFunctionView);
@@ -667,12 +915,11 @@
sceneFunctionView = new VerticalScrolViewLayout();
contentView.AddChidren(sceneFunctionView);
LoadSceneFunctionControlZone();
- if (CurShowTypeIsFunction)
+ if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
{
- contentView.PageIndex = 0;
- }else
- {
- contentView.PageIndex = 1;
+ gcFunctionView = new VerticalScrolViewLayout();
+ contentView.AddChidren(gcFunctionView);
+ LoadGroupControlFunctionControlZone();
}
LoadEvent_ChangeShowedFunctionType();
@@ -681,6 +928,7 @@
GetUnreadPushMessages();
RegisterGetPushMessageAction();
+ contentView.PageIndex = CurShowTypeContent;
if (waitPage != null)
{
waitPage.RemoveFromParent();
@@ -704,15 +952,13 @@
sceneFunctionView = new VerticalScrolViewLayout();
contentView.AddChidren(sceneFunctionView);
LoadSceneFunctionControlZone();
-
- if (CurShowTypeIsFunction)
+ if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
{
- contentView.PageIndex = 0;
+ gcFunctionView = new VerticalScrolViewLayout();
+ contentView.AddChidren(gcFunctionView);
+ LoadGroupControlFunctionControlZone();
}
- else
- {
- contentView.PageIndex = 1;
- }
+ contentView.PageIndex = CurShowTypeContent;
LoadEvent_ChangeShowedFunctionType();
@@ -730,7 +976,7 @@
/// </summary>
void LoadDeviceFunctionControlZone()
{
-#region ContextView
+ #region ContextView
deviceFunctionView.RemoveAll();
functionViews.Clear();
var rowView = new FrameLayout();
@@ -739,15 +985,15 @@
int index = 0;
var list = new List<Function>();
list.AddRange(FunctionList.List.GetDeviceFunctionList());
- list.AddRange(FunctionList.List.groupControls);//鍔犲叆缇ゆ帶
+ //list.AddRange(FunctionList.List.groupControls);//鍔犲叆缇ゆ帶
foreach (var function in list)
{
//闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
- if (SPK.MusicSpkList().Contains( function.spk))
- {
- continue;
- }
- else
+ //if (SPK.MusicSpkList().Contains( function.spk))
+ //{
+ // continue;
+ //}
+ //else
{
if (!function.collect)
continue;
@@ -832,9 +1078,95 @@
MainPage.Log("homepage error : " + ex.Message);
}
deviceFunctionView.AddChidren(new Button { Height = Application.GetRealHeight(30) });
-#endregion
-
+ #endregion
}
+
+
+ /// <summary>
+ /// 鍔犺浇缇ゆ帶鍔熻兘鏄剧ず鍖哄煙
+ /// </summary>
+ void LoadGroupControlFunctionControlZone()
+ {
+
+ #region ContextView
+ gcFunctionView.RemoveAll();
+ functionViews.Clear();
+ var rowView = new FrameLayout();
+ try
+ {
+ int index = 0;
+ foreach (var function in FunctionList.List.groupControls)
+ {
+ if (index % 2 == 0)
+ {
+ rowView = new FrameLayout()
+ {
+ Height = Application.GetRealWidth(140),
+ };
+ gcFunctionView.AddChidren(rowView);
+ }
+ var functionView_X = Application.GetRealWidth((182 + 7) * (index % 2));
+ if (index % 2 == 0)
+ {
+ functionView_X += Application.GetRealWidth(7);
+ }
+ var functionView = new FrameLayout()
+ {
+ X = functionView_X,
+ Width = Application.GetRealWidth(182),
+ Height = Application.GetRealWidth(140),
+ Radius = (uint)Application.GetRealWidth(12),
+ Tag = function.sid
+ };
+ rowView.AddChidren(functionView);
+ functionViews.Add(functionView);
+ var btnbg = new Button()
+ {
+ UnSelectedImagePath = "Collection/Functionbg.png",
+ SelectedImagePath = "Collection/FunctionOnbg.png",
+ Tag = function.sid
+ };
+ functionView.AddChidren(btnbg);
+ LoadDeviceFunctionDiv(functionView, function);
+
+ index++;
+ }
+
+ if (index == 0)
+ {
+ var view = new FrameLayout();
+ gcFunctionView.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)
+ {
+ MainPage.Log("homepage error : " + ex.Message);
+ }
+ gcFunctionView.AddChidren(new Button { Height = Application.GetRealHeight(30) });
+ #endregion
+ }
+
/// <summary>
/// 鍔犺浇鍦烘櫙鍔熻兘鏄剧ず鍖哄煙
/// </summary>
@@ -1060,7 +1392,8 @@
SelectedImagePath = "Collection/CollectionWhiteIcon.png",
UnSelectedImagePath = "Collection/CollectionIcon.png",
};
- view.AddChidren(btnCollection);
+ if (function.spk != SPK.GroupControl)//缇ゆ帶榛樿鏄剧ず
+ view.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
//if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
//{
@@ -1122,7 +1455,7 @@
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
- btnCollection.Visible = false;
+ //btnCollection.Visible = false;
Button btnPower;
btnPower = new Button()
{
@@ -1269,7 +1602,7 @@
btnName.MouseUpEventHandler = skipControlPageEvent;
btnIcon.MouseUpEventHandler = skipControlPageEvent;
btnState.MouseUpEventHandler = skipControlPageEvent;
- //涓嶉渶瑕佹洿鏂扮姸鎬佺殑鍔ㄨ兘鍒楄〃
+ //涓嶉渶瑕佹洿鏂扮姸鎬佺殑鍔熻兘鍒楄〃
if(!SPK.NotStatusSpkList.Contains(function.spk) || function.spk != SPK.IpCam_Imou)
{
UpdataFunctionStates(function);
--
Gitblit v1.8.0