From 3cdd43cee7355743eb554badf5b742e061ab2172 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 17 十二月 2020 10:39:00 +0800
Subject: [PATCH] 2020-12-17 1.成员管理UI还原度优化
---
HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs | 5
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs | 232 ++++++++++++++++++++++-------
HDL-ON_Android/Assets/Language.ini | 5
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs | 7
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPageBLL.cs | 52 +++++
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs | 4
HDL-ON_iOS/Resources/Language.ini | 5
HDL_ON/DAL/Server/NewApiRes.cs | 50 ------
HDL_ON/Common/HDLCommon.cs | 11 +
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 8
HDL_ON/Common/Utlis.cs | 1
HDL_ON/Common/R.cs | 13 +
.vs/HDL_APP_Project/xs/UserPrefs.xml | 36 ---
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | 14
15 files changed, 282 insertions(+), 163 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 0bef466..6cdeb77 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,50 +1,24 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpServerRequest.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs">
<Files>
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="131" Column="27" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs" Line="66" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="Common" expanded="True" />
- <Node name="DAL" expanded="True">
- <Node name="DriverLayer" expanded="True" />
- <Node name="Server" expanded="True">
- <Node name="HttpServerRequest.cs" selected="True" />
- </Node>
- </Node>
- <Node name="Entity" expanded="True">
- <Node name="ResponseEntity" expanded="True" />
- </Node>
<Node name="UI" expanded="True">
<Node name="UI0-Public" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="1-HomePage" expanded="True" />
- <Node name="2-Classification" expanded="True" />
- <Node name="3-Intelligence" expanded="True" />
<Node name="4-PersonalCenter" expanded="True">
- <Node name="UnlockSetting" expanded="True" />
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="AC" expanded="True" />
- <Node name="Curtain" expanded="True" />
- <Node name="Electrical" expanded="True" />
- <Node name="EnvironmentalScience" expanded="True" />
- <Node name="FoolHeating" expanded="True" />
- <Node name="Light" expanded="True" />
- <Node name="Music" expanded="True">
- <Node name="View" expanded="True" />
+ <Node name="MemberManagement" expanded="True">
+ <Node name="MemberPermissionPage.cs" selected="True" />
</Node>
</Node>
</Node>
</Node>
- </Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True" />
- <Node name="Resources" expanded="True" />
</Node>
<Node name="HDL-ON_iOS" expanded="True">
<Node name="Resources" expanded="True" />
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 143a78b..ba91db0 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -253,7 +253,7 @@
231=鍏朵粬鍖哄煙
232=鎴愬憳绠＄悊
233=鏄电О
-234=浣跨敤鏉冮檺
+234=鎴愬憳鏉冮檺绠＄悊
235=鍒涘缓鍦烘櫙
236=鏄电О涓嶈兘涓虹┖
237=缂栬緫鏄电О
@@ -573,6 +573,9 @@
9053=鎺ㄩ�佹敞鍐屽紓甯�
9054=鏁板瓧瀵嗙爜楠岃瘉
9055=缁樺埗鎵嬪娍楠岃瘉
+9056=骞�
+9057=鏃犲尯鍩熷姛鑳�
+9058=鏄惁闇�瑕佷繚瀛�
10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 143a78b..ba91db0 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -253,7 +253,7 @@
231=鍏朵粬鍖哄煙
232=鎴愬憳绠＄悊
233=鏄电О
-234=浣跨敤鏉冮檺
+234=鎴愬憳鏉冮檺绠＄悊
235=鍒涘缓鍦烘櫙
236=鏄电О涓嶈兘涓虹┖
237=缂栬緫鏄电О
@@ -573,6 +573,9 @@
9053=鎺ㄩ�佹敞鍐屽紓甯�
9054=鏁板瓧瀵嗙爜楠岃瘉
9055=缁樺埗鎵嬪娍楠岃瘉
+9056=骞�
+9057=鏃犲尯鍩熷姛鑳�
+9058=鏄惁闇�瑕佷繚瀛�
10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index d3f1eba..0be5c25 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -366,6 +366,17 @@
break;
}
}
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="userName"></param>
+ /// <returns></returns>
+ public string GetUserName(string userName)
+ {
+ return string.IsNullOrEmpty(userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : userName;
+ }
#endregion
}
}
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 58cf187..a885d78 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -738,7 +738,18 @@
/// 缁樺埗鎵嬪娍楠岃瘉
/// </summary>
public const int GestureVerification = 9055;
-
+ /// <summary>
+ /// 骞�
+ /// </summary>
+ public const int Years = 9056;
+ /// <summary>
+ /// 鏃犲尯鍩熷姛鑳�
+ /// </summary>
+ public const int NoAreaFunction = 9057;
+ /// <summary>
+ /// 鏄惁闇�瑕佷繚瀛�
+ /// </summary>
+ public const int IfNeedToSave = 9058;
#region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
diff --git a/HDL_ON/Common/Utlis.cs b/HDL_ON/Common/Utlis.cs
index 62cb24e..69935f3 100644
--- a/HDL_ON/Common/Utlis.cs
+++ b/HDL_ON/Common/Utlis.cs
@@ -377,6 +377,7 @@
}
#endregion
+
}
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 9b014e5..ed0dc98 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -895,56 +895,6 @@
public string homeId;
}
-
-
- //鑾峰彇椤圭洰 (浣忓畢)涓嬮潰鐨勫瓙璐﹀彿
- /// <summary>
- /// 鑾峰彇鎴愬憳淇℃伅鐨勭粨鏋�
- /// </summary>
- /// [Serializable]
- public class SubAccountNewRes
- {
-
- /// <summary>
- ///
- /// </summary>
- public string id;
- /// <summary>
- ///
- /// </summary>
- public string homeId;
- /// <summary>
- ///
- /// </summary>
- public string homeRegionId;
- /// <summary>
- ///
- /// </summary>
- public string childAccountId;
- /// <summary>
- ///
- /// </summary>
- public string childAccountRegionId;
- /// <summary>
- /// 瀛愯处鎴风被鍨� ORDINARY銆丏EBUG銆丄DMIN
- /// </summary>
- public string childAccountType;
- /// <summary>
- /// 鏄惁鍏佽杩滅▼鎺у埗
- /// </summary>
- public bool isRemoteControl;
- /// <summary>
- /// 鏄电О1
- /// </summary>
- public string nickName;
- /// <summary>
- ///
- /// </summary>
- public string createTime;
-
-
- }
-
/// <summary>
/// 鏇存柊瀛愯处鍙峰娉ㄥ悕瀛�
/// </summary>
diff --git a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
index d07795c..3759f66 100644
--- a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
+++ b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
@@ -87,7 +87,7 @@
/// <summary>
/// 鐢ㄦ埛鍚嶅瓧
/// </summary>
- public string UserName = "";
+ public string memberName = "";
/// <summary>
///
/// </summary>
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index 25523fb..7f77df7 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -31,10 +31,10 @@
//btnConfirm.IsSelected = false;
if (string.IsNullOrEmpty(editText.Text.Trim()) || list.Contains(editText.Text.Trim()))
{
- if (titleId == StringId.ModifyMemberNickname)
- {
- return;
- }
+ //if (titleId == StringId.ModifyMemberNickname)
+ //{
+ // return;
+ //}
string tipMsgString = "";
if (string.IsNullOrEmpty(editText.Text.Trim()))
{
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index f130b5b..a04024e 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -221,9 +221,9 @@
if (selectId == 0)
{
allMenuButton.IsSelected = true;
- shareMenuButton.IsSelected = false;
- alarmMenuButton.IsSelected = false;
- systemMenuButton.IsSelected = false;
+ shareMenuButton.IsSelected = true;
+ alarmMenuButton.IsSelected = true;
+ systemMenuButton.IsSelected = true;
}
else if (selectId == 1)
@@ -297,12 +297,12 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(12),
- Width = Application.GetRealWidth(320),
+ Width = Application.GetRealWidth(343),
Height = Application.GetRealHeight(20),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- Text = pushMessageInfo.messageTitle
+ Text = pushMessageInfo.messageContent
};
rowView.AddChidren(btnTilte);
@@ -316,7 +316,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = pushMessageInfo.messageContent
+ Text = pushMessageInfo.messageTitle
};
rowView.AddChidren(btnSubtitle);
@@ -445,9 +445,9 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
IsBold = true,
- Text = yearStr
};
bgView.AddChidren(yearBtn);
+ yearBtn.Text = yearStr + Language.StringByID(StringId.Years);
}
/// <summary>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
index eba16f4..5c98269 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
@@ -24,7 +24,12 @@
{
if (titleId == StringId.PermissionToUse)//浠庝釜浜轰腑蹇冭繘鍏ュ崟鐙垎浜�
{
- UploadShareDeviceList();
+ Action action = () =>
+ {
+ UploadShareDeviceList();
+ };
+ //鏄惁闇�瑕佷繚瀛�
+ new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.IfNeedToSave, action);
}
else
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
index 57277aa..e8d86ff 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
@@ -136,8 +136,9 @@
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);
var btnMemberEmail = new Button()
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
index 1c7dcff..88370c4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
@@ -90,7 +90,7 @@
//璁剧疆鐢ㄦ埛鏄电О
if (string.IsNullOrEmpty(mInfo.nickName))
{
- mInfo.nickName = mInfo.UserName;
+ mInfo.nickName = mInfo.memberName;
}
//璁剧疆鐢ㄦ埛澶村儚璺緞
CheckIfDownloadHeadImage(mInfo);
@@ -218,7 +218,7 @@
})
{ IsBackground = true }.Start();
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.ModifyMemberNickname, mInfo.nickName, callBack, StringId.HouseNameCannotBeEmpty, 0, new List<string>());
+ new PublicAssmebly().LoadDialog_EditParater(StringId.ModifyMemberNickname, mInfo.nickName, callBack, StringId.NicknameCannotBeEmpty, 0, new List<string>());
};
btn1.MouseUpEventHandler = eventHandler;
btn2.MouseUpEventHandler = eventHandler;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index 99953e8..dea9002 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -58,9 +58,11 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- Text = memberInfo.nickName + "(" + memberInfo.Account + ")",
+ //Text = memberInfo.nickName + "(" + memberInfo.UserName + ")",
};
headPortraitView.AddChidren(btnMemberName);
+ string username = HDLCommon.Current.GetUserName(memberInfo.memberName);
+ btnMemberName.Text = memberInfo.nickName + "(" + username + ")";
#region RoomList
roomListView = new VerticalScrolViewLayout()
@@ -117,35 +119,54 @@
var btnLine = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnTitle.Bottom,
+ Y = titleView.Height - Application.GetRealHeight(2),
Width = Application.GetRealWidth(360),
Height = Application.GetRealHeight(1),
BackgroundColor = CSS_Color.DividingLineColor,
};
- roomListView.AddChidren(btnLine);
+ titleView.AddChidren(btnLine);
//---------------------------------------------
- //var roomListView = new VerticalScrolViewLayout()
- //{
- // Y = btnLine.Bottom,
- // Height = Application.GetRealHeight(440),
- //};
- //contentView.AddChidren(roomListView);
+ //鏈垎閰嶅尯鍩熺殑鍔熻兘
+ List<Function> allFunctionList = FunctionList.List.GetDeviceFunctionList();
+ //鏈垎閰嶅尯鍩熺殑鍔熻兘
+ List<Function> unallocatedList = new List<Function>();
+ foreach (var function in allFunctionList)
+ {
+ function.roomIds.Remove(null);
+ if (function.roomIds.Count > 0)
+ {
+ //allocatedList.Add(function);
+ }
+ else
+ {
+ unallocatedList.Add(function);
+ }
+ }
- //List<Function> funss = new List<Function>();
- //if (memberInfo.CurResidenceShareDate.Count > 0)
- //{
- // foreach (var sd in memberInfo.CurResidenceShareDate)
- // {
- // funss.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(System.Text.Encoding.UTF8.GetString(sd.ShareDataBytes)));
- // }
- //}
+ //绉婚櫎褰撳墠浣忓畢宸茬粡涓嶅瓨鍦ㄧ殑鍔熻兘
+ for (int i = 0; i < memberInfo.CurResidenceShareDate.Count;)
+ {
+ var sd = memberInfo.CurResidenceShareDate[i];
+ if (allFunctionList.Find((obj) => obj.deviceId == sd.shareTypeId) == null)
+ {
+ //new DAL.Server.HttpServerRequest().DeleteShareData(sd);
+ //寰呯‘璁ゆ槸鍚﹀悓姝ヤ簯绔垹闄ゅ垎浜�
+ memberInfo.CurResidenceShareDate.Remove(sd);
+ }
+ else
+ {
+ i++;
+ }
+ }
+
foreach (var room in SpatialInfo.CurrentSpatial.RoomList)
{
- var roomView = new FrameLayout()
+ var roomView = new RowLayout()
{
Height = Application.GetRealWidth(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
+ LineColor = CSS_Color.MainBackgroundColor,
};
roomListView.AddChidren(roomView);
@@ -171,20 +192,20 @@
addCount++;
}
}
- //绉婚櫎褰撳墠浣忓畢宸茬粡涓嶅瓨鍦ㄧ殑鍔熻兘
- for (int i = 0; i < memberInfo.CurResidenceShareDate.Count;)
- {
- var sd = memberInfo.CurResidenceShareDate[i];
- if (FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.deviceId == sd.shareTypeId) == null)
- {
- //new DAL.Server.HttpServerRequest().DeleteShareData(sd);
- memberInfo.CurResidenceShareDate.Remove(sd);
- }
- else
- {
- i++;
- }
- }
+ ////绉婚櫎褰撳墠浣忓畢宸茬粡涓嶅瓨鍦ㄧ殑鍔熻兘
+ //for (int i = 0; i < memberInfo.CurResidenceShareDate.Count;)
+ //{
+ // var sd = memberInfo.CurResidenceShareDate[i];
+ // if (allFunctionList.Find((obj) => obj.deviceId == sd.shareTypeId) == null)
+ // {
+ // //new DAL.Server.HttpServerRequest().DeleteShareData(sd);
+ // memberInfo.CurResidenceShareDate.Remove(sd);
+ // }
+ // else
+ // {
+ // i++;
+ // }
+ //}
var btnFunctionCount = new Button()
{
@@ -208,6 +229,22 @@
UnSelectedImagePath = "Public/Right.png",
};
roomView.AddChidren(btnRight);
+ //鍒嗗壊绾�
+ var lineView = new LineView(roomView.Height - Application.GetRealHeight(1));
+ roomView.AddChidren(lineView);
+ //鍒犻櫎鎸夐挳
+ var deleteBtn = new Button()
+ {
+ TextID = StringId.Del,
+ BackgroundColor = CSS_Color.AuxiliaryColor2,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ };
+ roomView.AddRightView(deleteBtn);
+ deleteBtn.MouseUpEventHandler = (sender, e) =>
+ {
+ //鍒犻櫎浜嬩欢
+ };
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
@@ -223,35 +260,118 @@
btnRoomName.MouseUpEventHandler = eHandler;
btnRight.MouseUpEventHandler = eHandler;
btnFunctionCount.MouseUpEventHandler = eHandler;
-
- if (SpatialInfo.CurrentSpatial.RoomList.IndexOf(room) < SpatialInfo.CurrentSpatial.RoomList.Count - 2)
- {
- var btnRoomLine = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = Application.GetRealWidth(49),
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealWidth(1),
- BackgroundColor = CSS_Color.DividingLineColor,
- };
- roomView.AddChidren(btnRoomLine);
- }
}
- //if (DB_ResidenceData.rooms.Count > 10)
- //{
- // roomListView.ScrollEnabled = true;
- //}
- //else
- //{
- // roomListView.ScrollEnabled = false;
+ //2020-12-16 鍔犺浇鏈垎閰嶅尯鍩熷姛鑳�
+ AddNoAreaFunction(unallocatedList);
+ }
- // roomListView.AddChidren(new Button()
+ /// <summary>
+ /// 娣诲姞鏈垎閰嶅尯鍩熷姛鑳�
+ /// </summary>
+ /// <param name="unallocatedList"></param>
+ void AddNoAreaFunction(List<Function> unallocatedList)
+ {
+ var roomView = new RowLayout()
+ {
+ Height = Application.GetRealWidth(50),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ LineColor = CSS_Color.MainBackgroundColor,
+ };
+ roomListView.AddChidren(roomView);
+
+ var btnRoomName = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealWidth(4),
+ Width = Application.GetRealWidth(330),
+ Height = Application.GetRealWidth(24),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextID = StringId.NoAreaFunction
+ };
+ roomView.AddChidren(btnRoomName);
+
+ //璁＄畻宸茬粡鍔犲叆鎴块棿鐨勮澶囨暟閲�
+ int addCount = 0;
+ foreach (var sd in memberInfo.CurResidenceShareDate)
+ {
+ if (unallocatedList.Find((obj) => obj.deviceId == sd.shareTypeId) != null)
+ {
+ addCount++;
+ }
+ }
+ ////绉婚櫎褰撳墠浣忓畢宸茬粡涓嶅瓨鍦ㄧ殑鍔熻兘
+ //for (int i = 0; i < memberInfo.CurResidenceShareDate.Count;)
+ //{
+ // var sd = memberInfo.CurResidenceShareDate[i];
+ // if (allFunctionList.Find((obj) => obj.deviceId == sd.shareTypeId) == null)
// {
- // Height = Application.GetRealWidth(441),
- // BackgroundColor = CSS_Color.BackgroundColor,
- // });
+ // //new DAL.Server.HttpServerRequest().DeleteShareData(sd);
+ // memberInfo.CurResidenceShareDate.Remove(sd);
+ // }
+ // else
+ // {
+ // i++;
+ // }
//}
+
+ var btnFunctionCount = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = btnRoomName.Bottom,
+ Width = Application.GetRealWidth(330),
+ Height = Application.GetRealWidth(18),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
+ Text = addCount + "/" + unallocatedList.Count.ToString(),
+ };
+ roomView.AddChidren(btnFunctionCount);
+
+ var btnRight = new Button()
+ {
+ X = Application.GetRealWidth(351),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ roomView.AddChidren(btnRight);
+ ////鍒嗗壊绾�
+ //var lineView = new LineView(roomView.Height - Application.GetRealHeight(1));
+ //roomView.AddChidren(lineView);
+ //鍒犻櫎鎸夐挳
+ var deleteBtn = new Button()
+ {
+ TextID = StringId.Del,
+ BackgroundColor = CSS_Color.AuxiliaryColor2,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ };
+ roomView.AddRightView(deleteBtn);
+ deleteBtn.MouseUpEventHandler = (sender, e) =>
+ {
+ //鍒犻櫎浜嬩欢
+ };
+
+ EventHandler<MouseEventArgs> eHandler = (sender, e) =>
+ {
+ Action<string> refreshFunctionCount = (newCount) => {
+ btnFunctionCount.Text = newCount + "/" + unallocatedList.Count.ToString();
+ };
+ //var mmp = new MemberFunctionPermissionPage(memberInfo, room, refreshFunctionCount);
+ //MainPage.BasePageView.AddChidren(mmp);
+ //mmp.LoadPage(StringId.PermissionToUse);
+ //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ roomView.MouseUpEventHandler = eHandler;
+ btnRoomName.MouseUpEventHandler = eHandler;
+ btnRight.MouseUpEventHandler = eHandler;
+ btnFunctionCount.MouseUpEventHandler = eHandler;
+
+
}
}
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPageBLL.cs
index e2c2d07..20943bd 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPageBLL.cs
@@ -19,12 +19,7 @@
{
Action action = () =>
{
- var responePack = new HttpServerRequest().DeleteResidenceMemberAccount(memberInfo);
- if (responePack.Code == StateCode.SUCCESS)
- {
- this.RemoveFromParent();
- backAction();
- }
+ RemoveTheMember();
};
new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.ConfirmToRemoveTheMember, action);
};
@@ -85,5 +80,50 @@
{ IsBackground = true }.Start();
}
+ /// <summary>
+ /// 鍒犻櫎瀛愯处鍙�
+ /// </summary>
+ void RemoveTheMember()
+ {
+ var waitPage = new Loading();
+ bodyView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ var responePack = new HttpServerRequest().DeleteResidenceMemberAccount(memberInfo);
+ if (responePack.Code == StateCode.SUCCESS)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ this.RemoveFromParent();
+ backAction();
+ });
+ }
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(responePack.Code);
+ }
+ }
+ catch (Exception ex)
+ {
+
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+
}
}
--
Gitblit v1.8.0