From 7e42cc13a14b7de31c9f5d5c61cdf24f3246335d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 31 三月 2023 11:36:45 +0800
Subject: [PATCH] 1
---
Crabtree/ON/ON.Droid.csproj | 72 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/Crabtree/ON/ON.Droid.csproj b/Crabtree/ON/ON.Droid.csproj
index c2da06e..ff1416e 100644
--- a/Crabtree/ON/ON.Droid.csproj
+++ b/Crabtree/ON/ON.Droid.csproj
@@ -121,30 +121,46 @@
<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 Include="MQTTnet">
+ <HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath>
</Reference>
<Reference Include="Shared.Droid">
- <HintPath>..\SmartHome\dll\Shared.Droid.dll</HintPath>
+ <HintPath>..\SmartHome\dll\Android\Shared.Droid.dll</HintPath>
</Reference>
- <Reference Include="Shared.Droid.PickerView">
- <HintPath>..\SmartHome\dll\Shared.Droid.PickerView.dll</HintPath>
+ <Reference Include="Shared.Droid.HDLWidget">
+ <HintPath>..\SmartHome\dll\Android\Shared.Droid.HDLWidget.dll</HintPath>
</Reference>
- <Reference Include="Shared.Droid.TBL">
- <HintPath>..\SmartHome\dll\Shared.Droid.TBL.dll</HintPath>
+ <Reference Include="Shared.Droid.Smartrefresh">
+ <HintPath>..\SmartHome\dll\Android\Shared.Droid.Smartrefresh.dll</HintPath>
</Reference>
- <Reference Include="Shared.Droid.TCL">
- <HintPath>..\SmartHome\dll\Shared.Droid.TCL.dll</HintPath>
+ <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>
+ <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.1\lib\monoandroid80\Xamarin.Essentials.dll</HintPath>
+ </Reference>
+ <Reference Include="Java.Interop" />
</ItemGroup>
<ItemGroup>
<Compile Include="Resources\Resource.designer.cs" />
@@ -152,6 +168,7 @@
<Compile Include="Application.cs" />
<Compile Include="MyReceiver.cs" />
<Compile Include="Scan.cs" />
+ <Compile Include="NetworkUtils.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
@@ -203,6 +220,14 @@
<AndroidResource Include="Resources\drawable\Loading.png" />
<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>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\drawable\" />
@@ -212,6 +237,7 @@
<Folder Include="Resources\mipmap-xxhdpi\" />
<Folder Include="Resources\mipmap-xxxhdpi\" />
<Folder Include="Libs\armeabi\" />
+ <Folder Include="Resources\xml\" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Language.ini" />
@@ -890,6 +916,7 @@
<AndroidAsset Include="Assets\Phone2\CrabtreeAdd\DimmerOn.png" />
<AndroidAsset Include="Assets\Phone2\CrabtreeAdd\Dimmer.png" />
<AndroidAsset Include="Assets\Phone2\TV\DownIRCodeIcon.png" />
+ <AndroidAsset Include="Assets\FW_MCIP-L1_RF.01_V03.01_210712_STM32F107VCT6_U2_india_beta.bin" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DroidService\DroidService.csproj">
@@ -903,7 +930,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')" />
@@ -914,4 +940,12 @@
<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\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')" />
+ <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