From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | 146 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 143 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index 4f31eee..90902b3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -29,6 +29,18 @@
/// 浣嶇疆淇℃伅璺宠浆缂栬緫鎸夐挳
/// </summary>
Button btnLocationInfoRight;
+ /// <summary>
+ /// 鍒犻櫎璁惧
+ /// </summary>
+ Button delTextBtn;
+ /// <summary>
+ /// 涓嬩竴绾у浘鏍�
+ /// </summary>
+ Button delRightBtn;
+ /// <summary>
+ /// 鍒犻櫎璁惧琛孎rameLayout
+ /// </summary>
+ FrameLayout delView;
#endregion
@@ -38,6 +50,11 @@
/// 鍚庨��鏃讹紝鍒锋柊涔嬪墠鐣岄潰鐨勬樉绀轰俊鎭�
/// </summary>
Action actionRefresh;
+
+ /// <summary>
+ /// 瑙ｇ粦璁惧鍥炶皟
+ /// </summary>
+ public Action actionDel;
#endregion
public FunctionBaseInfoSetPage(Function func, Action action)
@@ -66,7 +83,7 @@
public void LoadPage(bool locationSetting = true)
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.Setting)).LoadTopView(actionRefresh);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Setting)).LoadTopView();
var contentView = new VerticalScrolViewLayout()
{
@@ -180,13 +197,13 @@
#endregion
}
#region 鍏变韩
+
//var sharedView = new FrameLayout()
//{
// Height = Application.GetRealHeight(55),
// BackgroundColor = CSS_Color.MainBackgroundColor,
//};
//contentView.AddChidren(sharedView);
-
//var btnSharedText = new Button()
//{
// X = Application.GetRealWidth(16),
@@ -219,6 +236,129 @@
// });
#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);
+
+ //搴忓垪鍙�
+ var serialView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(55),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ if (this.function.spk == SPK.VideoDoorLock)
+ {
+ contentView.AddChidren(serialView);
+ }
+ var serialLineBtn = new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ BackgroundColor = CSS_Color.DividingLineColor,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(1)
+ };
+ serialView.AddChidren(serialLineBtn);
+ var serialTextBtn = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(160),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextID = StringId.xuliehao,
+ };
+ serialView.AddChidren(serialTextBtn);
+ var serialValuesBtn = new Button()
+ {
+ X = Application.GetRealWidth(86),
+ Width = Application.GetRealWidth(237),
+ TextAlignment = TextAlignment.CenterRight,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.TextFontSize,
+ Text = this.function.sid,
+ };
+ serialView.AddChidren(serialValuesBtn);
+
+
+
+ //鍨嬪彿
+ var modelView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(55),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ if (this.function.spk == SPK.VideoDoorLock)
+ {
+ contentView.AddChidren(modelView);
+ }
+ var modelLineBtn = new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ BackgroundColor = CSS_Color.DividingLineColor,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(1)
+ };
+ modelView.AddChidren(modelLineBtn);
+ var modelTextBtn = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(160),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextID=StringId.xinghao,
+ };
+ modelView.AddChidren(modelTextBtn);
+ var modelValuesBtn = new Button()
+ {
+ X = Application.GetRealWidth(86),
+ Width = Application.GetRealWidth(237),
+ TextAlignment = TextAlignment.CenterRight,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.TextFontSize,
+ Text = this.function.omodel,
+ };
+ modelView.AddChidren(modelValuesBtn);
+
+
+ #endregion
#if stage2
#region 娣诲姞鍒版闈�
var addToDesktopView = new FrameLayout()
@@ -658,7 +798,7 @@
}
- else if(function.spk == SPK.SenesorMegahealth)
+ else if(function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
{
contentView.AddChidren(new Button
{
--
Gitblit v1.8.0