From 026ed1573ad8b9ba28f0e2c0bf0c9cd85f1dd2ed Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 02 十二月 2020 16:32:00 +0800 Subject: [PATCH] 2020-12-02 1.增加子账号设备分享。 2.房间删除时间优化。3.消息中心接口对接。4.版本检测更新接口对接。 --- .vs/HDL_APP_Project/xs/UserPrefs.xml | 68 +++++++++++++++++++-------------- 1 files changed, 39 insertions(+), 29 deletions(-) diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml index 27fa958..c174285 100644 --- a/.vs/HDL_APP_Project/xs/UserPrefs.xml +++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml @@ -1,38 +1,48 @@ 锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> - <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" /> - <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs"> + <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" /> + <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/Constant.cs"> <Files> - <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPage.cs" Line="114" Column="19" /> - <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" /> - <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs" /> - <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" /> - <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs" Line="454" Column="51" /> - <File FileName="HDL_ON/Entity/Function/AC.cs" /> - <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" /> - <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1" Column="1" /> - <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="403" Column="35" /> - <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2056" Column="45" /> - <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="18" Column="10" /> - <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="589" Column="35" /> - <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="36" Column="70" /> - <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="210" Column="47" /> - <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="863" Column="40" /> + <File FileName="HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs" Line="400" Column="71" /> + <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1028" Column="22" /> + <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1070" Column="38" /> + <File FileName="HDL_ON/Common/Constant.cs" Line="231" 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="Constant.cs" selected="True" /> + </Node> <Node name="DAL" expanded="True"> + <Node name="DriverLayer" expanded="True" /> + <Node name="Mqtt" expanded="True" /> <Node name="Server" expanded="True" /> </Node> + <Node name="Entity" expanded="True"> + <Node name="Device" expanded="True" /> + <Node name="Enumerative" expanded="True" /> + <Node name="Function" expanded="True" /> + <Node name="ResponseEntity" expanded="True" /> + </Node> <Node name="UI" expanded="True"> + <Node name="UI0-Public" expanded="True" /> + <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> - <Node name="3-Intelligence" expanded="True"> - <Node name="Automation" expanded="True" /> - <Node name="Scene" expanded="True"> - <Node name="SceneEditPage.cs" selected="True" /> - </Node> + <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="AboutOn" expanded="True" /> + <Node name="MemberManagement" expanded="True" /> + <Node name="ResetAccountPassword" expanded="True" /> + <Node name="RoomListManage" expanded="True" /> + </Node> + <Node name="FuntionControlView" expanded="True"> + <Node name="AC" expanded="True" /> + <Node name="EnvironmentalScience" expanded="True" /> + <Node name="Music" expanded="True" /> </Node> </Node> </Node> @@ -48,16 +58,16 @@ <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String> <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> - <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> + <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> - <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/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/kaede/Desktop/HDL_APP_Project/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/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/AppUnlockPage.cs" relfile="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" line="18" column="1" /> - <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/Control_Udp_Bus.cs" relfile="HDL_ON/DriverLayer/Control_Udp_Bus.cs" line="694" column="1" /> - <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/Control_TcpServer.cs" relfile="HDL_ON/DriverLayer/Control_TcpServer.cs" line="197" column="1" /> - <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs" relfile="HDL_ON/DAL/DriverLayer/Control_TcpClient.cs" line="69" column="1" /> + <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/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/jlchen/JLChen/ProjectsCode/HDLGit/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/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI0-Public/AppUnlockPage.cs" relfile="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" line="18" column="1" /> + <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/DriverLayer/Control_Udp_Bus.cs" relfile="HDL_ON/DriverLayer/Control_Udp_Bus.cs" line="694" column="1" /> + <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/DriverLayer/Control_TcpServer.cs" relfile="HDL_ON/DriverLayer/Control_TcpServer.cs" line="197" column="1" /> + <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs" relfile="HDL_ON/DAL/DriverLayer/Control_TcpClient.cs" line="69" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> -- Gitblit v1.8.0