From 4a9318077bd095fbc7c57c593e5ca8185603dac4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 67 +++++++++++++++------------------
1 files changed, 31 insertions(+), 36 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 9cd2427..ff9cc1b 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,60 +1,62 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Mqtt/MqttClient.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/AppDelegate.cs">
<Files>
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="752" Column="16" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" Line="136" Column="1" />
- <File FileName="HDL_ON/DAL/Mqtt/-寮冪敤-Mqtt_A_Protocol.cs" Line="28" Column="24" />
- <File FileName="HDL_ON/DAL/Mqtt/-寮冪敤-Mqtt_Cloud.cs" Line="386" Column="12" />
- <File FileName="HDL_ON/DAL/Mqtt/MqttInfoConfig.cs" Line="78" Column="2" />
+ <File FileName="HDL_ON/UI/UI0-Public/Widget/DiySelectPopupDialog.cs" Line="631" Column="1" />
+ <File FileName="HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs" Line="67" Column="44" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="319" Column="52" />
+ <File FileName="HDL-ON_iOS/ViewController.cs" Line="1" Column="1" />
+ <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="204" 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="Common" expanded="True">
+ <Node name="Utlis" expanded="True" />
+ </Node>
<Node name="DAL" expanded="True">
<Node name="DriverLayer" expanded="True" />
- <Node name="Mqtt" expanded="True">
- <Node name="MqttClient.cs" selected="True" />
- </Node>
- <Node name="Server" expanded="True" />
+ <Node name="Mqtt" expanded="True" />
</Node>
<Node name="Entity" 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="Widget" expanded="True" />
+ </Node>
<Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="1-HomePage" expanded="True" />
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="AccountBindInfo" expanded="True" />
- <Node name="MemberManagement" expanded="True" />
- <Node name="ResetAccountPassword" expanded="True" />
- <Node name="RoomListManage" expanded="True" />
- <Node name="SearchDevice" expanded="True" />
- <Node name="UnlockSetting" expanded="True" />
+ <Node name="2-Classification" expanded="True" />
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="Scene" expanded="True" />
</Node>
+ <Node name="4-PersonalCenter" expanded="True" />
<Node name="FuntionControlView" expanded="True">
- <Node name="Light" expanded="True" />
+ <Node name="AC" expanded="True" />
+ <Node name="FoolHeating" expanded="True" />
</Node>
</Node>
</Node>
</Node>
<Node name="HDL-ON_iOS" expanded="True">
- <Node name="References" expanded="True" />
- <Node name="Resources" expanded="True">
- <Node name="js" expanded="True" />
- </Node>
+ <Node name="Other" expanded="True" />
+ <Node name="Resources" expanded="True" />
+ <Node name="AppDelegate.cs" selected="True" />
</Node>
</Node>
</State>
</Pad>
<Pad Id="MonoDevelop.Debugger.WatchPad">
<State>
- <Value>myUdp.controlList.Count</Value>
+ <Value>btnLightPower.Tag.ToString()</Value>
+ <Value>response.StatusCode</Value>
+ <Value>view3.Tag</Value>
+ <Value>btn.Tag.ToString()</Value>
+ <Value>item</Value>
+ <Value>functionCategory</Value>
</State>
</Pad>
</Pads>
@@ -66,16 +68,9 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.364c4b3158493098" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore>
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs" line="76" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs" line="56" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/AppUnlockPage.cs" relfile="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" line="18" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/Control_Udp_Bus.cs" relfile="HDL_ON/DriverLayer/Control_Udp_Bus.cs" line="694" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/Control_TcpServer.cs" relfile="HDL_ON/DriverLayer/Control_TcpServer.cs" line="197" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" relfile="HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" line="49" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0