From f4c9d8aed59049476cfbf7b08e59936bbd80a6c9 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期二, 08 十二月 2020 17:27:53 +0800 Subject: [PATCH] 2020-12-08 1.增加分享设备的时候,判断当前房间分享设备总数,从而决定是否需要增加或者移除房间分享 --- .vs/HDL_APP_Project/xs/UserPrefs.xml | 72 +++++++++++++++--------------------- 1 files changed, 30 insertions(+), 42 deletions(-) diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml index 75b7d48..2f4a81d 100644 --- a/.vs/HDL_APP_Project/xs/UserPrefs.xml +++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml @@ -1,17 +1,24 @@ 锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> - <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> - <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/UdpSocket.cs"> + <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" /> + <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs"> <Files> - <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="289" Column="1" /> - <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1" Column="1" /> - <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1453" Column="23" /> - <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs" Line="63" Column="18" /> - <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" /> - <File FileName="HDL_ON/DAL/Mqtt/MqttInfoConfig.cs" /> - <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="138" Column="41" /> - <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="20" Column="31" /> - <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="779" Column="116" /> - <File FileName="HDL_ON/DAL/DriverLayer/UdpSocket.cs" Line="106" Column="15" /> + <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="157" Column="54" /> + <File FileName="HDL_ON/UI/UI1-Login/SelectServerDialog.cs" Line="109" Column="37" /> + <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="15" Column="29" /> + <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="729" Column="51" /> + <File FileName="HDL_ON/Entity/UserInfo.cs" Line="45" Column="13" /> + <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="435" Column="1" /> + <File FileName="HDL_ON/UI/MainPage.cs" Line="12" Column="19" /> + <File FileName="HDL_ON/Common/Constant.cs" Line="199" Column="26" /> + <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs" Line="1" Column="1" /> + <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs" Line="1" Column="1" /> + <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs" Line="1" Column="1" /> + <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs" Line="76" Column="21" /> + <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs" Line="259" Column="34" /> + <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1334" Column="18" /> + <File FileName="HDL_ON/Entity/Room.cs" Line="51" Column="23" /> + <File FileName="HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs" Line="41" Column="32" /> + <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs" Line="219" Column="31" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -20,45 +27,32 @@ <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True" /> <Node name="DAL" expanded="True"> - <Node name="DriverLayer" expanded="True"> - <Node name="UdpSocket.cs" selected="True" /> - </Node> - <Node name="Mqtt" expanded="True" /> <Node name="Server" expanded="True" /> </Node> <Node name="Entity" expanded="True"> - <Node name="Function" expanded="True" /> + <Node name="ResponseEntity" expanded="True" /> </Node> <Node name="UI" expanded="True"> - <Node name="CSS" expanded="True" /> - <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> - <Node name="1-HomePage" expanded="True" /> <Node name="4-PersonalCenter" expanded="True"> - <Node name="AccountBindInfo" expanded="True" /> - <Node name="MemberManagement" expanded="True" /> - <Node name="ResetAccountPassword" expanded="True" /> + <Node name="MemberManagement" expanded="True"> + <Node name="MemberFunctionPermissionPage.cs" selected="True" /> + </Node> <Node name="RoomListManage" expanded="True" /> <Node name="SearchDevice" expanded="True" /> - <Node name="UnlockSetting" expanded="True" /> - </Node> - <Node name="FuntionControlView" expanded="True"> - <Node name="Light" expanded="True" /> </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="References" expanded="True" /> - <Node name="Resources" expanded="True"> - <Node name="js" expanded="True" /> - </Node> + <Node name="Resources" expanded="True" /> </Node> </Node> </State> - </Pad> - <Pad Id="MonoDevelop.Debugger.WatchPad"> - <State /> </Pad> </Pads> </MonoDevelop.Ide.Workbench> @@ -69,16 +63,10 @@ <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> - <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.364c4b3158493098" /> + <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.822QECU5228FU" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> - <Breakpoint file="/Users/nigemacpc/Desktop/On+/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs" line="76" column="1" /> - <Breakpoint file="/Users/nigemacpc/Desktop/On+/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs" line="56" column="1" /> - <Breakpoint file="/Users/nigemacpc/Desktop/On+/HDL_ON/UI/UI0-Public/AppUnlockPage.cs" relfile="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" line="18" column="1" /> - <Breakpoint file="/Users/nigemacpc/Desktop/On+/HDL_ON/DriverLayer/Control_Udp_Bus.cs" relfile="HDL_ON/DriverLayer/Control_Udp_Bus.cs" line="694" column="1" /> - <Breakpoint file="/Users/nigemacpc/Desktop/On+/HDL_ON/DriverLayer/Control_TcpServer.cs" relfile="HDL_ON/DriverLayer/Control_TcpServer.cs" line="197" column="1" /> - <Breakpoint file="/Users/nigemacpc/Desktop/On+/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" relfile="HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" line="49" column="1" /> - <Breakpoint file="/Users/nigemacpc/Desktop/On+/HDL_ON/DAL/DriverLayer/Control_Udp.cs" relfile="HDL_ON/DAL/DriverLayer/Control_Udp.cs" line="749" column="1" /> + <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs" line="60" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> -- Gitblit v1.8.0