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/ON/ON.Droid.csproj | 65 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 25 deletions(-)
diff --git a/Crabtree/ON/ON.Droid.csproj b/Crabtree/ON/ON.Droid.csproj
index 3289ad9..035e83c 100644
--- a/Crabtree/ON/ON.Droid.csproj
+++ b/Crabtree/ON/ON.Droid.csproj
@@ -121,32 +121,38 @@
<Reference Include="Xamarin.Android.Support.v4">
<HintPath>..\packages\Xamarin.Android.Support.v4.28.0.0.3\lib\monoandroid80\Xamarin.Android.Support.v4.dll</HintPath>
</Reference>
- <Reference Include="Xamarin.Android.Support.v7.AppCompat">
- <HintPath>..\..\..\CommonLib\android\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
- </Reference>
- <Reference Include="Xamarin.Android.Support.Vector.Drawable">
- <HintPath>..\..\..\CommonLib\android\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
- </Reference>
- <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
- <HintPath>..\..\..\CommonLib\android\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
- </Reference>
- <Reference Include="Shared.Droid.TouchID">
- <HintPath>..\SmartHome\dll\Shared.Droid.TouchID.dll</HintPath>
- </Reference>
- <Reference Include="Shared.Droid">
- <HintPath>..\SmartHome\dll\Shared.Droid.dll</HintPath>
- </Reference>
- <Reference Include="Shared.Droid.PickerView">
- <HintPath>..\SmartHome\dll\Shared.Droid.PickerView.dll</HintPath>
- </Reference>
- <Reference Include="Shared.Droid.TBL">
- <HintPath>..\SmartHome\dll\Shared.Droid.TBL.dll</HintPath>
- </Reference>
- <Reference Include="Shared.Droid.TCL">
- <HintPath>..\SmartHome\dll\Shared.Droid.TCL.dll</HintPath>
- </Reference>
<Reference Include="MQTTnet">
<HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid">
+ <HintPath>..\SmartHome\dll\Android\Shared.Droid.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.HDLWidget">
+ <HintPath>..\SmartHome\dll\Android\Shared.Droid.HDLWidget.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.Smartrefresh">
+ <HintPath>..\SmartHome\dll\Android\Shared.Droid.Smartrefresh.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.TouchID">
+ <HintPath>..\SmartHome\dll\Android\Shared.Droid.TouchID.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
+ <HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.28.0.0.3\lib\monoandroid80\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Design">
+ <HintPath>..\packages\Xamarin.Android.Support.Design.28.0.0.3\lib\monoandroid80\Xamarin.Android.Support.Design.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.AppCompat">
+ <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.28.0.0.3\lib\monoandroid80\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
+ <HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.3\lib\monoandroid80\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Vector.Drawable">
+ <HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.3\lib\monoandroid80\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Transition">
+ <HintPath>..\packages\Xamarin.Android.Support.Transition.28.0.0.3\lib\monoandroid80\Xamarin.Android.Support.Transition.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -207,6 +213,10 @@
<AndroidResource Include="Resources\values\Styles.xml" />
<AndroidResource Include="Resources\drawable\PadLoading.png" />
<AndroidResource Include="Resources\xml\network_security_config.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\xml\file_paths.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
@@ -911,7 +921,6 @@
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets')" />
- <Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.3\build\monoandroid60\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.3\build\monoandroid60\Xamarin.Android.Support.Vector.Drawable.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.Annotations.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Annotations.targets')" />
<Import Project="..\packages\Xamarin.Android.Arch.Core.Common.1.1.1.3\build\monoandroid80\Xamarin.Android.Arch.Core.Common.targets" Condition="Exists('..\packages\Xamarin.Android.Arch.Core.Common.1.1.1.3\build\monoandroid80\Xamarin.Android.Arch.Core.Common.targets')" />
<Import Project="..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.1.1.3\build\monoandroid80\Xamarin.Android.Arch.Lifecycle.Common.targets" Condition="Exists('..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.1.1.3\build\monoandroid80\Xamarin.Android.Arch.Lifecycle.Common.targets')" />
@@ -923,4 +932,10 @@
<Import Project="..\packages\Xamarin.Android.Support.Media.Compat.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Media.Compat.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Media.Compat.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.v4.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.v4.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v4.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.v4.targets')" />
<Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
+ <Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Vector.Drawable.targets')" />
+ <Import Project="..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.v7.RecyclerView.targets')" />
+ <Import Project="..\packages\Xamarin.Android.Support.Transition.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Transition.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Transition.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Transition.targets')" />
+ <Import Project="..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
+ <Import Project="..\packages\Xamarin.Android.Support.v7.AppCompat.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.AppCompat.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.v7.AppCompat.targets')" />
+ <Import Project="..\packages\Xamarin.Android.Support.Design.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Design.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Design.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Design.targets')" />
</Project>
\ No newline at end of file
--
Gitblit v1.8.0