From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 11 一月 2021 16:11:20 +0800
Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善
---
Crabtree/ON/ON.Droid.csproj | 102 ++++++++++++++++++++++++++++++---------------------
1 files changed, 60 insertions(+), 42 deletions(-)
diff --git a/Crabtree/ON/ON.Droid.csproj b/Crabtree/ON/ON.Droid.csproj
index d5e2769..f3eb8e4 100644
--- a/Crabtree/ON/ON.Droid.csproj
+++ b/Crabtree/ON/ON.Droid.csproj
@@ -1,6 +1,6 @@
锘�<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props')" />
<Import Project="..\SmartHome\SmartHome.projitems" Label="Shared" Condition="Exists('..\SmartHome\SmartHome.projitems')" />
- <Import Project="..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -62,34 +62,34 @@
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="Newtonsoft.Json">
- <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="FastAndroidCamera">
<HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Android.Bindings">
- <HintPath>..\packages\Microsoft.AppCenter.1.7.0\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.4.0.0\lib\MonoAndroid50\Microsoft.AppCenter.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter">
- <HintPath>..\packages\Microsoft.AppCenter.1.7.0\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.4.0.0\lib\MonoAndroid50\Microsoft.AppCenter.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics.Android.Bindings">
- <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.7.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.Android.Bindings.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.Analytics.4.0.0\lib\MonoAndroid50\Microsoft.AppCenter.Analytics.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics">
- <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.7.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.Analytics.4.0.0\lib\MonoAndroid50\Microsoft.AppCenter.Analytics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes.Android.Bindings">
- <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.7.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.Crashes.4.0.0\lib\MonoAndroid50\Microsoft.AppCenter.Crashes.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes">
- <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.7.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.Crashes.4.0.0\lib\MonoAndroid50\Microsoft.AppCenter.Crashes.dll</HintPath>
</Reference>
<Reference Include="zxing.portable">
- <HintPath>..\packages\ZXing.Net.Mobile.1.5.4.0\lib\MonoAndroid403\zxing.portable.dll</HintPath>
+ <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\zxing.portable.dll</HintPath>
</Reference>
<Reference Include="ZXingNetMobile">
- <HintPath>..\packages\ZXing.Net.Mobile.1.5.4.0\lib\MonoAndroid403\ZXingNetMobile.dll</HintPath>
+ <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXingNetMobile.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Annotations">
<HintPath>..\packages\Xamarin.Android.Support.Annotations.28.0.0.3\lib\monoandroid80\Xamarin.Android.Support.Annotations.dll</HintPath>
@@ -121,32 +121,47 @@
<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="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>
+ <HintPath>..\packages\MQTTnet.3.0.13\lib\netstandard2.1\MQTTnet.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
- <HintPath>..\SmartHome\dll\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+ <HintPath>..\SmartHome\dll\Android\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Design">
+ <HintPath>..\SmartHome\dll\Android\Xamarin.Android.Support.Design.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
- <HintPath>..\SmartHome\dll\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+ <HintPath>..\SmartHome\dll\Android\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
+ <HintPath>..\SmartHome\dll\Android\Xamarin.Android.Support.v7.RecyclerView.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.Vector.Drawable">
- <HintPath>..\SmartHome\dll\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
+ <HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.3\lib\monoandroid80\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
+ </Reference>
+ <Reference Include="ZXing.Net.Mobile.Core">
+ <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXing.Net.Mobile.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.CustomTabs">
+ <HintPath>..\packages\Xamarin.Android.Support.CustomTabs.28.0.0.3\lib\monoandroid80\Xamarin.Android.Support.CustomTabs.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Essentials">
+ <HintPath>..\packages\Xamarin.Essentials.1.6.0\lib\monoandroid80\Xamarin.Essentials.dll</HintPath>
+ </Reference>
+ <Reference Include="RestSharp">
+ <HintPath>..\packages\RestSharp.106.11.7\lib\netstandard2.0\RestSharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -155,6 +170,7 @@
<Compile Include="Application.cs" />
<Compile Include="MyReceiver.cs" />
<Compile Include="Scan.cs" />
+ <Compile Include="NetworkUtils.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
@@ -206,6 +222,14 @@
<AndroidResource Include="Resources\drawable\Loading.png" />
<AndroidResource Include="Resources\values\Styles.xml" />
<AndroidResource Include="Resources\drawable\PadLoading.png" />
+ <AndroidResource Include="Resources\xml\file_paths.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\xml\network_security_config.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\drawable\" />
@@ -893,20 +917,11 @@
<AndroidAsset Include="Assets\Phone2\CrabtreeAdd\DimmerOn.png" />
<AndroidAsset Include="Assets\Phone2\CrabtreeAdd\Dimmer.png" />
<AndroidAsset Include="Assets\Phone2\TV\DownIRCodeIcon.png" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\DroidService\DroidService.csproj">
- <Project>{CE1A32D2-147D-406D-B194-7820468301D4}</Project>
- <Name>DroidService</Name>
- </ProjectReference>
- <ProjectReference Include="..\DroidLib\DroidLib.csproj">
- <Project>{47EFF987-3192-4A56-A463-A940F245FF7D}</Project>
- <Name>DroidLib</Name>
- </ProjectReference>
+ <AndroidAsset Include="Assets\Phone2\CrabtreeAdd\FromSharing.png" />
+ <AndroidAsset Include="Assets\Phone2\CrabtreeAdd\WiFiOffline.png" />
+ <AndroidAsset Include="Assets\Phone2\CrabtreeAdd\CloudOffline.png" />
</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')" />
@@ -917,5 +932,8 @@
<Import Project="..\packages\Xamarin.Android.Support.Fragment.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Fragment.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.Fragment.targets')" />
<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\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+ <Import Project="..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets')" />
+ <Import Project="..\packages\Xamarin.Android.Support.CustomTabs.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.CustomTabs.targets" Condition="Exists('..\packages\Xamarin.Android.Support.CustomTabs.28.0.0.3\build\monoandroid80\Xamarin.Android.Support.CustomTabs.targets')" />
</Project>
\ No newline at end of file
--
Gitblit v1.8.0