From 54be52bc0ab6ce3207d421db4e5b05d14886b148 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 十一月 2023 16:46:53 +0800
Subject: [PATCH] UI优化
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs | 6
HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 1
HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs | 8
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FirmwareUpdateView.cs | 6
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs | 8
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs | 18 --
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs | 6
/dev/null | 186 --------------------------
HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs | 6
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 44 +-----
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs | 8
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs | 14 +
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/SupportHomeKitNotesPage.cs | 8
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs | 8
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs | 10
HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs | 22 ++-
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs | 6
HDL_ON/UI/UI0-Stan/Resourse/HdlControlResourse.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs | 6
20 files changed, 92 insertions(+), 285 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs b/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
index 19ea6e0..34cd84a 100644
--- a/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
@@ -45,12 +45,14 @@
{
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
this.AddChidren(bodyView);
- new TopViewDiv(this, bodyView, titleStr).LoadTopView(closeAction);
+ var topView = new TopViewDiv(this, bodyView, titleStr);
+ topView.maginY = 10;
+ topView.LoadTopView(closeAction);
//WebView
mWebView = new WebView()
{
- Y = Application.GetRealHeight(64),
- Height = bodyView.Height - Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
+ Height = bodyView.Height - Application.GetRealHeight(64+10),
X = Application.GetRealWidth(16),
Width = bodyView.Width - Application.GetRealWidth(32)
};
diff --git a/HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs b/HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs
index 85164ed..1f341aa 100644
--- a/HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs
@@ -95,7 +95,7 @@
//杩斿洖閿�
var btnBack = new PicViewControl(40, 28);
btnBack.X = Application.GetRealWidth(10);
- btnBack.Y = Application.GetRealHeight(9);
+ btnBack.Y = Application.GetRealHeight(19);
btnBack.UnSelectedImagePath = "Public/BackIcon.png";
topFrameLayout.AddChidren(btnBack);
topFrameLayout.AddTag("btnBack", btnBack);
@@ -119,7 +119,7 @@
//鏍囬
var btnTilte = new NormalViewControl(270, 25, true);
btnTilte.Gravity = Gravity.CenterHorizontal;
- btnTilte.Y = Application.GetRealHeight(10);
+ btnTilte.Y = Application.GetRealHeight(20);
btnTilte.TextAlignment = TextAlignment.Center;
btnTilte.TextSize = UI.CSS.CSS_FontSize.HeadlineFontSize;
btnTilte.TextColor = UI.CSS.CSS_Color.FirstLevelTitleColor;
diff --git a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
index 9f4971b..a58c218 100644
--- a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
@@ -302,12 +302,20 @@
/// <param name="btnHigherCollection">涓婁竴绾х晫闈㈢殑鏀惰棌鎺т欢(鍘熸潵on鐨勬鏋跺お鍧�)</param>
/// <param name="btnHigherDeviceName">涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢(鍘熸潵on鐨勬鏋跺お鍧�)</param>
private void AddTopSettingIcon(Button btnHigherDeviceName, Button btnHigherRoom)
- {
- //璁剧疆鍥炬爣(闂ㄩ攣鐣岄潰闇�瑕佸�熺敤杩欎釜鍥炬爣鐨刋杞村拰Y杞�,鎵�浠ュ姞杩涙潵)
- var btnSetting = new PicViewControl(28, 28);
- btnSetting.X = Application.GetRealWidth(337);
- btnSetting.Y = Application.GetRealHeight(9);
- btnSetting.UnSelectedImagePath = "Public/FuncInfoSetIcon.png";
+ {
+ //璁剧疆鍥炬爣(闂ㄩ攣鐣岄潰闇�瑕佸�熺敤杩欎釜鍥炬爣鐨刋杞村拰Y杞�,鎵�浠ュ姞杩涙潵)
+ var btnSetting = new Button()
+ {
+ X = Application.GetRealWidth(337),
+ Y = Application.GetRealHeight(19),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
+ UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
+ };
+ //var btnSetting = new PicViewControl(28, 28);
+ //btnSetting.X = Application.GetRealWidth(337);
+ //btnSetting.Y = Application.GetRealHeight(9);
+ //btnSetting.UnSelectedImagePath = "Public/FuncInfoSetIcon.png";
btnSetting.Name = "btnSetting";
topFrameLayout.AddChidren(btnSetting);
@@ -317,7 +325,7 @@
btnSetting.Visible = false;
}
- btnSetting.ButtonClickEvent += (sender, e) =>
+ btnSetting.MouseUpEventHandler += (sender, e) =>
{
var infoView = new UI.FunctionBaseInfoSetPage(this.device, () =>
{
diff --git a/HDL_ON/UI/UI0-Stan/Resourse/HdlControlResourse.cs b/HDL_ON/UI/UI0-Stan/Resourse/HdlControlResourse.cs
index ceca9b1..640d1b6 100644
--- a/HDL_ON/UI/UI0-Stan/Resourse/HdlControlResourse.cs
+++ b/HDL_ON/UI/UI0-Stan/Resourse/HdlControlResourse.cs
@@ -17,7 +17,7 @@
/// <summary>
/// 鐢婚潰TopFrameLayout鐨勯珮搴�(楂樺害锛�44)
/// </summary>
- public static int TopFrameHeight = Application.GetRealHeight(44);
+ public static int TopFrameHeight = Application.GetRealHeight(44 + 10);
/// <summary>
/// 鐢婚潰BodyFrameLayout鐨勯珮搴�(涓嶈兘鐩存帴鎸囧畾鏁板��,涓嶇劧鏈夊彲鑳戒細鍑虹幇璇樊,瀵艰嚧鏃犳硶閾烘弧)
/// </summary>
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index c8891fe..c1e7d38 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -84,50 +84,24 @@
skipView.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView_LightFunction(action);
+ var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
+ topView.maginY = 10;
+ topView.LoadTopView_LightFunction(action);
}
else
{
- new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
+ topView.maginY = 10;
+ topView.LoadTopView();
}
-
-
-#if DEBUG
- //Button testBtn = new Button()
- //{
- // X = Application.GetRealWidth(80),
- // Height = Application.GetRealHeight(64),
- // BackgroundColor = 0xFFFF0000
- //};
- //bodyView.AddChidren(testBtn);
- //int ddd = 0;
- //testBtn.MouseUpEventHandler = (sender, e) => {
- // ddd++;
-
- // Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
- // if (ddd % 2 == 0)
- // {
- // function_online.online = true;
- // }
- // else
- // {
- // function_online.online = false;
- // }
- // HomePage.LoadEvent_RefreshDevcieOnline(function_online);
- // FunctionPage.UpdataOnline(function_online);
- // RoomPage.UpdataOnline(function_online);
-
-
- //};
-#endif
/// <summary>
/// 鎴块棿鍐呭鏄剧ず鍖哄煙
/// </summary>
var roomFloorChangeView = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(52),
};
bodyView.AddChidren(roomFloorChangeView);
@@ -158,8 +132,8 @@
functionListView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64 + 52),
- Height = Application.GetRealHeight(603 - 12 - 52),
+ Y = Application.GetRealHeight(64 + 52 +10),
+ Height = Application.GetRealHeight(603 - 12 - 52-10),
};
bodyView.AddChidren(functionListView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
index 811a71e..227a159 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
@@ -29,12 +29,14 @@
/// </summary>
public void LoadPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.Complaints)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Complaints));
+ topView.maginY = 10;
+ topView.LoadTopView();
#region 鎶曡瘔鑱旂郴
FrameLayout phoneRow = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealWidth(50),
};
bodyView.AddChidren(phoneRow);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FirmwareUpdateView.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FirmwareUpdateView.cs
index da10e26..83a359d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FirmwareUpdateView.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FirmwareUpdateView.cs
@@ -14,12 +14,14 @@
public void ShowPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.FirmwareUpdate)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.FirmwareUpdate));
+ topView.maginY = 10;
+ topView.LoadTopView();
var contentView = new VerticalScrolViewLayout()
{
X = Application.GetRealWidth(12),
- Y = Application.GetRealHeight(90),
+ Y = Application.GetRealHeight(100),
Height = bodyView.Height,
BackgroundColor = CSS_Color.MainBackgroundColor,
};
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/SupportHomeKitNotesPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/SupportHomeKitNotesPage.cs
index a9f92b0..b8dade0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/SupportHomeKitNotesPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/SupportHomeKitNotesPage.cs
@@ -14,12 +14,14 @@
}
public void ShowPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.SupportHomeKitNotes)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.SupportHomeKitNotes));
+ topView.maginY = 10;
+ topView.LoadTopView();
var contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(90),
- Height = bodyView.Height ,
+ Y = Application.GetRealHeight(100),
+ Height = Application.GetRealHeight(490) ,
BackgroundColor = CSS_Color.MainBackgroundColor,
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
index 1066e2f..5fef359 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
@@ -92,11 +92,15 @@
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
if (isAdd)
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl));
+ topView.maginY = 10;
+ topView.LoadTopView();
}
else
{
- new TopViewDiv(bodyView, "").LoadTopView_SettingText(()=> {
+ var topView = new TopViewDiv(bodyView, "");
+ topView.maginY = 10;
+ topView.LoadTopView_SettingText(()=> {
Action action = () => {
var waitPage = new Loading();
@@ -158,8 +162,8 @@
}
var contentView = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667-64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667-64-10),
};
bodyView.AddChidren(contentView);
@@ -371,7 +375,7 @@
functionListView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(220),
- Height = Application.GetRealHeight(640 - 12 - 52 - 100 -100),
+ Height = Application.GetRealHeight(640 - 12 - 52 - 100 -100-10),
};
bodyView.AddChidren(functionListView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
index 351bee9..1c9c47a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
@@ -22,7 +22,9 @@
public void LoadPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl)).LoadTopView_AddIcon("CombinedDimming",
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl));
+ topView.maginY = 10;
+ topView.LoadTopView_AddIcon("CombinedDimming",
(s, c) =>
{
try
@@ -44,8 +46,8 @@
contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667 - 64-10),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs
index c4ed617..4ca1413 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs
@@ -60,12 +60,14 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming));
+ topView.maginY = 10;
+ topView.LoadTopView();
contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667 - 64-10),
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
index 8704a24..b79d50f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
@@ -34,11 +34,13 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.AddMember)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddMember));
+ topView.maginY = 10;
+ topView.LoadTopView();
var btnMemberName = new Button()
{
- Y = Application.GetRealHeight(70),
+ Y = Application.GetRealHeight(70+10),
X = Application.GetRealWidth(16),
Height = Application.GetRealHeight(32),
TextColor = CSS_Color.FirstLevelTitleColor,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs
deleted file mode 100644
index 99001ef..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-锘�//using System.Collections.Generic;
-//using HDL_ON.DAL.Server;
-//using HDL_ON.Entity;
-//using HDL_ON.UI.CSS;
-//using Shared;
-
-//namespace HDL_ON.UI
-//{
-// /// <summary>
-// /// 鍔犺浇闇�瑕佸垎浜埌瀛愯处鍙风殑閫夋嫨鐣岄潰
-// /// </summary>
-// public partial class ChooseShareMemberTargetListPage : FrameLayout
-// {
-// ChooseShareMemberTargetListPage bodyView;
-// VerticalScrolViewLayout contentView;
-// Button btnOption;
-
-// Loading waitPage;
-// List<ShareData> addFuns;
-// List<ResidenceMemberInfo> memberList;
-// ResidenceMemberInfo memberInfo;
-
-// public ChooseShareMemberTargetListPage(List<ShareData> funs, ResidenceMemberInfo mInfo)
-// {
-// memberList = new List<ResidenceMemberInfo>();
-// addFuns = funs;
-// bodyView = this;
-// memberInfo = mInfo;
-// }
-
-// public void LoadPage()
-// {
-// //鍒涘缓璇诲彇鎴愬憳璐﹀彿绾跨▼
-// var thread = LoadThread_GetResidenceMemberAccount();
-// waitPage = new Loading();
-// new PublicAssmebly().LoadPage_WaitPage(thread, bodyView, waitPage);
-
-// bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-// new TopViewDiv(bodyView, Language.StringByID(StringId.Shared)).LoadTopView();
-
-// #region title view
-// FrameLayout titleView = new FrameLayout()
-// {
-// Y = Application.GetRealHeight(72),
-// Height = Application.GetRealHeight(44),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// };
-// bodyView.AddChidren(titleView);
-
-// Button btnTitle = new Button()
-// {
-// X = Application.GetRealWidth(16),
-// TextColor = CSS_Color.FirstLevelTitleColor,
-// TextID = StringId.SharedTo,
-// TextSize = CSS_FontSize.SubheadingFontSize,
-// TextAlignment = TextAlignment.CenterLeft,
-// IsBold = true,
-// };
-// titleView.AddChidren(btnTitle);
-
-// titleView.AddChidren(new Button() {
-// X = Application.GetRealWidth(16),
-// Y = Application.GetRealHeight(43),
-// Height = Application.GetRealHeight(1),
-// BackgroundColor = CSS_Color.DividingLineColor,
-// });
-// #endregion
-
-// contentView = new VerticalScrolViewLayout()
-// {
-// Y = titleView.Bottom,
-// Height = Application.GetRealHeight(420),
-// //BackgroundColor = CSS_Color.MainBackgroundColor,
-// };
-// bodyView.AddChidren(contentView);
-
-// LoadMemberRow();
-
-// btnOption = new Button()
-// {
-// Y = Application.GetRealHeight(519 + 64),
-// Gravity = Gravity.CenterHorizontal,
-// Width = Application.GetRealWidth(220),
-// Height = Application.GetRealWidth(44),
-// BackgroundColor = CSS_Color.MainColor,
-// TextAlignment = TextAlignment.Center,
-// TextColor = CSS_Color.MainBackgroundColor,
-// TextID = StringId.ConfirmShared,
-// TextSize = CSS_FontSize.SubheadingFontSize,
-// IsBold = true,
-// Radius = (uint)Application.GetRealWidth(22),
-// BorderColor = 0x00000000,
-// BorderWidth = 0,
-// };
-// bodyView.AddChidren(btnOption);
-
-// LoadEvent_SharedData();
-// }
-
-// /// <summary>
-// /// 鍔犺浇鎴愬憳鍒楄〃鍖哄煙
-// /// </summary>
-// void LoadMemberRow()
-// {
-// contentView.RemoveAll();
-
-// int index = 1;
-// foreach (var mInfo in memberList)
-// {
-// FrameLayout memberRow = new FrameLayout()
-// {
-// Height = Application.GetRealWidth(65),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// };
-// contentView.AddChidren(memberRow);
-
-// var memberHeadImageView = new ImageView()
-// {
-// X = Application.GetRealWidth(16),
-// Gravity = Gravity.CenterVertical,
-// Width = Application.GetMinRealAverage(36),
-// Height = Application.GetMinRealAverage(36),
-// Radius = (uint)Application.GetMinRealAverage(24),
-// ImagePath = mInfo.headImagePagePath,
-// };
-// memberRow.AddChidren(memberHeadImageView);
-
-// Button btnMemberName = new Button()
-// {
-// X = Application.GetRealWidth(64),
-// Y = Application.GetRealWidth(10),
-// //Width = Application.GetRealWidth(300),
-// Height = Application.GetRealWidth(24),
-// TextAlignment = TextAlignment.CenterLeft,
-// TextColor = CSS_Color.FirstLevelTitleColor,
-// TextSize = CSS_FontSize.TextFontSize,
-// Text = mInfo.UserName,
-// };
-// memberRow.AddChidren(btnMemberName);
-
-// Button btnMemberMail = new Button()
-// {
-// X = Application.GetRealWidth(64),
-// Y = btnMemberName.Bottom,
-// //Width = Application.GetRealWidth(300),
-// Height = Application.GetRealWidth(21),
-// TextAlignment = TextAlignment.CenterLeft,
-// TextColor = CSS_Color.PromptingColor1,
-// TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-// Text = mInfo.Account,
-// };
-// memberRow.AddChidren(btnMemberMail);
-
-// Button btnChoose = new Button()
-// {
-// X = Application.GetRealWidth(331),
-// Gravity = Gravity.CenterVertical,
-// Width = Application.GetMinRealAverage(28),
-// Height = Application.GetMinRealAverage(28),
-// UnSelectedImagePath = "Public/ChooseIcon.png",
-// SelectedImagePath = "Public/ChooseOnIcon.png",
-// IsSelected = true,
-// };
-// memberRow.AddChidren(btnChoose);
-
-// if (memberList.Count > index)
-// {
-// memberRow.AddChidren(new Button()
-// {
-// Y = Application.GetRealHeight(64),
-// Gravity = Gravity.CenterHorizontal,
-// Width = Application.GetRealWidth(343),
-// Height = Application.GetRealHeight(1),
-// BackgroundColor = CSS_Color.DividingLineColor,
-// });
-// }
-// index++;
-
-// var eventHandler = LoadEvent_ChangeSharedList(btnChoose, mInfo);
-// btnChoose.MouseUpEventHandler = eventHandler;
-// btnMemberName.MouseUpEventHandler = eventHandler;
-// btnMemberMail.MouseUpEventHandler = eventHandler;
-// }
-// }
-// }
-//}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs
index db9bf9a..8321a12 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs
@@ -29,12 +29,14 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
- new TopViewDiv(bodyView, memberInfo.nickName).LoadTopView();
+ var topView = new TopViewDiv(bodyView, memberInfo.nickName);
+ topView.maginY = 10;
+ topView.LoadTopView();
#region 浜鸿劯绠＄悊
var btnMemberFaceTitle = new Button()
{
- Y = Application.GetRealHeight(80),
+ Y = Application.GetRealHeight(80+10),
X = Application.GetRealWidth(16),
Height = Application.GetRealHeight(32),
TextColor = CSS_Color.FirstLevelTitleColor,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
index d4f4569..beb7360 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
@@ -84,11 +84,13 @@
public void LoadPage(int tId)
{
titleId = tId;
- new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
+ topView.maginY = 10;
+ topView.LoadTopView();
allRoomView = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
@@ -128,8 +130,8 @@
contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64+50),
- Height = Application.GetRealHeight(450),
+ Y = Application.GetRealHeight(64+50+10),
+ Height = Application.GetRealHeight(450-10),
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
index d008e3f..96c583b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
@@ -29,24 +29,6 @@
//鏄惁闇�瑕佷繚瀛�
new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.IfNeedToSave, action);
- //if (titleId == StringId.PermissionToUse)//浠庝釜浜轰腑蹇冭繘鍏ュ崟鐙垎浜�
- //{
- // Action action = () =>
- // {
- // UploadShareDeviceList();
- // };
- // //鏄惁闇�瑕佷繚瀛�
- // new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.IfNeedToSave, action);
- //}
- //else
- //{
- // //var sharedBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(funs_New));
- // //2020-12-01 灞忚斀椤甸潰
- // //var page = new ChooseShareMemberTargetListPage(funs_New, memberInfo);
- // //MainPage.BasePageView.AddChidren(page);
- // //page.LoadPage();
- // //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- //}
};
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index dcf64c7..0d70570 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -31,11 +31,13 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.MemberPermissionManagement)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.MemberPermissionManagement));
+ topView.maginY = 10;
+ topView.LoadTopView();
FrameLayout headPortraitView = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(66),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index be1fc7d..f27995e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -270,6 +270,7 @@
BorderColor = CSS.CSS_Color.DividingLineColor,
BorderWidth = 3,
TextColor = CSS.CSS_Color.TextualColor,
+ Radius = 1,
};
searchView.AddChidren(searchTv);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
index 2443d5c..314964b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
@@ -44,9 +44,11 @@
/// </summary>
public void LoadPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.DataManagement)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.DataManagement));
+ topView.maginY = 10;
+ topView.LoadTopView();
- int bodyY = Application.GetRealHeight(64);
+ int bodyY = Application.GetRealHeight(64+10);
bodyScrolView = new VerticalScrolViewLayout()
{
Y = bodyY,
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
index d0d0372..118ee74 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
@@ -57,12 +57,14 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement));
+ topView.maginY = 10;
+ topView.LoadTopView();
contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667 - 64-10),
};
bodyView.AddChidren(contentView);
--
Gitblit v1.8.0