From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 15 三月 2021 14:55:49 +0800 Subject: [PATCH] 合并前上传一个版本 --- HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs index 862e5fc..7305feb 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs @@ -245,21 +245,21 @@ contentView.RemoveAll(); #region 浣忓畢淇℃伅鍖哄煙 - if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare) - { - residenceInfoView = new FrameLayout() - { - Gravity = Gravity.CenterHorizontal, - Width = Application.GetRealWidth(343), - Height = Application.GetRealHeight(213), - BackgroundColor = CSS_Color.MainBackgroundColor, - Radius = (uint)Application.GetRealHeight(12), - BorderColor = 0x00FFFFFF, - BorderWidth = 0, - }; - contentView.AddChidren(residenceInfoView); - } - else + //if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare) + //{ + // residenceInfoView = new FrameLayout() + // { + // Gravity = Gravity.CenterHorizontal, + // Width = Application.GetRealWidth(343), + // Height = Application.GetRealHeight(213), + // BackgroundColor = CSS_Color.MainBackgroundColor, + // Radius = (uint)Application.GetRealHeight(12), + // BorderColor = 0x00FFFFFF, + // BorderWidth = 0, + // }; + // contentView.AddChidren(residenceInfoView); + //} + //else { residenceInfoView = new FrameLayout() { @@ -337,9 +337,14 @@ == false ? StringId.Administrators : StringId.Member }; userTypeView.AddChidren(btnUserTypeName); + btnUserTypeIcon.MouseUpEventHandler += (sender, e) => + { + var form = new AddThirdPartyDeviceMenuListPage(); + form.AddForm("Evoyo"); + }; #endregion #region 浣忓畢绠$悊 - + if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare) { #region ---浣忓畢绠$悊鍖哄煙 @@ -504,7 +509,7 @@ Width = Application.GetRealWidth(64 + 48), Height = Application.GetRealWidth(64), }; - residenceInfoView.AddChidren(residenceAddFunctionView); + //residenceInfoView.AddChidren(residenceAddFunctionView); btnResidenceAddFunctionIcon = new Button { Gravity = Gravity.CenterHorizontal, -- Gitblit v1.8.0