From 233b0ba140861d3e745c50f9acdd8e5bda2aa697 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 三月 2021 17:37:10 +0800
Subject: [PATCH] Merge branch 'ez-test' into temp-wxr
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 71 +++++++++++------------------------
1 files changed, 23 insertions(+), 48 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index b465949..b55fae3 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,68 +1,43 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.B6AE371B-2CF1-4E7C-9F7B-D664D119C1E0" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Music/A31USBMusicList.cs">
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/HDLCommon.cs">
<Files>
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="443" Column="68" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePageBLL.cs" Line="33" Column="56" />
- <File FileName="HDL_ON/DriverLayer/CommonPage.cs" Line="430" Column="56" />
- <File FileName="HDL_ON/Entity/Enumerative/MyEnum.cs" Line="58" Column="17" />
- <File FileName="HDL_ON/Entity/Enumerative/Command.cs" Line="1692" Column="38" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs" Line="89" Column="22" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="152" Column="63" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="604" Column="47" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionPage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="637" Column="48" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs" Line="24" Column="45" />
- <File FileName="HDL_ON/DAL/FileUtils.cs" Line="266" Column="16" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs" Line="24" Column="23" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31USBMusicList.cs" Line="137" Column="1" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" />
+ <File FileName="HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" />
+ <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" />
+ <File FileName="HDL-ON_iOS/Info.plist" />
+ <File FileName="HDL_ON/UI/MainPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs" Line="124" Column="46" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="616" Column="84" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs" Line="331" Column="15" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="758" Column="56" />
+ <File FileName="HDL_ON/Common/HDLCommon.cs" Line="500" Column="21" />
</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="DriverLayer" expanded="True" />
- <Node name="Entity" expanded="True">
- <Node name="Enumerative" expanded="True" />
- <Node name="Function" expanded="True" />
- </Node>
- <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="4-PersonalCenter" expanded="True">
- <Node name="UnlockSetting" expanded="True" />
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="Music" expanded="True">
- <Node name="A31USBMusicList.cs" selected="True" />
- </Node>
- </Node>
- </Node>
+ <Node name="Common" expanded="True">
+ <Node name="HDLCommon.cs" selected="True" />
</Node>
</Node>
<Node name="HDL-ON_iOS" expanded="True">
- <Node name="References" expanded="True" />
- <Node name="Resources" expanded="True">
- <Node name="Phone" expanded="True" />
- </Node>
+ <Node name="Resources" expanded="True" />
</Node>
- <Node name="Shared.IOS" expanded="True" />
</Node>
</State>
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" PreferredExecutionTarget="Android.SelectDevice" />
+ <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="Release|iPhone" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
--
Gitblit v1.8.0