From d53e6af2c5f17838fa79659614b15a2a1f383399 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 31 三月 2023 10:04:58 +0800
Subject: [PATCH] 1
---
Crabtree/ON/ON.Droid.csproj | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/Crabtree/ON/ON.Droid.csproj b/Crabtree/ON/ON.Droid.csproj
index f3eb8e4..a88555b 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.10.0\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,12 +13,12 @@
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
- <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidTlsProvider></AndroidTlsProvider>
<AndroidSupportedAbis>armeabi-v7a</AndroidSupportedAbis>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+ <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -33,6 +33,8 @@
<AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
<AndroidSupportedAbis>armeabi-v7a</AndroidSupportedAbis>
<AndroidDexTool>d8</AndroidDexTool>
+ <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+ <AndroidLinkMode>Full</AndroidLinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@@ -50,6 +52,7 @@
<NoWarn></NoWarn>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
+<AndroidPackageFormat>apk</AndroidPackageFormat>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -68,22 +71,22 @@
<HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Android.Bindings">
- <HintPath>..\packages\Microsoft.AppCenter.4.0.0\lib\MonoAndroid50\Microsoft.AppCenter.Android.Bindings.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.4.1.0\lib\MonoAndroid50\Microsoft.AppCenter.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter">
- <HintPath>..\packages\Microsoft.AppCenter.4.0.0\lib\MonoAndroid50\Microsoft.AppCenter.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.4.1.0\lib\MonoAndroid50\Microsoft.AppCenter.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics.Android.Bindings">
- <HintPath>..\packages\Microsoft.AppCenter.Analytics.4.0.0\lib\MonoAndroid50\Microsoft.AppCenter.Analytics.Android.Bindings.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.Analytics.4.1.0\lib\MonoAndroid50\Microsoft.AppCenter.Analytics.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics">
- <HintPath>..\packages\Microsoft.AppCenter.Analytics.4.0.0\lib\MonoAndroid50\Microsoft.AppCenter.Analytics.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.Analytics.4.1.0\lib\MonoAndroid50\Microsoft.AppCenter.Analytics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes.Android.Bindings">
- <HintPath>..\packages\Microsoft.AppCenter.Crashes.4.0.0\lib\MonoAndroid50\Microsoft.AppCenter.Crashes.Android.Bindings.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.Crashes.4.1.0\lib\MonoAndroid50\Microsoft.AppCenter.Crashes.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes">
- <HintPath>..\packages\Microsoft.AppCenter.Crashes.4.0.0\lib\MonoAndroid50\Microsoft.AppCenter.Crashes.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.Crashes.4.1.0\lib\MonoAndroid50\Microsoft.AppCenter.Crashes.dll</HintPath>
</Reference>
<Reference Include="zxing.portable">
<HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\zxing.portable.dll</HintPath>
@@ -122,7 +125,7 @@
<HintPath>..\packages\Xamarin.Android.Support.v4.28.0.0.3\lib\monoandroid80\Xamarin.Android.Support.v4.dll</HintPath>
</Reference>
<Reference Include="MQTTnet">
- <HintPath>..\packages\MQTTnet.3.0.13\lib\netstandard2.1\MQTTnet.dll</HintPath>
+ <HintPath>..\packages\MQTTnet.3.0.15\lib\netstandard2.1\MQTTnet.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
<HintPath>..\SmartHome\dll\Android\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
@@ -158,11 +161,12 @@
<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>
+ <HintPath>..\packages\Xamarin.Essentials.1.6.1\lib\monoandroid80\Xamarin.Essentials.dll</HintPath>
</Reference>
<Reference Include="RestSharp">
<HintPath>..\packages\RestSharp.106.11.7\lib\netstandard2.0\RestSharp.dll</HintPath>
</Reference>
+ <Reference Include="Mono.Android.Export" />
</ItemGroup>
<ItemGroup>
<Compile Include="Resources\Resource.designer.cs" />
@@ -171,10 +175,10 @@
<Compile Include="MyReceiver.cs" />
<Compile Include="Scan.cs" />
<Compile Include="NetworkUtils.cs" />
+ <Compile Include="SplashActivity.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
- <None Include="Properties\AndroidManifest.xml" />
<None Include="Assets\AboutAssets.txt" />
<None Include="packages.config" />
<None Include="Libs\armeabi\libjcore126.so" />
@@ -210,6 +214,7 @@
<None Include="Libs\armeabi\libPlayCtrl.so" />
<None Include="Libs\armeabi\libStunClientSDK.so" />
<None Include="Libs\armeabi\libSystemTransform.so" />
+ <None Include="Properties\AndroidManifest.xml" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\Main.axml" />
@@ -227,6 +232,18 @@
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\xml\network_security_config.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\layer_splash.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\splash_top.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\layout\activity_splash.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
@@ -920,6 +937,7 @@
<AndroidAsset Include="Assets\Phone2\CrabtreeAdd\FromSharing.png" />
<AndroidAsset Include="Assets\Phone2\CrabtreeAdd\WiFiOffline.png" />
<AndroidAsset Include="Assets\Phone2\CrabtreeAdd\CloudOffline.png" />
+ <AndroidAsset Include="Assets\Phone2\CrabtreeAdd\Speaker.png" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.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')" />
--
Gitblit v1.8.0