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, 15 insertions(+), 56 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index cfc82dd..b55fae3 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,26 +1,17 @@
-锘�<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/Common/R.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_iOS/BlueWifi.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs" Line="60" Column="54" />
- <File FileName="HDL_ON/Common/R.cs" Line="7" Column="20" />
- <File FileName="HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerSetTimePage.cs" Line="123" Column="77" />
+ <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/UI1-Login/LoginPage.cs" Line="180" Column="51" />
- <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="214" Column="62" />
- <File FileName="HDL_ON/Entity/FunctionList.cs" Line="42" Column="40" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="245" Column="35" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" Line="328" Column="86" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" Line="138" Column="55" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/AC/AcControlPage.cs" Line="487" Column="1" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="464" Column="1" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs" Line="45" Column="59" />
- <File FileName="HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs" Line="72" Column="96" />
+ <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">
@@ -28,43 +19,11 @@
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
<Node name="Common" expanded="True">
- <Node name="R.cs" selected="True" />
+ <Node name="HDLCommon.cs" selected="True" />
</Node>
- <Node name="DAL" expanded="True">
- <Node name="DriverLayer" expanded="True" />
- </Node>
- <Node name="UI" expanded="True">
- <Node name="UI0-Stan" expanded="True">
- <Node name="Controls" expanded="True">
- <Node name="BottomControls" expanded="True" />
- </Node>
- </Node>
- <Node name="UI2" expanded="True">
- <Node name="FuntionControlView" expanded="True">
- <Node name="Electrical" 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 name="AC" expanded="True" />
- </Node>
- </Node>
- </Node>
- <Node name="Properties" expanded="True" />
- <Node name="Resources" 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="AC" expanded="True" />
- </Node>
- </Node>
- </Node>
+ <Node name="Resources" expanded="True" />
</Node>
</Node>
</State>
@@ -77,7 +36,7 @@
<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="Release|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
--
Gitblit v1.8.0