From dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 04 十二月 2020 16:06:47 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 58 +++++++++++++++++++++-------------------------------------
1 files changed, 21 insertions(+), 37 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 0d9b852..99bdd26 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,53 +1,36 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="249" Column="43" />
- <File FileName="HDL_ON/Common/R.cs" Line="486" Column="43" />
- <File FileName="HDL-ON_Android/Assets/Language.ini" Line="485" Column="14" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="76" Column="1" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs" Line="98" Column="39" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="26" Column="26" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="111" Column="45" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SelectTypeView.cs" Line="5" Column="18" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="10" Column="23" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs" Line="102" Column="45" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="228" Column="36" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="203" Column="50" />
+ <File FileName="HDL_ON/Entity/Function/Function.cs" Line="123" Column="24" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="181" Column="1" />
+ <File FileName="HDL_ON/Entity/FunctionList.cs" Line="107" Column="36" />
+ <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs" Line="341" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="315" Column="33" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="81" Column="35" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="245" Column="32" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="53" Column="54" />
</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="Server" expanded="True" />
- </Node>
- <Node name="Entity" expanded="True">
- <Node name="Enumerative" expanded="True" />
- <Node name="Function" expanded="True" />
- </Node>
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
<Node name="3-Intelligence" expanded="True">
<Node name="Automation" expanded="True">
- <Node name="LogicView" expanded="True">
- <Node name="ModeView.cs" selected="True" />
- </Node>
+ <Node name="LogicView" expanded="True" />
+ <Node name="Send.cs" selected="True" />
</Node>
</Node>
- <Node name="FuntionControlView" expanded="True" />
</Node>
</Node>
</Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True">
- <Node name="Phone" expanded="True" />
- </Node>
- </Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True" />
- </Node>
+ <Node name="HDL-ON_Android" expanded="True" />
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
@@ -59,10 +42,11 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/FunctionList.cs" relfile="HDL_ON/Entity/FunctionList.cs" line="240" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0