From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 167 +++++++++++++++++++++++++++----------------------------
1 files changed, 82 insertions(+), 85 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 2c0a039..fa1c927 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -84,7 +84,6 @@
/// 鍖哄煙鎴愬憳灏忓尯鍩熸枃鏈�
/// </summary>
Button btnResidenceMemberText;
- #region F3闃舵
/// <summary>
/// 鍖哄煙瀹夋斁灏忓尯鍩�
/// </summary>
@@ -121,9 +120,7 @@
/// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熸枃鏈�
/// </summary>
Button btnResidenceAddFunctionText;
- #endregion
- #region F3闃舵
///// <summary>
///// 杞欢璁剧疆鍖哄煙
///// </summary>
@@ -141,10 +138,10 @@
/// 鑾峰彇鏀寔灏忓尯鍩�
/// </summary>
VerticalScrolViewLayout supportView;
- /// <summary>
- /// 鑾峰彇鏀寔鏂囨湰
- /// </summary>
- Button btnSupportText;
+ ///// <summary>
+ ///// 鑾峰彇鏀寔鏂囨湰
+ ///// </summary>
+ //Button btnSupportText;
/// <summary>
/// 鍏充簬On鏂囨湰
@@ -155,7 +152,6 @@
/// </summary>
Button btnSmartSpeakerText;
- #endregion
public PersonalCenterPage()
{
@@ -254,11 +250,11 @@
};
if(Language.CurrentLanguage =="Chinese")
{
- btnExit.Text = "閫�鍑轰綋楠屾ā寮�";
+ btnExit.Text = "閫�鍑�";
}
else
{
- btnExit.Text = "Exit dome";
+ btnExit.Text = "Exit";
}
btnExit.MouseUpEventHandler = (sender, e) =>
{
@@ -478,7 +474,6 @@
residenceArmView.AddChidren(btnResidenceArmText);
#endregion
}
- #region F3闃舵
#region ---鏁版嵁澶囦唤鍖哄煙
//residenceDataBackupView = new FrameLayout()
@@ -541,37 +536,39 @@
//residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText);
#endregion
- #region ---娣诲姞鍔熻兘鍖哄煙
- residenceAddFunctionView = new FrameLayout()
+ if (DB_ResidenceData.Instance.GatewayType == 1)
{
- //X = residenceMemberView.Right,
- X = Application.GetRealWidth(28 - 24),
- Y = residenceManageView.Bottom,
- Width = Application.GetRealWidth(64 + 48),
- Height = Application.GetRealWidth(64),
- };
- residenceInfoView.AddChidren(residenceAddFunctionView);
- btnResidenceAddFunctionIcon = new Button
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(5),
- Width = Application.GetMinRealAverage(30),
- Height = Application.GetMinRealAverage(30),
- UnSelectedImagePath = "PersonalCenter/AddFunctionIcon.png",
- };
- residenceAddFunctionView.AddChidren(btnResidenceAddFunctionIcon);
- btnResidenceAddFunctionText = new Button()
- {
- Y = btnResidenceManageIcon.Bottom,
- Height = Application.GetRealHeight(29),
- TextID = StringId.AddFunction,
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel
- };
- residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
- #endregion
- #endregion
+ #region ---娣诲姞鍔熻兘鍖哄煙
+ residenceAddFunctionView = new FrameLayout()
+ {
+ //X = residenceMemberView.Right,
+ X = Application.GetRealWidth(28 - 24),
+ Y = residenceManageView.Bottom,
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealWidth(64),
+ };
+ residenceInfoView.AddChidren(residenceAddFunctionView);
+ btnResidenceAddFunctionIcon = new Button
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(5),
+ Width = Application.GetMinRealAverage(30),
+ Height = Application.GetMinRealAverage(30),
+ UnSelectedImagePath = "PersonalCenter/AddFunctionIcon.png",
+ };
+ residenceAddFunctionView.AddChidren(btnResidenceAddFunctionIcon);
+ btnResidenceAddFunctionText = new Button()
+ {
+ Y = btnResidenceManageIcon.Bottom,
+ Height = Application.GetRealHeight(29),
+ TextID = StringId.AddFunction,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ };
+ residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
+ #endregion
+ }
}
else
{
@@ -798,7 +795,7 @@
if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
//supportView 鍔犻珮 鏄剧ず3琛� 3*44
- supportView.Height = Application.GetRealWidth(3*44);
+ supportView.Height = Application.GetRealWidth(2*44);
FrameLayout smartSpeakerView = new FrameLayout()
{
@@ -853,53 +850,53 @@
#endregion
#region 鑾峰彇鏀寔
- FrameLayout supView = new FrameLayout()
- {
- Height = Application.GetRealWidth(44),
- };
- supportView.AddChidren(supView);
+ //FrameLayout supView = new FrameLayout()
+ //{
+ // Height = Application.GetRealWidth(44),
+ //};
+ //supportView.AddChidren(supView);
- Button btnSupportIcon = new Button()
- {
- X = Application.GetRealWidth(12),
- Y = Application.GetRealWidth(10),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
- UnSelectedImagePath = "PersonalCenter/SupportIcon.png",
- };
- supView.AddChidren(btnSupportIcon);
+ //Button btnSupportIcon = new Button()
+ //{
+ // X = Application.GetRealWidth(12),
+ // Y = Application.GetRealWidth(10),
+ // Width = Application.GetMinRealAverage(24),
+ // Height = Application.GetMinRealAverage(24),
+ // UnSelectedImagePath = "PersonalCenter/SupportIcon.png",
+ //};
+ //supView.AddChidren(btnSupportIcon);
- btnSupportText = new Button()
- {
- X = Application.GetRealWidth(48),
- Width = Application.GetRealWidth(270),
- Height = Application.GetRealWidth(44),
- TextID = StringId.GetSupport,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = CSS_FontSize.TextFontSize
- };
- supView.AddChidren(btnSupportText);
+ //btnSupportText = new Button()
+ //{
+ // X = Application.GetRealWidth(48),
+ // Width = Application.GetRealWidth(270),
+ // Height = Application.GetRealWidth(44),
+ // TextID = StringId.GetSupport,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextSize = CSS_FontSize.TextFontSize
+ //};
+ //supView.AddChidren(btnSupportText);
- Button btnSupportRight = new Button()
- {
- X = Application.GetRealWidth(315),
- Y = Application.GetRealWidth(14),
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
- supView.AddChidren(btnSupportRight);
+ //Button btnSupportRight = new Button()
+ //{
+ // X = Application.GetRealWidth(315),
+ // Y = Application.GetRealWidth(14),
+ // Width = Application.GetMinRealAverage(16),
+ // Height = Application.GetMinRealAverage(16),
+ // UnSelectedImagePath = "Public/Right.png",
+ //};
+ //supView.AddChidren(btnSupportRight);
- var btnSupportViewLine = new Button()
- {
- X = Application.GetRealWidth(48),
- Y = Application.GetRealWidth(43),
- Height = Application.GetRealHeight(1),
- Width = Application.GetRealWidth(279),
- BackgroundColor = CSS_Color.DividingLineColor
- };
- supView.AddChidren(btnSupportViewLine);
+ //var btnSupportViewLine = new Button()
+ //{
+ // X = Application.GetRealWidth(48),
+ // Y = Application.GetRealWidth(43),
+ // Height = Application.GetRealHeight(1),
+ // Width = Application.GetRealWidth(279),
+ // BackgroundColor = CSS_Color.DividingLineColor
+ //};
+ //supView.AddChidren(btnSupportViewLine);
#endregion
#region 鍏充簬ON+
--
Gitblit v1.8.0