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 | 40 +++++++++++++++-------------------------
1 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 0b06aeb..a3070ea 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,21 +1,17 @@
锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
- <MonoDevelop.Ide.ItemProperties.ON.Droid AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.364c4b3158493098" />
<MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="293" Column="37" />
- <File FileName="SmartHome/UI/SimpleControl/R.cs" Line="1" Column="1" />
- <File FileName="packages/Xamarin.Essentials.1.5.2/readme.txt" Line="1" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs" Line="891" Column="37" />
- <File FileName="SmartHome/IO/FileUtils.cs" Line="250" Column="23" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/UniversalDevice/UserUniversalPage.cs" Line="167" Column="24" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/UniversalDevice/UserDeviceToUniversalDevice.cs" Line="307" Column="93" />
- <File FileName="SmartHome/UI/SimpleControl/CommonPage.cs" Line="2270" Column="22" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs" Line="7" Column="36" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs" Line="1160" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs" Line="97" Column="71" />
- <File FileName="SmartHome/HDL/Operation/Device/Room.cs" Line="158" Column="25" />
- <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="40" Column="56" />
+ <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="ON.Ios/AppDelegate.cs" Line="294" Column="22" />
+ <File FileName="ON.Ios/ViewController.cs" Line="39" Column="77" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -24,21 +20,15 @@
<Node name="ON.Droid" expanded="True" selected="True">
<Node name="Properties" expanded="True" />
</Node>
+ <Node name="ON.Ios" expanded="True" />
<Node name="Shared" expanded="True">
- <Node name="HDL" expanded="True" />
- <Node name="IO" expanded="True" />
+ <Node name="HDL" expanded="True">
+ <Node name="Operation" expanded="True" />
+ </Node>
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
- <Node name="Light" expanded="True" />
<Node name="Register" expanded="True" />
- <Node name="Room" expanded="True" />
- <Node name="Scene" expanded="True" />
- <Node name="Schedule" expanded="True" />
- <Node name="Security" expanded="True" />
- <Node name="Sensor" expanded="True" />
- <Node name="System" expanded="True" />
- <Node name="UniversalDevice" expanded="True" />
</Node>
</Node>
</Node>
@@ -50,10 +40,10 @@
</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|iPhone" />
<MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.254b82433419c7ca1850b1dfb524c79b7aeb0640" />
--
Gitblit v1.8.0