.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" /> 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=请求服务器失败，请稍后再试！ 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=请求服务器失败，请稍后再试！ 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 } } 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 网络请求响应错误提示信息 HDL_ON/Common/Utlis.cs
@@ -377,6 +377,7 @@ } #endregion }
@@ -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、DEBUG、ADMIN /// </summary> public string childAccountType; /// <summary> /// 是否允许远程控制 /// </summary> public bool isRemoteControl; /// <summary> /// 昵称1 /// </summary> public string nickName; /// <summary> /// /// </summary> public string createTime; } /// <summary> /// 更新子账号备注名字 /// </summary> HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
@@ -87,7 +87,7 @@ /// <summary> /// 用户名字 /// </summary> public string UserName = ""; public string memberName = ""; /// <summary> /// /// </summary> 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())) { 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> 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 { 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() 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; 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; } } } 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(); } } }
