From 8dd83a4cf2a5bcd9c45f2753f1cfe6844b274cbc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 五月 2024 14:03:19 +0800
Subject: [PATCH] nuget包更新
---
HDL-ON_Android/HDL-ON_Android.csproj | 59 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 6e93f55..376b279 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -17,7 +17,7 @@
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
- <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
@@ -164,9 +164,6 @@
<Reference Include="UMSdkDroid">
<HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath>
</Reference>
- <Reference Include="Shared.Droid.HDLLinphone">
- <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
- </Reference>
<Reference Include="Mono.Android.Export" />
<Reference Include="ScanSdk">
<HintPath>..\DLL\Scan\ScanSdk.dll</HintPath>
@@ -192,11 +189,11 @@
<Reference Include="LcVideoSdk">
<HintPath>..\DLL\LC\Android\LcVideoSdk.dll</HintPath>
</Reference>
- <Reference Include="HdlEzvizDroid">
- <HintPath>..\DLL\HdlEzvizDroid.dll</HintPath>
- </Reference>
<Reference Include="Shared.Droid">
<HintPath>..\DLL\Android\Shared.Droid.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.HDLLinphone">
+ <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -600,6 +597,28 @@
<AndroidAsset Include="Assets\h5\static\js\index.3517131b.js" />
<AndroidAsset Include="Assets\h5\static\js\chunk-vendors.56c88730.js" />
<AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.e5e9499f.js" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_off_home_click.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_off_home.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_off.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on_home_click.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on_home.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensordryContact.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorpir_hold.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensordryContact_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensordryContact_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorpir_hold_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorpir_hold_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorlight.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_off_home_click.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_off_home.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_off.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_on_home_click.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_on_home.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_on.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\electricaltvhisense.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Icon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Bg.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -948,20 +967,23 @@
<PackageReference Include="Xamarin.Android.Support.Constraint.Layout.Solver">
<Version>1.1.0</Version>
</PackageReference>
- <PackageReference Include="Microsoft.AppCenter.Crashes">
- <Version>4.2.0</Version>
- </PackageReference>
- <PackageReference Include="Microsoft.AppCenter.Analytics">
- <Version>4.2.0</Version>
- </PackageReference>
- <PackageReference Include="Microsoft.AppCenter">
- <Version>4.2.0</Version>
- </PackageReference>
<PackageReference Include="Square.OkHttp3">
<Version>3.14.4</Version>
</PackageReference>
- <PackageReference Include="Bugly">
- <Version>4.3.1</Version>
+ <PackageReference Include="Xamarin.Google.Android.Material">
+ <Version>1.10.0.3</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
+ <Version>2.7.0.1</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.AndroidX.DataBinding.ViewBinding">
+ <Version>8.3.2</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.AndroidX.ConstraintLayout.Solver">
+ <Version>2.0.4.18</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4">
+ <Version>1.0.0.23</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -1817,6 +1839,7 @@
<Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" />
<Folder Include="Assets\Phone\AksIcon\" />
<Folder Include="Assets\Phone\HisenseTv\" />
+ <Folder Include="Assets\Phone\FunctionIcon\GroupControl\" />
</ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
--
Gitblit v1.8.0