From f9181a9c8125136f597add7c30cb2ff508d54ba7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:34:32 +0800
Subject: [PATCH] 2024年07月25日17:33:40
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs | 61 ++++++++++++++++++++----------
1 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index e7454e3..b154121 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,
};
@@ -63,34 +65,51 @@
};
headPortraitView.AddChidren(btnMemberName);
string username = HDLCommon.Current.GetUserName(memberInfo.memberName);
- btnMemberName.Text = memberInfo.nickName + "(" + username + ")";
+ btnMemberName.Text = memberInfo.nickName;
- #region RoomList
- roomListView = new VerticalScrolViewLayout()
+ if (!memberInfo.isVirtualAccount)
{
- Y = Application.GetRealHeight(138),
- Height = Application.GetRealHeight(471),
- //BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(roomListView);
- #endregion
-
+ btnMemberName.Text = memberInfo.nickName + "(" + username + ")";
+ #region RoomList
+ roomListView = new VerticalScrolViewLayout()
+ {
+ Y = Application.GetRealHeight(138),
+ Height = Application.GetRealHeight(471),
+ //BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ bodyView.AddChidren(roomListView);
+ #endregion
+ }
btnDelMember = new Button()
{
Y = Application.GetRealHeight(617),
- //Height = MainPage.Increase ? Application.GetRealHeight(70) : Application.GetRealHeight(50),
- Height = Application.GetRealHeight(50),
- TextAlignment = TextAlignment.Center,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.WarningColor,
+ //Height = Application.GetRealHeight(50),
+ //TextAlignment = TextAlignment.Center,
+ //TextSize = CSS_FontSize.SubheadingFontSize,
+ //TextColor = CSS_Color.WarningColor,
TextID = StringId.RemoveTheMember,
- BackgroundColor = CSS_Color.MainBackgroundColor,
+ //BackgroundColor = CSS_Color.MainBackgroundColor,
+
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(220),
+ Height = Application.GetRealWidth(44),
+ Radius = (uint)Application.GetRealWidth(22),
+ BorderWidth = 0,
+ BorderColor = 0x00000000,
+ BackgroundColor = 0xFFFF7272,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ IsBold = true,
+ TextAlignment = TextAlignment.Center,
+
};
bodyView.AddChidren(btnDelMember);
LoadEventList();
-
- GetShareDataByAccount();
+ if (!memberInfo.isVirtualAccount)
+ {
+ GetShareDataByAccount();
+ }
}
/// <summary>
@@ -296,7 +315,7 @@
roomFunctionOrSceneList.Add(new RoomData()
{
shareTypeId = fun.deviceId,
- shareType = ShareType.DEVICE.ToString(),
+ shareType = fun.spk == SPK.GroupControl ? "DEVICE_GROUP_CONTROL" : ShareType.DEVICE.ToString(),
name = fun.name,
});
}
--
Gitblit v1.8.0