From 51f5f7a47d394163dccf2441cd04c2a19ceeda34 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 08 一月 2024 09:41:59 +0800
Subject: [PATCH] Merge branch 'Dev-Google-V2.4.3' into Google-2023-11-17-1
---
HDL-ON_Android/HDL-ON_Android.csproj | 42 ++++++------------------------------------
1 files changed, 6 insertions(+), 36 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index a784f47..bf61895 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -67,6 +67,7 @@
<AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
<AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
<AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis>
+ <AndroidPackageFormat>apk</AndroidPackageFormat>
</PropertyGroup>
<ItemGroup>
<Reference Include="Shared.Droid.JPush">
@@ -143,29 +144,11 @@
<Reference Include="AndriodBluetoothLibrary">
<HintPath>..\DLL\Android\AndriodBluetoothLibrary.dll</HintPath>
</Reference>
- <Reference Include="cloudp2p">
- <HintPath>..\DLL\FL\Android\cloudp2p.dll</HintPath>
- </Reference>
- <Reference Include="corelooper">
- <HintPath>..\DLL\FL\Android\corelooper.dll</HintPath>
- </Reference>
- <Reference Include="crypt">
- <HintPath>..\DLL\FL\Android\crypt.dll</HintPath>
- </Reference>
<Reference Include="http">
<HintPath>..\DLL\FL\Android\http.dll</HintPath>
</Reference>
- <Reference Include="VideoLibs">
- <HintPath>..\DLL\FL\Android\VideoLibs.dll</HintPath>
- </Reference>
- <Reference Include="videophone">
- <HintPath>..\DLL\FL\Android\videophone.dll</HintPath>
- </Reference>
<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">
@@ -186,17 +169,14 @@
<Reference Include="LcPullToRefreshRecyclerView">
<HintPath>..\DLL\LC\Android\LcPullToRefreshRecyclerView.dll</HintPath>
</Reference>
- <Reference Include="ZxingSDK">
- <HintPath>..\DLL\LC\Android\ZxingSDK.dll</HintPath>
- </Reference>
<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="HdlEzvizDroid">
+ <HintPath>..\..\..\HdlEzvizDroid.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -620,6 +600,8 @@
<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" />
@@ -968,20 +950,8 @@
<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>
</ItemGroup>
<ItemGroup>
--
Gitblit v1.8.0