From 3f752e5d4c19cc5757a6dcf73118d4da41836c40 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 23 十二月 2020 22:18:14 +0800 Subject: [PATCH] 2020-12-23 1.修复点击全部没有功能设备问题 --- HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs | 12 ++++++++++-- .vs/HDL_APP_Project/xs/UserPrefs.xml | 40 ++++++++++++++++++++++++++++++++++------ 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml index 6d59339..0c2c5ec 100644 --- a/.vs/HDL_APP_Project/xs/UserPrefs.xml +++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml @@ -1,6 +1,18 @@ 锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" /> - <MonoDevelop.Ide.Workbench> + <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs"> + <Files> + <File FileName="HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs" Line="1" Column="1" /> + <File FileName="HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs" Line="125" Column="37" /> + <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="302" Column="48" /> + <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" Line="354" Column="1" /> + <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="307" Column="21" /> + <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1816" Column="1" /> + <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs" Line="1" Column="1" /> + <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs" Line="1" Column="1" /> + <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs" Line="31" Column="28" /> + <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs" Line="1" Column="1" /> + </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> @@ -8,16 +20,32 @@ <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True" /> <Node name="DAL" expanded="True"> + <Node name="DriverLayer" expanded="True" /> <Node name="Mqtt" expanded="True" /> + <Node name="Server" expanded="True" /> </Node> - <Node name="UI" expanded="True" /> + <Node name="UI" expanded="True"> + <Node name="UI2" expanded="True"> + <Node name="2-Classification" expanded="True" /> + <Node name="3-Intelligence" expanded="True" /> + <Node name="4-PersonalCenter" expanded="True"> + <Node name="AccountBindInfo" expanded="True" /> + <Node name="GetSupport" expanded="True" /> + <Node name="MemberManagement" expanded="True" /> + <Node name="RoomListManage" expanded="True"> + <Node name="RoomEditFunctionPage.cs" selected="True" /> + </Node> + </Node> + <Node name="FuntionControlView" expanded="True"> + <Node name="AC" expanded="True" /> + </Node> + </Node> + </Node> </Node> <Node name="HDL-ON_Android" expanded="True"> <Node name="Packages" expanded="True" /> <Node name="Other" expanded="True"> - <Node name="JPush" expanded="True"> - <Node name="JPushReceiver.cs" selected="True" /> - </Node> + <Node name="JPush" expanded="True" /> </Node> </Node> </Node> @@ -32,7 +60,7 @@ <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> - <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" /> + <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore /> </MonoDevelop.Ide.DebuggingService.Breakpoints> diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs index 3823a72..812ab5c 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs @@ -103,8 +103,16 @@ lastButton.IsSelected = false; } btn.IsSelected = true; - showedFunctionRoomId = btn.Tag.ToString() == "0" ? null : btn.Tag.ToString(); - LoadFunctionListRow(allocatedList.FindAll((obj) => obj.roomIds.Contains(showedFunctionRoomId))); + //showedFunctionRoomId = btn.Tag.ToString() == "0" ? null : btn.Tag.ToString(); + showedFunctionRoomId = btn.Tag.ToString(); + if (showedFunctionRoomId == "0") + { + LoadFunctionListRow(allocatedList); + } + else + { + LoadFunctionListRow(allocatedList.FindAll((obj) => obj.roomIds.Contains(showedFunctionRoomId))); + } btnChoosedRoom.Text = chooseRoomName; dialog.Close(); }; -- Gitblit v1.8.0