From a9ce331dccd25eee1d0b9193f7853c6e4a07b792 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 14 四月 2020 15:43:57 +0800
Subject: [PATCH] 2020-04-14 1.去掉登录之前ping域名检测，解决客户反馈登录失败的问题 2.替换新的控件库，去掉高德地图。 3.修复创建不了住宅问题。 4.修复增加登陆获取住宅列表时当前住宅判空处理。 5.去掉温度按钮自定义字体。
---
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 31 ++++++++-----------------------
1 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 04cfb3e..cc83d47 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,31 +1,16 @@
-锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
- <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.SelectDevice" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/MainPage.cs">
+锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
+ <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="SmartHome/UI/SimpleControl/Command.cs" Line="19" Column="49" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/System/SystemRemote.cs" Line="170" Column="35" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" Line="247" Column="69" />
- <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" Line="1" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="1" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="122" Column="53" />
- <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="1" Column="1" />
+ <File FileName="ON.Ios/AppDelegate.cs" Line="244" Column="77" />
+ <File FileName="ON.Ios/Info.plist" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="SmartHome" expanded="True">
- <Node name="ON.Droid" expanded="True" />
- <Node name="Shared" expanded="True">
- <Node name="UI" expanded="True">
- <Node name="SimpleControl" expanded="True">
- <Node name="Phone" expanded="True">
- <Node name="Register" expanded="True" />
- <Node name="System" expanded="True" />
- <Node name="User" expanded="True" />
- </Node>
- <Node name="MainPage.cs" selected="True" />
- </Node>
- </Node>
+ <Node name="ON.Ios" expanded="True">
+ <Node name="Info.plist" selected="True" />
</Node>
</Node>
</State>
@@ -40,7 +25,7 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
- <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
+ <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