From bac00b1bc932d3a85f90986466757b24d9407d61 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 14:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 75 +++++++++++++++----------------------
1 files changed, 31 insertions(+), 44 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 45fc2f0..4e0ee18 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,18 +1,16 @@
锘�<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/UI/UI1-Login/LoginPageBLL.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.47f89eb181110cd1c1050db004cedf20a2ec9c7f" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs" Line="22" Column="1" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs" Line="55" Column="60" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs" Line="133" Column="28" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs" Line="198" Column="59" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs" Line="35" Column="87" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="526" Column="63" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs" Line="52" Column="33" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="114" Column="38" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="34" Column="56" />
+ <File FileName="HDL_ON/Entity/Function/AC.cs" Line="343" Column="14" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" Line="425" Column="124" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs" Line="90" Column="64" />
+ <File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" Line="633" Column="44" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs" Line="140" Column="36" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="419" Column="30" />
+ <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="416" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" Line="145" Column="18" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" Line="148" Column="62" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -21,65 +19,54 @@
<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="DriverLayer" expanded="True" />
<Node name="Entity" 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="BindingResidence" expanded="True" />
<Node name="CSS" expanded="True" />
- <Node name="UI0-Public" expanded="True" />
- <Node name="UI1-Login" expanded="True">
- <Node name="LoginPageBLL.cs" selected="True" />
- </Node>
<Node name="UI2" expanded="True">
- <Node name="1-HomePage" expanded="True" />
<Node name="2-Classification" expanded="True" />
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="MemberManagement" expanded="True" />
- <Node name="ResidentialManage" expanded="True" />
- <Node name="UnlockSetting" expanded="True" />
- </Node>
+ <Node name="4-PersonalCenter" expanded="True" />
<Node name="FuntionControlView" expanded="True">
- <Node name="AC" expanded="True" />
- <Node name="Light" expanded="True" />
- <Node name="Music" expanded="True" />
+ <Node name="FoolHeating" expanded="True">
+ <Node name="FloorHeatingPage.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
</Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="References" expanded="True" />
- <Node name="Resources" expanded="True" />
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="Other" expanded="True">
+ <Node name="JPush" expanded="True" />
+ </Node>
</Node>
- <Node name="Shared.IOS" expanded="True">
- <Node name="References" expanded="True" />
- <Node name="NativeReferenceFolder" expanded="True" />
- </Node>
- <Node name="Shared.IOS.TBL" expanded="True">
- <Node name="References" expanded="True" />
- </Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
<Pad Id="MonoDevelop.Debugger.WatchPad">
<State>
- <Value>f.sid</Value>
- <Value>funs_New[0].ShareName</Value>
+ <Value>commandDictionary</Value>
+ <Value>scenefunction.localFunction</Value>
</State>
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
+ <DisabledProjects>
+ <String>Shared.IOS.TBL/Shared.IOS.TBL.csproj</String>
+ <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.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/gf3ud5ww.twc~" relfile="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/gf3ud5ww.twc~" line="76" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/gf3ud5ww.twc~" relfile="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/gf3ud5ww.twc~" line="150" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/PublicAssmebly.cs" relfile="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" line="726" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0