From 365eadb33ee86b05ac74d408025d102a758c2efd Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 一月 2020 15:27:17 +0800
Subject: [PATCH] 2020-01-10 2020-01-10 1.修改切换本地和远程问题。 2.修改判断住宅网关方案。 3.其它优化修改。
---
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 9d74340..c45ef57 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,47 +1,50 @@
锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
- <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.4b65c46595" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs">
+ <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs">
<Files>
- <File FileName="SmartHome/HDL/Operation/ResponseEntity/API.cs" Line="230" Column="51" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs" Line="506" Column="50" />
- <File FileName="SmartHome/HDL/Operation/ResponseEntity/Alexa.cs" Line="43" Column="34" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/HDL/Operation/Utlis.cs" Line="50" Column="45" />
+ <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="253" Column="73" />
+ <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs" Line="312" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs" Line="1085" Column="50" />
+ <File FileName="SmartHome/HDL/Operation/Device/GatewayBase.cs" />
+ <File FileName="SmartHome/HDL/Operation/Device/Common.cs" />
+ <File FileName="ON/Properties/AndroidManifest.xml" />
+ <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="185" Column="36" />
+ <File FileName="SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs" Line="20" Column="22" />
+ <File FileName="SmartHome/HDL/Operation/UserConfig.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs" Line="455" Column="73" />
+ <File FileName="SmartHome/HDL/Operation/ResponseEntity/SendJson.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="SmartHome" expanded="True">
- <Node name="ON.Ios" expanded="True">
+ <Node name="ON.Droid" expanded="True">
+ <Node name="Properties" expanded="True" />
<Node name="Resources" expanded="True" />
</Node>
+ <Node name="ON.Ios" expanded="True" />
<Node name="Shared" expanded="True">
- <Node name="DLL" expanded="True" />
<Node name="HDL" expanded="True">
<Node name="Operation" expanded="True">
<Node name="Device" expanded="True" />
<Node name="ResponseEntity" expanded="True" />
</Node>
</Node>
- <Node name="IO" expanded="True" />
- <Node name="Net" expanded="True" />
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
<Node name="Alexa" expanded="True" />
- <Node name="Guide" expanded="True" />
- <Node name="Panel" expanded="True" />
- <Node name="Register" expanded="True">
- <Node name="AccountLogin.cs" selected="True" />
+ <Node name="Guide" expanded="True">
+ <Node name="GuideSettingGateway.cs" selected="True" />
</Node>
+ <Node name="Light" expanded="True" />
+ <Node name="Register" expanded="True" />
<Node name="Room" expanded="True" />
<Node name="Schedule" expanded="True" />
- <Node name="Security" expanded="True" />
<Node name="Sensor" expanded="True" />
- <Node name="System" expanded="True" />
- <Node name="TV" expanded="True" />
- <Node name="UniversalDevice" expanded="True" />
<Node name="User" expanded="True" />
- <Node name="Warning" expanded="True" />
</Node>
</Node>
</Node>
@@ -53,15 +56,18 @@
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.ItemProperties.DroidService PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.ItemProperties.DroidLib PreferredExecutionTarget="Android.SelectDevice" />
+ <MonoDevelop.Ide.ItemProperties.DroidLib PreferredExecutionTarget="Android.822QECU5228FU" />
<DisabledProjects>
<String>Shared.Droid/Shared.Droid.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.254b82433419c7ca1850b1dfb524c79b7aeb0640" />
+ <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.254b82433419c7ca1850b1dfb524c79b7aeb0640" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/hdl/Desktop/APP/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs" relfile="SmartHome/UI/SimpleControl/MainPage.cs" line="233" column="1" />
+ <Breakpoint file="/Users/hdl/Desktop/APP/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs" relfile="SmartHome/UI/SimpleControl/MainPage.cs" line="225" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0