From 126f59cbba2e1505c191b22c9794d810cdedb4c3 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 24 四月 2020 15:39:05 +0800
Subject: [PATCH] 2020-04-24 1.优化远程连接和控制，增加远程连接让用户等待的Loading提示。
---
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 43 +++++++++++++++----------------------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index b448b8d..a3070ea 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,17 +1,17 @@
-锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
- <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.4b65c46595" />
+锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
+ <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.364c4b3158493098" />
<MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" Line="31" Column="21" IsPinned="True" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs" />
- <File FileName="SmartHome/HDL/Operation/MyEnum.cs" />
- <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="269" Column="66" />
- <File FileName="ON/Properties/AssemblyInfo.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" Line="84" Column="50" IsPinned="True" />
+ <File FileName="../../../2020/娴嬭瘯/SmartHome/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" Line="51" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="41" Column="56" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="241" Column="64" />
+ <File FileName="SmartHome/HDL/Operation/Utlis.cs" />
<File FileName="ON/Properties/AndroidManifest.xml" />
- <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="42" Column="58" />
- <File FileName="ON/Application.cs" Line="1" Column="1" />
- <File FileName="ON.Ios/Info.plist" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs" Line="1" Column="1" />
+ <File FileName="ON.Ios/AppDelegate.cs" Line="294" Column="22" />
+ <File FileName="ON.Ios/ViewController.cs" Line="39" Column="77" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -23,25 +23,12 @@
<Node name="ON.Ios" expanded="True" />
<Node name="Shared" expanded="True">
<Node name="HDL" expanded="True">
- <Node name="Operation" expanded="True">
- <Node name="ResponseEntity" expanded="True" />
- </Node>
+ <Node name="Operation" expanded="True" />
</Node>
- <Node name="IO" expanded="True" />
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
- <Node name="AC" expanded="True" />
- <Node name="Alexa" expanded="True" />
- <Node name="Curtain" expanded="True" />
- <Node name="Fan" expanded="True" />
- <Node name="FresAir" expanded="True" />
- <Node name="Guide" expanded="True" />
- <Node name="Light" expanded="True" />
<Node name="Register" expanded="True" />
- <Node name="Room" expanded="True" />
- <Node name="Scene" expanded="True" />
- <Node name="User" expanded="True" />
</Node>
</Node>
</Node>
@@ -53,13 +40,13 @@
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.ItemProperties.DroidService PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.ItemProperties.DroidLib PreferredExecutionTarget="Android.SelectDevice" />
<DisabledProjects>
<String>Shared.Droid/Shared.Droid.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
+ <String>DroidLib/DroidLib.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
- <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.446FF651-C1E0-4C68-805D-F62274849738" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
+ <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.254b82433419c7ca1850b1dfb524c79b7aeb0640" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
--
Gitblit v1.8.0