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/MemberManagement/MemberManagementPage.cs | 105 +++++++++++++++++++++++-----------------------------
1 files changed, 46 insertions(+), 59 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
index b8ee116..0eec00f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
@@ -23,25 +23,6 @@
{
bodyView = this;
residenceMemberInfos = new List<ResidenceMemberInfo>();
-//#if DEBUG
-// //tr娴嬭瘯浣忓畢----娴嬭瘯鍒嗕韩
-// var light = new Light()
-// {
-// sid = "030101123456780202010005ABCP",
-// deviceId = "1333657366709645314",
-// name = "鐏�1",
-// };
-// light.SaveFunctionData();
-// var light2 = new Light()
-// {
-// sid = "030101123456780202010005ABCQ",
-// deviceId = "1333657366743199746",
-// name = "鐏�2"
-// };
-// light2.SaveFunctionData();
-// DB_ResidenceData.functionList.lights.Add(light);
-// DB_ResidenceData.functionList.lights.Add(light2);
-//#endif
}
public void LoadPage()
@@ -60,14 +41,14 @@
{
LoadThread_GetResidenceMemberAccount().Start();
};
- Action<string, string> refreshAction = (s1, s2) =>
+ Action refreshAction = () =>
{
var mmp = new AddMemberScanPage(backAction_AddMember);
MainPage.BasePageView.AddChidren(mmp);
mmp.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement)).LoadTopView_AddIcon_BackAction("Member", refreshAction, backAction);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement)).LoadTopView_MemberTopView(refreshAction, backAction);
contentView = new VerticalScrolViewLayout()
{
@@ -96,7 +77,8 @@
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
- Height = Application.GetRealWidth(230),
+ //Height = Application.GetRealWidth(230),
+ Height = Application.GetRealWidth(180),
BackgroundColor = CSS_Color.MainBackgroundColor,
Radius = (uint)Application.GetRealWidth(12),
BorderColor = 0x00000000,
@@ -133,6 +115,10 @@
TextID = StringId.Member
};
userTypeView.AddChidren(btnUserTypeName);
+ if(Language.CurrentLanguage == "English")
+ {
+ userTypeView.X = Application.GetRealWidth(260);
+ }
var memberHeadImageView = new ImageView()
{
@@ -155,7 +141,8 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
IsBold = true,
- Text = memberInfo.nickName
+ //Text = memberInfo.UserName,
+ Text = HDLCommon.Current.GetUserName(memberInfo.memberName)
};
view1.AddChidren(btnMemberName);
@@ -257,13 +244,13 @@
};
view3.AddChidren(btnPermissionRight);
- sView.AddChidren(new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Height = Application.GetRealWidth(1),
- Width = Application.GetRealWidth(311),
- BackgroundColor = CSS_Color.DividingLineColor,
- });
+ //sView.AddChidren(new Button()
+ //{
+ // Gravity = Gravity.CenterHorizontal,
+ // Height = Application.GetRealWidth(1),
+ // Width = Application.GetRealWidth(311),
+ // BackgroundColor = CSS_Color.DividingLineColor,
+ //});
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
@@ -282,38 +269,38 @@
#endregion
- #region 鍒涘缓鍦烘櫙
- var view4 = new FrameLayout()
- {
- Height = Application.GetRealWidth(50),
- };
- sView.AddChidren(view4);
+ //#region 鍒涘缓鍦烘櫙 2020-12-23 闅愯棌鍒涘缓鍦烘櫙鎸夐挳
+ //var view4 = new FrameLayout()
+ //{
+ // Height = Application.GetRealWidth(50),
+ //};
+ //sView.AddChidren(view4);
- var btnCreateSceneTitle = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(200),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.CreateScene,
- };
- view4.AddChidren(btnCreateSceneTitle);
+ //var btnCreateSceneTitle = new Button()
+ //{
+ // X = Application.GetRealWidth(16),
+ // Width = Application.GetRealWidth(200),
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.TextFontSize,
+ // TextID = StringId.CreateScene,
+ //};
+ //view4.AddChidren(btnCreateSceneTitle);
- var btnCreateSceneRight = new Button()
- {
- X = Application.GetRealWidth(287),
- Y = Application.GetRealHeight(4),
- Width = Application.GetMinRealAverage(38),
- Height = Application.GetMinRealAverage(38),
- UnSelectedImagePath = "Public/Switch_2.png",
- SelectedImagePath = "Public/SwitchOn_2.png",
- IsSelected = memberInfo.isAllowCreateScene
- };
- view4.AddChidren(btnCreateSceneRight);
+ //var btnCreateSceneRight = new Button()
+ //{
+ // X = Application.GetRealWidth(287),
+ // Y = Application.GetRealHeight(4),
+ // Width = Application.GetMinRealAverage(38),
+ // Height = Application.GetMinRealAverage(38),
+ // UnSelectedImagePath = "Public/Switch_2.png",
+ // SelectedImagePath = "Public/SwitchOn_2.png",
+ // IsSelected = memberInfo.isAllowCreateScene
+ //};
+ //view4.AddChidren(btnCreateSceneRight);
- LoadView_ChangeCreateSceneState(btnCreateSceneRight, btnCreateSceneTitle, memberInfo);
- #endregion
+ //LoadView_ChangeCreateSceneState(btnCreateSceneRight, btnCreateSceneTitle, memberInfo);
+ //#endregion
}
}
}
--
Gitblit v1.8.0