From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期五, 27 八月 2021 13:21:21 +0800 Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1 --- HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 968 ++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 593 insertions(+), 375 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs index b212a47..8ad95c4 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs @@ -1,7 +1,6 @@ -锘縰sing System; -using Shared; +锘縰sing Shared; using HDL_ON.UI.CSS; -using HDL_ON.UI; +using HDL_ON.Entity; namespace HDL_ON.UI { @@ -32,7 +31,11 @@ /// <summary> /// 鐢ㄦ埛澶村儚 /// </summary> - Button btnUserHeadPortrait; + ImageView userHeadImageView; + /// <summary> + /// 婊氬姩閮ㄥ垎 + /// </summary> + VerticalScrolViewLayout contentView; /// <summary> /// 浣忓畢淇℃伅鍖哄煙 /// </summary> @@ -54,7 +57,7 @@ /// </summary> Button btnUserTypeIcon; /// <summary> - /// 鐢ㄦ埛绫诲瀷鍥炬爣 + /// 鐢ㄦ埛绫诲瀷鍚嶇О /// </summary> Button btnUserTypeName; /// <summary> @@ -64,11 +67,11 @@ /// <summary> /// 鍖哄煙绠$悊灏忓尯鍩熷浘鏍� /// </summary> - Button residenceManageIcon; + Button btnResidenceManageIcon; /// <summary> /// 鍖哄煙绠$悊灏忓尯鍩熸枃鏈� /// </summary> - Button residenceManageText; + Button btnResidenceManageText; /// <summary> /// 鍖哄煙鎴愬憳灏忓尯鍩� /// </summary> @@ -76,11 +79,11 @@ /// <summary> /// 鍖哄煙鎴愬憳灏忓尯鍩熷浘鏍� /// </summary> - Button residenceMemberIcon; + Button btnResidenceMemberIcon; /// <summary> /// 鍖哄煙鎴愬憳灏忓尯鍩熸枃鏈� /// </summary> - Button residenceMemberText; + Button btnResidenceMemberText; /// <summary> /// 鍖哄煙瀹夋斁灏忓尯鍩� /// </summary> @@ -88,35 +91,23 @@ /// <summary> /// 鍖哄煙鎴愬畨鏀惧皬鍖哄煙鍥炬爣 /// </summary> - Button residenceArmIcon; + Button btnResidenceArmIcon; /// <summary> /// 鍖哄煙瀹夋斁灏忓尯鍩熸枃鏈� /// </summary> - Button residenceArmText; - /// <summary> - /// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩� - /// </summary> - FrameLayout residenceDataBackupView; - /// <summary> - /// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩熷浘鏍� - /// </summary> - Button residenceDataBackupIcon; - /// <summary> - /// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩熸枃鏈� - /// </summary> - Button residenceDataBackupText; - /// <summary> - /// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩� - /// </summary> - FrameLayout residenceAuxiliaryFunctionView; - /// <summary> - /// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩熷浘鏍� - /// </summary> - Button residenceAuxiliaryFunctionIcon; - /// <summary> - /// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩熸枃鏈� - /// </summary> - Button residenceAuxiliaryFunctionText; + Button btnResidenceArmText; + ///// <summary> + ///// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩� + ///// </summary> + //FrameLayout residenceAuxiliaryFunctionView; + ///// <summary> + ///// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩熷浘鏍� + ///// </summary> + //Button btnResidenceAuxiliaryFunctionIcon; + ///// <summary> + ///// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩熸枃鏈� + ///// </summary> + //Button btnResidenceAuxiliaryFunctionText; /// <summary> /// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩� /// </summary> @@ -124,48 +115,43 @@ /// <summary> /// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熷浘鏍� /// </summary> - Button residenceAddFunctionIcon; + Button btnResidenceAddFunctionIcon; /// <summary> /// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熸枃鏈� /// </summary> - Button residenceAddFunctionText; - /// <summary> - /// 杞欢璁剧疆鍖哄煙 - /// </summary> - FrameLayout softSettingView; - /// <summary> - /// 杞欢澶滆妯″紡鍥炬爣 - /// </summary> - Button btnNightViewModeIcon; - /// <summary> - /// 杞欢澶滆妯″紡鏂囨湰 - /// </summary> - Button btnNightViewModeText; - /// <summary> - /// 杞欢澶滆妯″紡鎸夐挳 - /// </summary> - Button btnNightViewModeSwitch; - /// <summary> - /// 閫氱敤璁剧疆鍥炬爣 - /// </summary> - Button btnGeneralSettingsIcon; - /// <summary> - /// 閫氱敤璁剧疆鏂囨湰 - /// </summary> - Button btnGeneralSettingsText; + Button btnResidenceAddFunctionText; + + ///// <summary> + ///// 杞欢璁剧疆鍖哄煙 + ///// </summary> + //FrameLayout softSettingView; + ///// <summary> + ///// 杞欢澶滆妯″紡鏂囨湰 + ///// </summary> + //Button btnNightViewModeText; + ///// <summary> + ///// 閫氱敤璁剧疆鏂囨湰 + ///// </summary> + //Button btnGeneralSettingsText; + #endregion /// <summary> /// 鑾峰彇鏀寔灏忓尯鍩� /// </summary> - FrameLayout supportView; - /// <summary> - /// 鑾峰彇鏀寔鍥炬爣 - /// </summary> - Button btnSupportIcon; + VerticalScrolViewLayout supportView; /// <summary> /// 鑾峰彇鏀寔鏂囨湰 /// </summary> Button btnSupportText; - #endregion + + /// <summary> + /// 鍏充簬On鏂囨湰 + /// </summary> + Button btnAboutOnText; + /// <summary> + /// 鏅鸿兘闊崇鏂囨湰 + /// </summary> + Button btnSmartSpeakerText; + public PersonalCenterPage() { @@ -193,7 +179,7 @@ Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(94), BackgroundColor = CSS_Color.MainBackgroundColor, - Radius = (uint)Application.GetRealHeight(5), + Radius = (uint)Application.GetRealHeight(12), BorderColor = 0x00FFFFFF, BorderWidth = 0, }; @@ -206,12 +192,12 @@ TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.SubheadingFontSize, - Text = string.IsNullOrEmpty(MainPage.LoginUser.UserName) ? "涓嶆効鎰忛�忛湶濮撳悕鐨勭敤鎴�" : MainPage.LoginUser.UserName + Text = UserInfo.Current.userName// string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName }; personalInfoView.AddChidren(btnUserName); - if (!string.IsNullOrEmpty(MainPage.LoginUser.UserName)) + if (!string.IsNullOrEmpty( UserInfo.Current.userName) && UserInfo.Current.userName == UserInfo.Current.AccountString) { - btnUserName.Text = MainPage.LoginUser.UserName; + btnUserName.Text = Language.StringByID(StringId.UsersWhoNameIsEmpty); } btnEmail = new Button() { @@ -220,53 +206,109 @@ TextAlignment = TextAlignment.Center, TextColor = CSS_Color.TextualColor, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, - Text = MainPage.LoginUser.AccountString + Text = UserInfo.Current.AccountString }; personalInfoView.AddChidren(btnEmail); - btnUserHeadPortrait = new Button() + userHeadImageView = new ImageView() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(51), Width = Application.GetMinRealAverage(84), Height = Application.GetMinRealAverage(84), Radius = (uint)Application.GetMinRealAverage(42), - UnSelectedImagePath = "LoginIcon/2.png" + ImagePath = UserInfo.Current.headImagePagePath }; - bodyView.AddChidren(btnUserHeadPortrait); + bodyView.AddChidren(userHeadImageView); + //if ( UserInfo.Current.headImagePageBytes==null) + //{ + // userHeadImageView.ImagePath = UserInfo.Current.headImagePagePath; + //}else + //{ + // userHeadImageView.ImageBytes = UserInfo.Current.headImagePageBytes; + //} #endregion + //浣撻獙妯″紡 + if(MainPage.NoLoginMode) + { + Button btnExit = new Button() + { + Y = Application.GetRealHeight(288) + personalInfoView.Bottom, + Gravity = Gravity.CenterHorizontal, + Height = Application.GetRealHeight(60), + Width = Application.GetRealWidth(330), + TextAlignment = TextAlignment.Center, + SelectedTextColor = CSS_Color.MainColor, + TextColor = CSS_Color.WarningColor, + TextSize = CSS_FontSize.SubheadingFontSize, + TextID = StringId.NextStep, + Radius = 10, + BackgroundColor = CSS_Color.MainBackgroundColor, + SelectedBackgroundColor = CSS_Color.MainBackgroundColor, + }; + if(Language.CurrentLanguage =="Chinese") + { + btnExit.Text = "閫�鍑轰綋楠屾ā寮�"; + } + else + { + btnExit.Text = "Exit dome"; + } + btnExit.MouseUpEventHandler = (sender, e) => + { + MainPage.NoLoginMode = false; + UserInfo.Current.ClearUserInfo(); + HDLCommon.Current.Logout(); + }; + bodyView.AddChidren(btnExit); + return; + } + + contentView = new VerticalScrolViewLayout() + { + Y = Application.GetRealHeight(8) + personalInfoView.Bottom, + + Height = Application.GetRealHeight(400), + ScrollEnabled = false + }; + bodyView.AddChidren(contentView); + LoadContentView(); + } + + public void LoadContentView() + { + contentView.RemoveAll(); + #region 浣忓畢淇℃伅鍖哄煙 - if (MainPage.LoginUser.AccountType == 0) + if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && DB_ResidenceData.Instance.GatewayType == 1) { residenceInfoView = new FrameLayout() { Gravity = Gravity.CenterHorizontal, - Y = Application.GetRealHeight(8) + personalInfoView.Bottom, Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(213), BackgroundColor = CSS_Color.MainBackgroundColor, - Radius = (uint)Application.GetRealHeight(5), + Radius = (uint)Application.GetRealHeight(12), BorderColor = 0x00FFFFFF, BorderWidth = 0, }; - bodyView.AddChidren(residenceInfoView); + contentView.AddChidren(residenceInfoView); } else { residenceInfoView = new FrameLayout() { Gravity = Gravity.CenterHorizontal, - Y = Application.GetRealHeight(8) + personalInfoView.Bottom, Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(144), BackgroundColor = CSS_Color.MainBackgroundColor, - Radius = (uint)Application.GetRealHeight(5), + Radius = (uint)Application.GetRealHeight(12), BorderColor = 0x00FFFFFF, BorderWidth = 0, }; - bodyView.AddChidren(residenceInfoView); + contentView.AddChidren(residenceInfoView); } #region 椤堕儴淇℃伅鍖哄煙 @@ -276,7 +318,7 @@ Height = Application.GetMinRealAverage(16), X = Application.GetRealWidth(16), Y = Application.GetRealHeight(25), - UnSelectedImagePath = "0Common/DownIcon.png", + UnSelectedImagePath = "Public/DownIcon.png", }; residenceInfoView.AddChidren(btnResidenceDownIcon); @@ -289,10 +331,10 @@ TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel, - Text = UserConfig.Instance.CurrentRegion.Name, + Text = DB_ResidenceData.Instance.CurrentRegion.homeName, + IsBold = true }; residenceInfoView.AddChidren(btnCurResidenceName); - userTypeView = new FrameLayout() { @@ -303,6 +345,12 @@ BackgroundImagePath = "PersonalCenter/UserTypebg.png", }; residenceInfoView.AddChidren(userTypeView); + if (Language.CurrentLanguage != "Chinese" )//&& !DB_ResidenceData.Instance.CurrentRegion.isOtherShare) + { + userTypeView.X = Application.GetRealWidth(200); + userTypeView.Width = Application.GetRealWidth(180); + userTypeView.BackgroundImagePath = "PersonalCenter/UserTypebg2.png"; + } btnUserTypeIcon = new Button() { @@ -310,36 +358,38 @@ Y = Application.GetRealHeight(15), Width = Application.GetMinRealAverage(20), Height = Application.GetMinRealAverage(20), - UnSelectedImagePath = MainPage.LoginUser.AccountType == 0 ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png", + UnSelectedImagePath = DB_ResidenceData.Instance.CurrentRegion.isOtherShare + == false ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png", }; userTypeView.AddChidren(btnUserTypeIcon); - btnUserTypeName = new Button() { X = Application.GetRealWidth(8) + btnUserTypeIcon.Right, - Width = Application.GetRealWidth(80), + Width = Application.GetRealWidth(270), Height = Application.GetRealHeight(17 * 3), TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.MainBackgroundColor, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, - Text = MainPage.LoginUser.AccountType == 0 ? "绠$悊鍛�" : "鎴愬憳" + TextID = DB_ResidenceData.Instance.CurrentRegion.isOtherShare + == false ? StringId.Administrators : StringId.Member }; userTypeView.AddChidren(btnUserTypeName); #endregion #region 浣忓畢绠$悊 - if (MainPage.LoginUser.AccountType == 0) + + if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) { #region ---浣忓畢绠$悊鍖哄煙 residenceManageView = new FrameLayout() { X = Application.GetRealWidth(28 - 24), Y = Application.GetRealHeight(68), - Width = Application.GetMinRealAverage(64 + 48), - Height = Application.GetMinRealAverage(64), + Width = Application.GetRealWidth(64 + 48), + Height = Application.GetRealHeight(64), }; residenceInfoView.AddChidren(residenceManageView); - residenceManageIcon = new Button() + btnResidenceManageIcon = new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(5), @@ -347,30 +397,31 @@ Height = Application.GetMinRealAverage(30), UnSelectedImagePath = "PersonalCenter/ResidenceManageIcon.png", }; - residenceManageView.AddChidren(residenceManageIcon); + residenceManageView.AddChidren(btnResidenceManageIcon); - residenceManageText = new Button() + btnResidenceManageText = new Button() { - Y = residenceManageIcon.Bottom, + Y = btnResidenceManageIcon.Bottom, Height = Application.GetRealHeight(29), TextID = StringId.ResidenceManage, TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_FirstLevel }; - residenceManageView.AddChidren(residenceManageText); + residenceManageView.AddChidren(btnResidenceManageText); #endregion + #region ---鎴愬憳鍖哄煙 residenceMemberView = new FrameLayout() { X = residenceManageView.Right, Y = Application.GetRealHeight(68), - Width = Application.GetMinRealAverage(64 + 48), - Height = Application.GetMinRealAverage(64), + Width = Application.GetRealWidth(64 + 48), + Height = Application.GetRealHeight(64), }; residenceInfoView.AddChidren(residenceMemberView); - residenceMemberIcon = new Button + btnResidenceMemberIcon = new Button { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(5), @@ -378,354 +429,521 @@ Height = Application.GetMinRealAverage(30), UnSelectedImagePath = "PersonalCenter/ResidenceMemberIcon.png", }; - residenceMemberView.AddChidren(residenceMemberIcon); - residenceMemberText = new Button() + residenceMemberView.AddChidren(btnResidenceMemberIcon); + btnResidenceMemberText = new Button() { - Y = residenceManageIcon.Bottom, + Y = btnResidenceManageIcon.Bottom, Height = Application.GetRealHeight(29), TextID = StringId.ResidenceMemberManage, TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_FirstLevel }; - residenceMemberView.AddChidren(residenceMemberText); + residenceMemberView.AddChidren(btnResidenceMemberText); #endregion - #region ---瀹夋斁鍖哄煙 - residenceArmView = new FrameLayout() + if (DB_ResidenceData.Instance.GatewayType == 1) { - X = residenceMemberView.Right, - Y = Application.GetRealHeight(68), - Width = Application.GetMinRealAverage(64 + 48), - Height = Application.GetMinRealAverage(64), - }; - residenceInfoView.AddChidren(residenceArmView); - residenceArmIcon = new Button - { - Gravity = Gravity.CenterHorizontal, - Y = Application.GetRealHeight(5), - Width = Application.GetMinRealAverage(30), - Height = Application.GetMinRealAverage(30), - UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png", - }; - residenceArmView.AddChidren(residenceArmIcon); - residenceArmText = new Button() - { - Y = residenceManageIcon.Bottom, - Height = Application.GetRealHeight(29), - TextID = StringId.Undefense, - TextAlignment = TextAlignment.Center, - TextColor = CSS_Color.FirstLevelTitleColor, - TextSize = CSS_FontSize.PromptFontSize_FirstLevel - }; - residenceArmView.AddChidren(residenceArmText); - #endregion + #region ---瀹夋斁鍖哄煙 + residenceArmView = new FrameLayout() + { + X = residenceMemberView.Right, + Y = Application.GetRealHeight(68), + Width = Application.GetRealWidth(64 + 48), + Height = Application.GetRealHeight(64), + }; + residenceInfoView.AddChidren(residenceArmView); + btnResidenceArmIcon = new Button + { + Gravity = Gravity.CenterHorizontal, + Y = Application.GetRealHeight(5), + Width = Application.GetMinRealAverage(30), + Height = Application.GetMinRealAverage(30), + UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png", + SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png", + }; + residenceArmView.AddChidren(btnResidenceArmIcon); + btnResidenceArmText = new Button() + { + Y = btnResidenceManageIcon.Bottom, + Height = Application.GetRealHeight(29), + TextID = StringId.Undefense, + TextAlignment = TextAlignment.Center, + TextColor = CSS_Color.FirstLevelTitleColor, + TextSize = CSS_FontSize.PromptFontSize_FirstLevel + }; + residenceArmView.AddChidren(btnResidenceArmText); + #endregion + } + #region ---鏁版嵁澶囦唤鍖哄煙 - residenceDataBackupView = new FrameLayout() - { - X = Application.GetRealWidth(28 - 24), - Y = residenceManageView.Bottom, - Width = Application.GetMinRealAverage(64 + 48), - Height = Application.GetMinRealAverage(64), - }; - residenceInfoView.AddChidren(residenceDataBackupView); - residenceDataBackupIcon = new Button - { - Gravity = Gravity.CenterHorizontal, - Y = Application.GetRealHeight(5), - Width = Application.GetMinRealAverage(30), - Height = Application.GetMinRealAverage(30), - UnSelectedImagePath = "PersonalCenter/ResidenceDataBackupIcon.png", - }; - residenceDataBackupView.AddChidren(residenceDataBackupIcon); - residenceDataBackupText = new Button() - { - Y = residenceManageIcon.Bottom, - Height = Application.GetRealHeight(29), - TextID = StringId.DataBackup, - TextAlignment = TextAlignment.Center, - TextColor = CSS_Color.FirstLevelTitleColor, - TextSize = CSS_FontSize.PromptFontSize_FirstLevel - }; - residenceDataBackupView.AddChidren(residenceDataBackupText); + //residenceDataBackupView = new FrameLayout() + //{ + // X = Application.GetRealWidth(28 - 24), + // Y = residenceManageView.Bottom, + // Width = Application.GetRealWidth(64 + 48), + // Height = Application.GetRealWidth(64), + //}; + //residenceInfoView.AddChidren(residenceDataBackupView); + //btnResidenceDataBackupIcon = new Button + //{ + // Gravity = Gravity.CenterHorizontal, + // Y = Application.GetRealHeight(5), + // Width = Application.GetMinRealAverage(30), + // Height = Application.GetMinRealAverage(30), + // UnSelectedImagePath = "PersonalCenter/ResidenceDataBackupIcon.png", + //}; + //residenceDataBackupView.AddChidren(btnResidenceDataBackupIcon); + //btnResidenceDataBackupText = new Button() + //{ + // Y = btnResidenceManageIcon.Bottom, + // Height = Application.GetRealHeight(29), + // TextID = StringId.DataBackup, + // TextAlignment = TextAlignment.Center, + // TextColor = CSS_Color.FirstLevelTitleColor, + // TextSize = CSS_FontSize.PromptFontSize_FirstLevel + //}; + //residenceDataBackupView.AddChidren(btnResidenceDataBackupText); #endregion #region ---杈呭姪鍔熻兘鍖哄煙 - residenceAuxiliaryFunctionView = new FrameLayout() - { - X = residenceDataBackupView.Right, - Y = residenceManageView.Bottom, - Width = Application.GetMinRealAverage(64 + 48), - Height = Application.GetMinRealAverage(64), - }; - residenceInfoView.AddChidren(residenceAuxiliaryFunctionView); - residenceAuxiliaryFunctionIcon = new Button - { - Gravity = Gravity.CenterHorizontal, - Y = Application.GetRealHeight(5), - Width = Application.GetMinRealAverage(30), - Height = Application.GetMinRealAverage(30), - UnSelectedImagePath = "PersonalCenter/AuxiliaryFunctionIcon.png", - }; - residenceAuxiliaryFunctionView.AddChidren(residenceAuxiliaryFunctionIcon); - residenceAuxiliaryFunctionText = new Button() - { - Y = residenceManageIcon.Bottom, - Height = Application.GetRealHeight(29), - TextID = StringId.AuxiliaryFunction, - TextAlignment = TextAlignment.Center, - TextColor = CSS_Color.FirstLevelTitleColor, - TextSize = CSS_FontSize.PromptFontSize_FirstLevel - }; - residenceAuxiliaryFunctionView.AddChidren(residenceAuxiliaryFunctionText); + //residenceAuxiliaryFunctionView = new FrameLayout() + //{ + // X = Application.GetRealWidth(28 - 24), + // //X = residenceDataBackupView.Right, + // Y = residenceManageView.Bottom, + // Width = Application.GetRealWidth(64 + 48), + // Height = Application.GetRealWidth(64), + //}; + //residenceInfoView.AddChidren(residenceAuxiliaryFunctionView); + //btnResidenceAuxiliaryFunctionIcon = new Button + //{ + // Gravity = Gravity.CenterHorizontal, + // Y = Application.GetRealHeight(5), + // Width = Application.GetMinRealAverage(30), + // Height = Application.GetMinRealAverage(30), + // UnSelectedImagePath = "PersonalCenter/AuxiliaryFunctionIcon.png", + //}; + //residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionIcon); + //btnResidenceAuxiliaryFunctionText = new Button() + //{ + // Y = btnResidenceManageIcon.Bottom, + // Height = Application.GetRealHeight(29), + // TextID = StringId.AuxiliaryFunction, + // TextAlignment = TextAlignment.Center, + // TextColor = CSS_Color.FirstLevelTitleColor, + // TextSize = CSS_FontSize.PromptFontSize_FirstLevel + //}; + //residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText); #endregion - #region ---娣诲姞鍔熻兘鍖哄煙 - residenceAddFunctionView = new FrameLayout() + if (DB_ResidenceData.Instance.GatewayType == 1) { - X = residenceAuxiliaryFunctionView.Right, - Y = residenceManageView.Bottom, - Width = Application.GetMinRealAverage(64 + 48), - Height = Application.GetMinRealAverage(64), - }; - residenceInfoView.AddChidren(residenceAddFunctionView); - residenceAddFunctionIcon = new Button - { - Gravity = Gravity.CenterHorizontal, - Y = Application.GetRealHeight(5), - Width = Application.GetMinRealAverage(30), - Height = Application.GetMinRealAverage(30), - UnSelectedImagePath = "PersonalCenter/AddFunctionIcon.png", - }; - residenceAddFunctionView.AddChidren(residenceAddFunctionIcon); - residenceAddFunctionText = new Button() - { - Y = residenceManageIcon.Bottom, - Height = Application.GetRealHeight(29), - TextID = StringId.AddFunction, - TextAlignment = TextAlignment.Center, - TextColor = CSS_Color.FirstLevelTitleColor, - TextSize = CSS_FontSize.PromptFontSize_FirstLevel - }; - residenceAddFunctionView.AddChidren(residenceAddFunctionText); - #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 { - #region ---瀹夋斁鍖哄煙 - residenceArmView = new FrameLayout() + residenceInfoView.AddChidren(new Button() { - X = Application.GetRealWidth(28 - 24), - Y = Application.GetRealHeight(68), - Width = Application.GetMinRealAverage(64 + 48), - Height = Application.GetMinRealAverage(64), - }; - residenceInfoView.AddChidren(residenceArmView); - residenceArmIcon = new Button - { - Gravity = Gravity.CenterHorizontal, - Y = Application.GetRealHeight(5), - Width = Application.GetMinRealAverage(30), - Height = Application.GetMinRealAverage(30), - UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png", - }; - residenceArmView.AddChidren(residenceArmIcon); - residenceArmText = new Button() - { - Y = residenceArmIcon.Bottom, - Height = Application.GetRealHeight(29), - TextID = StringId.Undefense, + Y = Application.GetRealHeight(20 + 42), + Height = Application.GetRealHeight(40), TextAlignment = TextAlignment.Center, + TextSize = CSS_FontSize.TextFontSize, TextColor = CSS_Color.FirstLevelTitleColor, - TextSize = CSS_FontSize.PromptFontSize_FirstLevel - }; - residenceArmView.AddChidren(residenceArmText); - #endregion + TextID = StringId.FunctionNotOpen, + }); + + if (DB_ResidenceData.Instance.GatewayType == 1) + { + #region ---瀹夋斁鍖哄煙 + residenceArmView = new FrameLayout() + { + X = Application.GetRealWidth(28 - 24), + Y = Application.GetRealHeight(68), + Width = Application.GetRealWidth(64 + 48), + Height = Application.GetRealWidth(64), + }; + residenceInfoView.AddChidren(residenceArmView); + btnResidenceArmIcon = new Button + { + Gravity = Gravity.CenterHorizontal, + Y = Application.GetRealHeight(5), + Width = Application.GetMinRealAverage(30), + Height = Application.GetMinRealAverage(30), + UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png", + SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png", + }; + residenceArmView.AddChidren(btnResidenceArmIcon); + btnResidenceArmText = new Button() + { + Y = btnResidenceArmIcon.Bottom, + Height = Application.GetRealHeight(29), + TextID = StringId.Undefense, + TextAlignment = TextAlignment.Center, + TextColor = CSS_Color.FirstLevelTitleColor, + TextSize = CSS_FontSize.PromptFontSize_FirstLevel + }; + residenceArmView.AddChidren(btnResidenceArmText); + #endregion + } + #region F3闃舵 #region ---鏁版嵁澶囦唤鍖哄煙 - residenceDataBackupView = new FrameLayout() - { - X = residenceArmView.Right, - Y = Application.GetRealHeight(68), - Width = Application.GetMinRealAverage(64 + 48), - Height = Application.GetMinRealAverage(64), - }; - residenceInfoView.AddChidren(residenceDataBackupView); - residenceDataBackupIcon = new Button - { - Gravity = Gravity.CenterHorizontal, - Y = Application.GetRealHeight(5), - Width = Application.GetMinRealAverage(30), - Height = Application.GetMinRealAverage(30), - UnSelectedImagePath = "PersonalCenter/ResidenceDataBackupIcon.png", - }; - residenceDataBackupView.AddChidren(residenceDataBackupIcon); - residenceDataBackupText = new Button() - { - Y = residenceDataBackupIcon.Bottom, - Height = Application.GetRealHeight(29), - TextID = StringId.DataBackup, - TextAlignment = TextAlignment.Center, - TextColor = CSS_Color.FirstLevelTitleColor, - TextSize = CSS_FontSize.PromptFontSize_FirstLevel - }; - residenceDataBackupView.AddChidren(residenceDataBackupText); + //residenceDataBackupView = new FrameLayout() + //{ + // X = residenceArmView.Right, + // Y = Application.GetRealHeight(68), + // Width = Application.GetRealWidth(64 + 48), + // Height = Application.GetRealWidth(64), + //}; + //residenceInfoView.AddChidren(residenceDataBackupView); + //btnResidenceDataBackupIcon = new Button + //{ + // Gravity = Gravity.CenterHorizontal, + // Y = Application.GetRealHeight(5), + // Width = Application.GetMinRealAverage(30), + // Height = Application.GetMinRealAverage(30), + // UnSelectedImagePath = "PersonalCenter/ResidenceDataBackupIcon.png", + //}; + //residenceDataBackupView.AddChidren(btnResidenceDataBackupIcon); + //btnResidenceDataBackupText = new Button() + //{ + // Y = btnResidenceDataBackupIcon.Bottom, + // Height = Application.GetRealHeight(29), + // TextID = StringId.DataBackup, + // TextAlignment = TextAlignment.Center, + // TextColor = CSS_Color.FirstLevelTitleColor, + // TextSize = CSS_FontSize.PromptFontSize_FirstLevel + //}; + //residenceDataBackupView.AddChidren(btnResidenceDataBackupText); #endregion #region ---杈呭姪鍔熻兘鍖哄煙 - residenceAuxiliaryFunctionView = new FrameLayout() - { - X = residenceDataBackupView.Right, - Y = Application.GetRealHeight(68), - Width = Application.GetMinRealAverage(64 + 48), - Height = Application.GetMinRealAverage(64), - }; - residenceInfoView.AddChidren(residenceAuxiliaryFunctionView); - residenceAuxiliaryFunctionIcon = new Button - { - Gravity = Gravity.CenterHorizontal, - Y = Application.GetRealHeight(5), - Width = Application.GetMinRealAverage(30), - Height = Application.GetMinRealAverage(30), - UnSelectedImagePath = "PersonalCenter/AuxiliaryFunctionIcon.png", - }; - residenceAuxiliaryFunctionView.AddChidren(residenceAuxiliaryFunctionIcon); - residenceAuxiliaryFunctionText = new Button() - { - Y = residenceAuxiliaryFunctionIcon.Bottom, - Height = Application.GetRealHeight(29), - TextID = StringId.AuxiliaryFunction, - TextAlignment = TextAlignment.Center, - TextColor = CSS_Color.FirstLevelTitleColor, - TextSize = CSS_FontSize.PromptFontSize_FirstLevel - }; - residenceAuxiliaryFunctionView.AddChidren(residenceAuxiliaryFunctionText); + //residenceAuxiliaryFunctionView = new FrameLayout() + //{ + // X = residenceArmView.Right, + // Y = Application.GetRealHeight(68), + // Width = Application.GetRealWidth(64 + 48), + // Height = Application.GetRealWidth(64), + //}; + //residenceInfoView.AddChidren(residenceAuxiliaryFunctionView); + //btnResidenceAuxiliaryFunctionIcon = new Button + //{ + // Gravity = Gravity.CenterHorizontal, + // Y = Application.GetRealHeight(5), + // Width = Application.GetMinRealAverage(30), + // Height = Application.GetMinRealAverage(30), + // UnSelectedImagePath = "PersonalCenter/AuxiliaryFunctionIcon.png", + //}; + //residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionIcon); + //btnResidenceAuxiliaryFunctionText = new Button() + //{ + // Y = btnResidenceAuxiliaryFunctionIcon.Bottom, + // Height = Application.GetRealHeight(29), + // TextID = StringId.AuxiliaryFunction, + // TextAlignment = TextAlignment.Center, + // TextColor = CSS_Color.FirstLevelTitleColor, + // TextSize = CSS_FontSize.PromptFontSize_FirstLevel + //}; + //residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText); #endregion - + #endregion } #endregion #endregion + #region F3闃舵 #region 杞欢璁剧疆鍖哄煙 - softSettingView = new FrameLayout() + //contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) }); + //softSettingView = new FrameLayout() + //{ + // Gravity = Gravity.CenterHorizontal, + // Width = Application.GetRealWidth(343), + // Height = Application.GetRealWidth(88), + // BackgroundColor = CSS_Color.MainBackgroundColor, + // Radius = (uint)Application.GetRealHeight(12), + // BorderColor = 0x00FFFFFF, + // BorderWidth = 0, + //}; + //contentView.AddChidren(softSettingView); + + //Button btnNightViewModeIcon = new Button() + //{ + // X = Application.GetRealWidth(12), + // Y = Application.GetRealHeight(10), + // Width = Application.GetMinRealAverage(24), + // Height = Application.GetMinRealAverage(24), + // UnSelectedImagePath = "PersonalCenter/NightViewIcon.png", + //}; + //softSettingView.AddChidren(btnNightViewModeIcon); + + //btnNightViewModeText = new Button() + //{ + // X = Application.GetRealWidth(48), + // Width = Application.GetRealWidth(270), + // Height = Application.GetRealWidth(44), + // TextID = StringId.NightView, + // TextColor = CSS_Color.FirstLevelTitleColor, + // TextSize = CSS_FontSize.TextFontSize, + // TextAlignment = TextAlignment.CenterLeft, + //}; + //softSettingView.AddChidren(btnNightViewModeText); + + //Button btnNightViewModeRight = new Button() + //{ + // X = Application.GetRealWidth(315), + // Y = Application.GetRealWidth(14), + // Width = Application.GetMinRealAverage(16), + // Height = Application.GetMinRealAverage(16), + // UnSelectedImagePath = "Public/Right.png", + //}; + //softSettingView.AddChidren(btnNightViewModeRight); + + //var btnSoftSettingViewLine = new Button() + //{ + // X = Application.GetRealWidth(48), + // Y = btnNightViewModeText.Bottom, + // Height = Application.GetRealHeight(1), + // BackgroundColor = CSS_Color.DividingLineColor + //}; + //softSettingView.AddChidren(btnSoftSettingViewLine); + + //Button btnGeneralSettingsIcon = new Button() + //{ + // X = Application.GetRealWidth(12), + // Y = Application.GetRealWidth(54), + // Width = Application.GetMinRealAverage(24), + // Height = Application.GetMinRealAverage(24), + // UnSelectedImagePath = "PersonalCenter/GeneralSettingsIcon.png", + //}; + //softSettingView.AddChidren(btnGeneralSettingsIcon); + + //btnGeneralSettingsText = new Button() + //{ + // X = Application.GetRealWidth(48), + // Y = btnSoftSettingViewLine.Bottom, + // Width = Application.GetRealWidth(270), + // Height = Application.GetRealWidth(44), + // TextID = StringId.GeneralSettings, + // TextColor = CSS_Color.FirstLevelTitleColor, + // TextAlignment = TextAlignment.CenterLeft, + // TextSize = CSS_FontSize.TextFontSize + //}; + //softSettingView.AddChidren(btnGeneralSettingsText); + + //Button btnGeneralSettingsRight = new Button() + //{ + // X = Application.GetRealWidth(315), + // Y = Application.GetRealWidth(58), + // Width = Application.GetMinRealAverage(16), + // Height = Application.GetMinRealAverage(16), + // UnSelectedImagePath = "Public/Right.png", + //}; + //softSettingView.AddChidren(btnGeneralSettingsRight); + #endregion + #endregion + + #region 鏅鸿兘闊崇銆佽幏鍙栨敮鎸併�佸叧浜嶰N+ 绛夎彍鍗曞垪琛� + contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) }); + + supportView = new VerticalScrolViewLayout() { Gravity = Gravity.CenterHorizontal, - Y = Application.GetRealHeight(8) + residenceInfoView.Bottom, Width = Application.GetRealWidth(343), - Height = Application.GetRealHeight(88), + Height = Application.GetRealWidth(88), BackgroundColor = CSS_Color.MainBackgroundColor, - Radius = (uint)Application.GetRealHeight(5), + Radius = (uint)Application.GetRealHeight(12), BorderColor = 0x00FFFFFF, BorderWidth = 0, + ScrollEnabled = false, + VerticalScrollBarEnabled = false,//闅愯棌婊氬姩鏉� }; - bodyView.AddChidren(softSettingView); + contentView.AddChidren(supportView); - btnNightViewModeIcon = new Button() - { - X = Application.GetRealWidth(12), - Y = Application.GetRealHeight(10), - Width = Application.GetMinRealAverage(24), - Height = Application.GetMinRealAverage(24), - UnSelectedImagePath = "PersonalCenter/NightViewIcon.png", - }; - softSettingView.AddChidren(btnNightViewModeIcon); - btnNightViewModeText = new Button() - { - X = Application.GetRealWidth(48), - Width = Application.GetRealWidth(180), - Height = Application.GetRealHeight(44), - TextID = StringId.NightView, - TextColor = CSS_Color.FirstLevelTitleColor, - TextSize = CSS_FontSize.TextFontSize, - TextAlignment = TextAlignment.CenterLeft, - }; - softSettingView.AddChidren(btnNightViewModeText); - btnNightViewModeSwitch = new Button() + #region 鏅鸿兘闊崇 + if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) { - X = Application.GetRealWidth(293), - Y = Application.GetRealHeight(4), - Width = Application.GetMinRealAverage(36), - Height = Application.GetMinRealAverage(36), - UnSelectedImagePath = "PersonalCenter/SwitchClose.png", - }; - softSettingView.AddChidren(btnNightViewModeSwitch); + //supportView 鍔犻珮 鏄剧ず3琛� 3*44 + supportView.Height = Application.GetRealWidth(3*44); - var btnSoftSettingViewLine = new Button() - { - X = Application.GetRealWidth(48), - Y = btnNightViewModeText.Bottom, - Height = Application.GetRealHeight(1), - BackgroundColor = CSS_Color.DividingLineColor - }; - softSettingView.AddChidren(btnSoftSettingViewLine); + FrameLayout smartSpeakerView = new FrameLayout() + { + Height = Application.GetRealWidth(44), + }; + supportView.AddChidren(smartSpeakerView); - btnGeneralSettingsIcon = new Button() - { - X = Application.GetRealWidth(12), - Y = Application.GetRealHeight(54), - Width = Application.GetMinRealAverage(24), - Height = Application.GetMinRealAverage(24), - UnSelectedImagePath = "PersonalCenter/GeneralSettingsIcon.png", - }; - softSettingView.AddChidren(btnGeneralSettingsIcon); + //浣忓畢涓哄綋鍓嶈处鍙锋墠鏄剧ず鏅鸿兘闊崇鍏ュ彛 + Button btnSmartSpeakerIcon = new Button() + { + X = Application.GetRealWidth(12), + Y = Application.GetRealWidth(10), + Width = Application.GetMinRealAverage(24), + Height = Application.GetMinRealAverage(24), + UnSelectedImagePath = "PersonalCenter/SmartSpeaker.png", + }; + smartSpeakerView.AddChidren(btnSmartSpeakerIcon); - btnGeneralSettingsText = new Button() - { - X = Application.GetRealWidth(48), - Y = btnSoftSettingViewLine.Bottom, - Width = Application.GetRealWidth(180), - Height = Application.GetRealHeight(44), - TextID = StringId.GeneralSettings, - TextColor = CSS_Color.FirstLevelTitleColor, - TextAlignment = TextAlignment.CenterLeft, - TextSize = CSS_FontSize.TextFontSize - }; - softSettingView.AddChidren(btnGeneralSettingsText); + btnSmartSpeakerText = new Button() + { + X = Application.GetRealWidth(48), + Width = Application.GetRealWidth(270), + Height = Application.GetRealWidth(44), + TextID = StringId.SmartSpeaker, + TextColor = CSS_Color.FirstLevelTitleColor, + TextAlignment = TextAlignment.CenterLeft, + TextSize = CSS_FontSize.TextFontSize + }; + smartSpeakerView.AddChidren(btnSmartSpeakerText); + + Button btnSmartSpeakerRight = new Button() + { + X = Application.GetRealWidth(315), + Y = Application.GetRealWidth(14), + Width = Application.GetMinRealAverage(16), + Height = Application.GetMinRealAverage(16), + UnSelectedImagePath = "Public/Right.png", + }; + smartSpeakerView.AddChidren(btnSmartSpeakerRight); + + var btnSmartSpeakerViewLine = new Button() + { + X = Application.GetRealWidth(48), + Y = Application.GetRealWidth(43), + Height = Application.GetRealHeight(1), + Width = Application.GetRealWidth(279), + BackgroundColor = CSS_Color.DividingLineColor + }; + smartSpeakerView.AddChidren(btnSmartSpeakerViewLine); + } #endregion - #region 鑾峰彇鏀寔 - supportView = new FrameLayout() + FrameLayout supView = new FrameLayout() { - Gravity = Gravity.CenterHorizontal, - Y = Application.GetRealHeight(8) + softSettingView.Bottom, - Width = Application.GetRealWidth(343), - Height = Application.GetRealHeight(44), - BackgroundColor = CSS_Color.MainBackgroundColor, - Radius = (uint)Application.GetRealHeight(5), - BorderColor = 0x00FFFFFF, - BorderWidth = 0, + Height = Application.GetRealWidth(44), }; - bodyView.AddChidren(supportView); + supportView.AddChidren(supView); - btnSupportIcon = new Button() + Button btnSupportIcon = new Button() { X = Application.GetRealWidth(12), - Y = Application.GetRealHeight(10), + Y = Application.GetRealWidth(10), Width = Application.GetMinRealAverage(24), Height = Application.GetMinRealAverage(24), UnSelectedImagePath = "PersonalCenter/SupportIcon.png", }; - supportView.AddChidren(btnSupportIcon); + supView.AddChidren(btnSupportIcon); btnSupportText = new Button() { X = Application.GetRealWidth(48), - Width = Application.GetRealWidth(180), - Height = Application.GetRealHeight(44), + Width = Application.GetRealWidth(270), + Height = Application.GetRealWidth(44), TextID = StringId.GetSupport, TextColor = CSS_Color.FirstLevelTitleColor, TextAlignment = TextAlignment.CenterLeft, TextSize = CSS_FontSize.TextFontSize }; - supportView.AddChidren(btnSupportText); + 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); + + 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+ + FrameLayout aboutView = new FrameLayout() + { + Height = Application.GetRealWidth(44), + }; + supportView.AddChidren(aboutView); + + Button btnAboutOnIcon = new Button() + { + X = Application.GetRealWidth(12), + Y = Application.GetRealWidth(10), + Width = Application.GetMinRealAverage(24), + Height = Application.GetMinRealAverage(24), + UnSelectedImagePath = "PersonalCenter/InfoOnIcon.png", + }; + aboutView.AddChidren(btnAboutOnIcon); + + btnAboutOnText = new Button() + { + X = Application.GetRealWidth(48), + Width = Application.GetRealWidth(370), + Height = Application.GetRealWidth(44), + TextID = StringId.AboutOn, + TextColor = CSS_Color.FirstLevelTitleColor, + TextAlignment = TextAlignment.CenterLeft, + TextSize = CSS_FontSize.TextFontSize + }; + aboutView.AddChidren(btnAboutOnText); + + Button btnAboutOnRight = new Button() + { + X = Application.GetRealWidth(315), + Y = Application.GetRealWidth(14), + Width = Application.GetMinRealAverage(16), + Height = Application.GetMinRealAverage(16), + UnSelectedImagePath = "Public/Right.png", + }; + aboutView.AddChidren(btnAboutOnRight); + #endregion #endregion + contentView.AddChidren(new Button() { Height = Application.GetRealHeight(28) }); LoadEventList(); } } -} +} \ No newline at end of file -- Gitblit v1.8.0