From f60b17fa18701c2cee017a5117e96510f54b44cf Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 02 十二月 2024 16:05:44 +0800
Subject: [PATCH] 更新功能
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | 352 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 330 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index 9f0989a..37a6f5a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -4,6 +4,7 @@
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Newtonsoft.Json.Linq;
using Shared;
@@ -78,7 +79,7 @@
var contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64+10),
+ Y = Application.GetRealHeight(64 + 10),
Height = Application.GetRealHeight(600),
ScrollEnabled = false,
};
@@ -227,6 +228,281 @@
// });
#endregion
+ #region 鍒犻櫎璁惧琛� 搴忓垪鍙� 鍨嬪彿
+ if (this.function.spk == SPK.VideoDoorLock)
+ {
+ contentView.AddChidren(new Button()
+ {
+ Height = Application.GetRealWidth(8),
+ });
+
+ #region 寮�閿佽缃�
+ var unlockSettingView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(55),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ contentView.AddChidren(unlockSettingView);
+
+ //unlockSettingView.AddChidren(new Button
+ //{
+ // Gravity = Gravity.CenterHorizontal,
+ // BackgroundColor = CSS_Color.DividingLineColor,
+ // Width = Application.GetRealWidth(343),
+ // Height = Application.GetRealHeight(1)
+ //});
+
+ var unlockRightBtn = new Button()
+ {
+ X = Application.GetRealWidth(339),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/RightIcon.png",
+ };
+ unlockSettingView.AddChidren(unlockRightBtn);
+
+ var btnUnlockText = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextID = StringId.UnlockSetting,
+ };
+ unlockSettingView.AddChidren(btnUnlockText);
+
+ EventHandler<MouseEventArgs> unlockSettingEvent = (sender, e) =>
+ {
+ var page = new UnlockSettingPage(function);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ btnUnlockText.MouseUpEventHandler = unlockSettingEvent;
+ #endregion
+
+ #region 闊抽璁剧疆
+ var audioSetupView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(55),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ contentView.AddChidren(audioSetupView);
+
+ audioSetupView.AddChidren(new Button
+ {
+ Gravity = Gravity.CenterHorizontal,
+ BackgroundColor = CSS_Color.DividingLineColor,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(1)
+ });
+
+ var btnAudioSetupRight = new Button()
+ {
+ X = Application.GetRealWidth(339),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/RightIcon.png",
+ };
+ audioSetupView.AddChidren(btnAudioSetupRight);
+
+ var btnAudioSetupText = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextID = StringId.AudioSetup,
+ };
+ audioSetupView.AddChidren(btnAudioSetupText);
+ btnAudioSetupText.MouseUpEventHandler = (sender, e) => {
+ var page = new VideoDoorlockAudioSetupPage(function);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
+ };
+ #endregion
+
+ #region 鐢垫睜绠＄悊
+ var batteryManagementView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(55),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ contentView.AddChidren(batteryManagementView);
+
+ batteryManagementView.AddChidren(new Button
+ {
+ Gravity = Gravity.CenterHorizontal,
+ BackgroundColor = CSS_Color.DividingLineColor,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(1)
+ });
+
+ var btnBatteryManagementRight = new Button()
+ {
+ X = Application.GetRealWidth(339),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/RightIcon.png",
+ };
+ batteryManagementView.AddChidren(btnBatteryManagementRight);
+
+ var btnBatteryManagementText = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextID = StringId.BatteryManagement,
+ };
+ batteryManagementView.AddChidren(btnBatteryManagementText);
+ btnBatteryManagementText.MouseUpEventHandler = (sender, e) => {
+ var page = new VideoDoorlockBatteryManagementPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+
+
+ #endregion
+
+ #region 搴忓垪鍙�
+ var serialView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(55),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ 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(106),
+ Width = Application.GetRealWidth(237),
+ TextAlignment = TextAlignment.CenterRight,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.TextFontSize,
+ Text = this.function.sid,
+ };
+ serialView.AddChidren(serialValuesBtn);
+ #endregion
+
+ #region 鍨嬪彿
+ var modelView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(55),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ 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(106),
+ Width = Application.GetRealWidth(237),
+ TextAlignment = TextAlignment.CenterRight,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.TextFontSize,
+ Text = this.function.omodel,
+ };
+ modelView.AddChidren(modelValuesBtn);
+ #endregion
+
+ #region 鍒犻櫎璁惧琛�
+ contentView.AddChidren(new Button()
+ {
+ Height = Application.GetRealHeight(48),
+ });
+
+ var delTextBtn = new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(220),
+ Height = Application.GetRealWidth(44),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.WarningColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextID = StringId.DeleteDevice,
+ Radius = (uint)Application.GetRealWidth(22),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ contentView.AddChidren(delTextBtn);
+
+ EventHandler<MouseEventArgs> ClickEvent = (sener, e) =>
+ {
+
+ new HDL_ON.UI.Music.View.TipView().TipBox(-1, StringId.AreYouSureToDeleteThisDevice, () =>
+ {
+ UI2.FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.DelDevice(this.function, (isBool) =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (!isBool)
+ {
+ new Tip()
+ {
+ CloseTime = 1,
+ Text = Language.StringByID(StringId.delFail),
+ Direction = AMPopTipDirection.None,
+ }.Show(bodyView);
+ return;
+ }
+ //鍒犻櫎鏈湴鏂囦欢
+ UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DeleteFunction(this.function);
+ this.RemoveFromParent();
+ this.actionDel?.Invoke();
+ });
+
+ });
+
+ });
+ };
+ delTextBtn.MouseUpEventHandler = ClickEvent;
+
+ #endregion
+
+
+ }
+ #endregion
#region 鍒犻櫎娴蜂俊鐢佃璁惧
if (this.function.spk == SPK.ElectricalTvHisense)
@@ -267,26 +543,26 @@
new HDL_ON.UI.Music.View.TipView().TipBox(-1, StringId.AreYouSureToDeleteThisDevice, () =>
{
HDL_ON.UI.UI2.FuntionControlView.HisenseTV.Send.Current.DelDevice(this.function.deviceId, (isBool) =>
+ {
+ Application.RunOnMainThread(() =>
{
- Application.RunOnMainThread(() =>
+ if (!isBool)
{
- if (!isBool)
+ new Tip()
{
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.delFail),
- Direction = AMPopTipDirection.None,
- }.Show(bodyView);
- return;
- }
+ CloseTime = 1,
+ Text = Language.StringByID(StringId.delFail),
+ Direction = AMPopTipDirection.None,
+ }.Show(bodyView);
+ return;
+ }
//鍒犻櫎鏈湴鏂囦欢
- FunctionList.List.DeleteFunction(this.function);
- this.RemoveFromParent();
- this.actionDel?.Invoke();
- });
-
+ UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DeleteFunction(this.function);
+ this.RemoveFromParent();
+ this.actionDel?.Invoke();
});
+
+ });
});
};
@@ -297,6 +573,38 @@
}
#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)
{
@@ -656,7 +964,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- TextID = function.GetAttrState(FunctionAttributeKey.cac_valve) == "on"? StringId.On:StringId.OFF,
+ TextID = function.GetAttrState(FunctionAttributeKey.cac_valve) == "on" ? StringId.On : StringId.OFF,
};
cacValveRow.AddChidren(btnCacValvaValue);
}
@@ -694,7 +1002,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- TextID = function.GetAttrState(FunctionAttributeKey.fh_valve) == "on"? StringId.On:StringId.OFF,
+ TextID = function.GetAttrState(FunctionAttributeKey.fh_valve) == "on" ? StringId.On : StringId.OFF,
};
fhValveRow.AddChidren(btnFhValvaValue);
}
@@ -704,7 +1012,7 @@
}
- else if(function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
+ else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
{
contentView.AddChidren(new Button
{
@@ -754,7 +1062,7 @@
{
if (result != null && result.Code == StateCode.SUCCESS)
{
- deviceMessageRules.push = push;
+ deviceMessageRules.push = push;
}
else
{
@@ -847,7 +1155,7 @@
{
if (result != null && result.Code == StateCode.SUCCESS)
{
- if (Convert.ToBoolean( result.Data ))
+ if (Convert.ToBoolean(result.Data))
{
function.extSet.labModel = btnSwtichIcon.IsSelected;
}
@@ -942,7 +1250,7 @@
/// <summary>
/// 鍔犺浇閫夋嫨寮圭獥
/// </summary>
- void LoadEditDialog(int min ,int max,int curValue,Action<string> action)
+ void LoadEditDialog(int min, int max, int curValue, Action<string> action)
{
List<string> pickerItems = new List<string>();
--
Gitblit v1.8.0