From 34d49c20c2c2543658e844847c5eaa87f4c954e9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 23 二月 2021 17:28:40 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into NewFilePath
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 58 ++++++++++++----------------------------------------------
1 files changed, 12 insertions(+), 46 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 3fb6e9a..a2ecaa1 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,63 +1,29 @@
锘�<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/2-Classification/ClassificationPage.cs">
+ <MonoDevelop.Ide.Workbench>
<Files>
<File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorPirPage.cs" Line="142" Column="75" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" Line="145" Column="39" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorWaterImmersionPage.cs" Line="123" Column="75" />
- <File FileName="HDL_ON/Common/R.cs" Line="7" Column="38" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="399" Column="1" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorDoorWinwsPage.cs" Line="66" Column="56" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorSmokePage.cs" Line="123" Column="75" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="90" Column="54" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="437" Column="60" />
+ <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorWaterImmersionPage.cs" />
+ <File FileName="HDL_ON/Common/R.cs" />
+ <File FileName="HDL-ON_iOS/Resources/Language.ini" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorDoorWinwsPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorSmokePage.cs" />
+ <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="735" 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="Entity" expanded="True" />
- <Node name="UI" expanded="True">
- <Node name="CSS" expanded="True" />
- <Node name="UI0-Public" expanded="True" />
- <Node name="UI1-Login" expanded="True" />
- <Node name="UI2" expanded="True">
- <Node name="2-Classification" expanded="True">
- <Node name="ClassificationPage.cs" selected="True" />
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="ArmSensor" expanded="True" />
- </Node>
- </Node>
- </Node>
- </Node>
<Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True">
- <Node name="Phone" expanded="True">
- <Node name="FunctionIcon" expanded="True" />
- </Node>
- </Node>
+ <Node name="Other" expanded="True" />
</Node>
<Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True">
- <Node name="Phone" expanded="True">
- <Node name="FunctionIcon" expanded="True">
- <Node name="ArmSensor" expanded="True" />
- </Node>
- </Node>
- </Node>
+ <Node name="References" expanded="True" />
+ <Node name="Assets.xcassets" selected="True" />
</Node>
</Node>
- </State>
- </Pad>
- <Pad Id="MonoDevelop.Debugger.WatchPad">
- <State>
- <Value>DB_ResidenceData.Instance.HomeGateway.gatewayStatus</Value>
- <Value>DriverLayer.Control.Ins.GatewayOnline_Cloud</Value>
- <Value>GatewayOnline_Cloud</Value>
- <Value>HomeGateway</Value>
</State>
</Pad>
</Pads>
--
Gitblit v1.8.0