From 312f9ece8d4a46d8989187730fc7f5c7fc36cfb5 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 12 七月 2024 15:20:52 +0800
Subject: [PATCH] Update SplashActivity.cs
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | 166 ++++++++++++++++++++++++-------------------------------
1 files changed, 73 insertions(+), 93 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index b1ac002..95e5906 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -29,18 +29,6 @@
/// 浣嶇疆淇℃伅璺宠浆缂栬緫鎸夐挳
/// </summary>
Button btnLocationInfoRight;
- /// <summary>
- /// 鍒犻櫎璁惧
- /// </summary>
- Button delTextBtn;
- /// <summary>
- /// 涓嬩竴绾у浘鏍�
- /// </summary>
- Button delRightBtn;
- /// <summary>
- /// 鍒犻櫎璁惧琛孎rameLayout
- /// </summary>
- FrameLayout delView;
#endregion
@@ -54,15 +42,14 @@
/// <summary>
/// 瑙ｇ粦璁惧鍥炶皟
/// </summary>
- Action actionDel;
+ public Action actionDel;
#endregion
- public FunctionBaseInfoSetPage(Function func, Action action,Action actionDel=null)
+ public FunctionBaseInfoSetPage(Function func, Action action)
{
bodyView = this;
function = func;
actionRefresh = action;
- this.actionDel = actionDel;
}
public override void RemoveFromParent()
@@ -84,11 +71,14 @@
public void LoadPage(bool locationSetting = true)
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.Setting)).LoadTopView(actionRefresh);
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Setting));
+ topView.maginY = 10;
+ topView.LoadTopView();
+
var contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(600),
ScrollEnabled = false,
};
@@ -198,7 +188,7 @@
#endregion
}
#region 鍏变韩
-
+
//var sharedView = new FrameLayout()
//{
// Height = Application.GetRealHeight(55),
@@ -237,82 +227,7 @@
// });
#endregion
- #region 鍒犻櫎璁惧琛�
- delView = new FrameLayout()
- {
- Height = Application.GetRealHeight(55),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- if (this.function.spk == SPK.VideoDoorLock)
- {
- contentView.AddChidren(delView);
- }
- var lineBtn = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- BackgroundColor = CSS_Color.DividingLineColor,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(1)
- };
- delView.AddChidren(lineBtn);
- delTextBtn = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(160),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.DeleteDevice,
- };
- delView.AddChidren(delTextBtn);
-
- delRightBtn= new Button()
- {
- X = Application.GetRealWidth(339),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/RightIcon.png",
- };
- delView.AddChidren(delRightBtn);
-
-
-
-
- #endregion
-#if stage2
- #region 娣诲姞鍒版闈�
- var addToDesktopView = new FrameLayout()
- {
- Height = Application.GetRealHeight(55),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- contentView.AddChidren(addToDesktopView);
-
- var btnAddToDesktopText = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(160),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.AddToDesktop,
- };
- addToDesktopView.AddChidren(btnAddToDesktopText);
-
- var btnAddToDesktopRight = new Button()
- {
- X = Application.GetRealWidth(339),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/RightIcon.png",
- };
- addToDesktopView.AddChidren(btnAddToDesktopRight);
-
- #endregion
-#endif
if (function.spk == SPK.ElectricEnergy)
{
@@ -885,6 +800,71 @@
}
+ //else if(function.spk == SPK.LightRGB)
+ //{
+ // contentView.AddChidren(new Button
+ // {
+ // Height = Application.GetRealHeight(8),
+ // });
+
+ // var list = FunctionList.List.GetSeries();
+ // foreach (var temp in list)
+ // {
+
+ // #region
+ // var viewRow0 = new FrameLayout()
+ // {
+ // Height = Application.GetRealHeight(55),
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ // };
+ // contentView.AddChidren(viewRow0);
+
+
+ // var btnRowTitle0 = new Button()
+ // {
+ // X = Application.GetRealWidth(16),
+ // Width = Application.GetRealWidth(160),
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.SubheadingFontSize,
+ // Text = temp.name,
+ // };
+ // viewRow0.AddChidren(btnRowTitle0);
+
+ // var btnSwtichIcon0 = new Button()
+ // {
+ // X = Application.GetRealWidth(322),
+ // Gravity = Gravity.CenterVertical,
+ // Width = Application.GetMinRealAverage(36),
+ // Height = Application.GetMinRealAverage(36),
+ // UnSelectedImagePath = "Public/Switch_2.png",
+ // SelectedImagePath = "Public/SwitchOn_2.png",
+ // };
+ // viewRow0.AddChidren(btnSwtichIcon0);
+
+ // DeviceMessageRules deviceMessageRules = new DeviceMessageRules()
+ // {
+ // deviceId = function.deviceId
+ // };
+
+ // btnSwtichIcon0.MouseUpEventHandler = (sender, e) =>
+ // {
+
+ // };
+
+ // viewRow0.AddChidren(new Button()
+ // {
+ // Gravity = Gravity.CenterHorizontal,
+ // Y = Application.GetRealHeight(54),
+ // BackgroundColor = CSS_Color.DividingLineColor,
+ // Width = Application.GetRealWidth(343),
+ // Height = Application.GetRealHeight(1)
+ // });
+ // #endregion
+ // }
+
+ //}
+
LoadEventList();
}
--
Gitblit v1.8.0