From 2d414e3b007f750cdad4f9e4a7c04db696bca5e4 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 23 四月 2020 16:13:59 +0800
Subject: [PATCH] 2020-04-23 1.优化远程连接提示，改为Loading方案，防止连接过程用户点击重连图标。 2.点击网络检测图标会判断，是否正在远程连接，如果是，会弹窗提示用户”正在远程连接，是否仍要重新检测“。 3.Help 增加隐藏长按功能，长按后，可以开启远程过程异常弹窗提示。长按后关闭。
---
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 57 ++++++++++++---------------------------------------------
1 files changed, 12 insertions(+), 45 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 1f5b722..7a5ad9e 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,59 +1,26 @@
锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
- <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToLight.cs">
+ <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.364c4b3158493098" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/MqttCommon.cs">
<Files>
- <File FileName="ON.Ios/Resources/Language.ini" Line="261" Column="4" IsPinned="True" />
- <File FileName="SmartHome/UI/SimpleControl/R.cs" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToLight.cs" Line="693" Column="65" />
- <File FileName="SmartHome/HDL/Operation/ResponseEntity/ErrorCode.cs" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.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="35" Column="33" />
<File FileName="SmartHome/UI/SimpleControl/MainPage.cs" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs" />
- <File FileName="SmartHome/HDL/Operation/Control.cs" Line="317" Column="33" />
- <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/System/SystemWirelessGateway.cs" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/AC/UserDeviceToAC.cs" Line="365" Column="65" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" />
- <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="504" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs" Line="526" Column="26" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Fan/UserDeviceToFan.cs" Line="325" Column="30" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs" Line="426" Column="59" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Scene/SceneMethod.cs" Line="472" Column="40" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Light/UserLightPage.cs" Line="379" Column="25" />
- <File FileName="SmartHome/HDL/Operation/BusSocket.cs" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs" Line="1" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs" Line="1" Column="1" />
- <File FileName="ON.Ios/Info.plist" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Light/SendControl.cs" Line="1" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs" Line="1880" Column="71" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/MqttCommon.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="Shared" 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="AC" expanded="True" />
- <Node name="Curtain" expanded="True" />
- <Node name="Fan" expanded="True" />
- <Node name="Light" expanded="True">
- <Node name="UserDeviceToLight.cs" selected="True" />
- </Node>
<Node name="Register" expanded="True" />
- <Node name="Room" expanded="True" />
- <Node name="Scene" expanded="True" />
- <Node name="User" expanded="True" />
</Node>
+ <Node name="MqttCommon.cs" selected="True" />
</Node>
</Node>
</Node>
@@ -64,13 +31,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="Debug|iPhoneSimulator" />
- <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.446FF651-C1E0-4C68-805D-F62274849738" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|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