From f441a3c49f8b5cedee3e4def6fbb448ef40eb9cb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 10 六月 2020 14:46:58 +0800
Subject: [PATCH] Crabtree-ON 2020-06-10 基于最新HDL ON 优化问题，Crabtree-ONAPP部分功能同步修改优化调整 1. 增加大图片大文件上传处理. 2.远程连接交互提示，由原来的Loading修改成顶部Tip提示。 3.灯光全开、全关和场景控制多线程发送，和HDLON同样加锁处理。 4.Android ，判断移动网络失败，网络监测修复方法修改，后台前台切换优化。
---
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 4fe2932..d14d1bc 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,14 +1,38 @@
锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.364c4b3158493098" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.Workbench ActiveDocument="ON/Properties/AndroidManifest.xml">
+ <Files>
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Scene/SceneMethod.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs" Line="1086" Column="22" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToLight.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="195" Column="23" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="51" Column="39" />
+ <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" Line="193" Column="39" />
+ <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="315" Column="27" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" Line="1" Column="1" />
+ <File FileName="ON/Application.cs" Line="178" Column="17" />
+ <File FileName="ON/Resources/xml/file_paths.xml" Line="1" Column="1" />
+ <File FileName="ON/Resources/AboutResources.txt" Line="1" Column="1" />
+ <File FileName="ON/Resources/xml/network_security_config.xml" Line="1" Column="1" />
+ <File FileName="ON/Properties/AndroidManifest.xml" />
+ </Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
- <Node name="SmartHome" expanded="True" />
+ <Node name="SmartHome" expanded="True">
+ <Node name="ON.Droid" expanded="True">
+ <Node name="Properties" expanded="True">
+ <Node name="AndroidManifest.xml" selected="True" />
+ </Node>
+ </Node>
+ <Node name="Shared" expanded="True">
+ <Node name="UI" expanded="True">
+ <Node name="SimpleControl" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
</State>
- </Pad>
- <Pad Id="MonoDevelop.Debugger.WatchPad">
- <State />
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
@@ -19,7 +43,7 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
<String>DroidLib/DroidLib.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.254b82433419c7ca1850b1dfb524c79b7aeb0640" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
--
Gitblit v1.8.0