From 505effa88b17ce8c3c7ac5403b76d9e5d0cfc2a5 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 28 十月 2024 11:58:31 +0800
Subject: [PATCH] 谷歌版本问题修复
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | 431 -----------------------------------------------------
1 files changed, 3 insertions(+), 428 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index dc884e4..6b0e73f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -4,7 +4,6 @@
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;
@@ -53,12 +52,6 @@
actionRefresh = action;
}
- public FunctionBaseInfoSetPage()
- {
- bodyView = this;
-
- }
-
public override void RemoveFromParent()
{
new System.Threading.Thread(() =>
@@ -90,10 +83,10 @@
ScrollEnabled = false,
};
bodyView.AddChidren(contentView);
- //鍙瀵硅
- if(function == null)
- {
+ //鍙瀵硅
+ if (function.spk == SPK.LinphoneXiMo)
+ {
var linphoneConnectView = new FrameLayout()
{
Height = Application.GetRealHeight(55),
@@ -252,8 +245,6 @@
}
-
-
#region name view
var nameView = new FrameLayout()
{
@@ -357,422 +348,6 @@
});
#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),
- // Width = Application.GetRealWidth(160),
- // TextAlignment = TextAlignment.CenterLeft,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // TextSize = CSS_FontSize.SubheadingFontSize,
- // TextID = StringId.Shared,
- //};
- //sharedView.AddChidren(btnSharedText);
-
- //var btnSharedRight = new Button()
- //{
- // X = Application.GetRealWidth(339),
- // Gravity = Gravity.CenterVertical,
- // Width = Application.GetMinRealAverage(16),
- // Height = Application.GetMinRealAverage(16),
- // UnSelectedImagePath = "Public/RightIcon.png",
- //};
- //sharedView.AddChidren(btnSharedRight);
-
- //sharedView.AddChidren(
- // new Button()
- // {
- // Gravity = Gravity.CenterHorizontal,
- // Y = Application.GetRealHeight(54),
- // BackgroundColor = CSS_Color.DividingLineColor,
- // Width = Application.GetRealWidth(343),
- // Height = Application.GetRealHeight(1)
- // });
- #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)
- {
- contentView.AddChidren(new Button()
- {
- Height = Application.GetRealWidth(8),
- });
-
- #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.jiebangshebei,
- Radius = (uint)Application.GetRealWidth(22),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- //濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
- {
- contentView.AddChidren(delTextBtn);
- }
-
-
- EventHandler<MouseEventArgs> ClickEvent = (sener, e) =>
- {
-
- 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(() =>
- {
- 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
-#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)
{
--
Gitblit v1.8.0