From 452e8cef1c740d18ee398be6971d9952e41dbd4a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 四月 2023 16:11:50 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 155 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index 9377363..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)
@@ -49,7 +66,14 @@
public override void RemoveFromParent()
{
- actionRefresh?.Invoke();
+ new System.Threading.Thread(() =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ actionRefresh?.Invoke();
+ });
+ })
+ { IsBackground = true }.Start();
base.RemoveFromParent();
}
@@ -59,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()
{
@@ -173,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),
@@ -212,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()
@@ -497,7 +644,7 @@
btnTempCcValue.MouseUpEventHandler = (sender, e) =>
{
- LoadEditDialog(-5, 5, Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.room_humidity_cc)), (reslut) =>
+ LoadEditDialog(-10, 10, Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.room_humidity_cc)), (reslut) =>
{
btnTempCcValue.Text = reslut + "掳C";
Dictionary<string, string> dic = new Dictionary<string, string>();
@@ -558,7 +705,7 @@
btnHumidityCcValue.MouseUpEventHandler = (sender, e) =>
{
- LoadEditDialog(-10, 10, Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.room_humidity_cc)), (reslut) =>
+ LoadEditDialog(-20, 20, Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.room_humidity_cc)), (reslut) =>
{
btnHumidityCcValue.Text = reslut + "%";
Dictionary<string, string> dic = new Dictionary<string, string>();
@@ -603,7 +750,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = function.GetAttrState(FunctionAttributeKey.cac_valve) + "掳C",
+ TextID = function.GetAttrState(FunctionAttributeKey.cac_valve) == "on"? StringId.On:StringId.OFF,
};
cacValveRow.AddChidren(btnCacValvaValue);
}
@@ -641,7 +788,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = function.GetAttrState(FunctionAttributeKey.fh_valve),
+ TextID = function.GetAttrState(FunctionAttributeKey.fh_valve) == "on"? StringId.On:StringId.OFF,
};
fhValveRow.AddChidren(btnFhValvaValue);
}
@@ -651,7 +798,7 @@
}
- else if(function.spk == SPK.SenesorMegahealth)
+ else if(function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
{
contentView.AddChidren(new Button
{
@@ -701,14 +848,7 @@
{
if (result != null && result.Code == StateCode.SUCCESS)
{
- if (result.Data.ToString() == "true")
- {
deviceMessageRules.push = push;
- }
- else
- {
- btnSwtichIcon0.IsSelected = deviceMessageRules.push;
- }
}
else
{
--
Gitblit v1.8.0