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 | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj index d760217..bf61895 100644 --- a/HDL-ON_Android/HDL-ON_Android.csproj +++ b/HDL-ON_Android/HDL-ON_Android.csproj @@ -67,7 +67,7 @@ <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass> <AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias> <AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis> - <AndroidPackageFormat>aab</AndroidPackageFormat> + <AndroidPackageFormat>apk</AndroidPackageFormat> </PropertyGroup> <ItemGroup> <Reference Include="Shared.Droid.JPush"> @@ -174,6 +174,9 @@ </Reference> <Reference Include="Shared.Droid"> <HintPath>..\DLL\Android\Shared.Droid.dll</HintPath> + </Reference> + <Reference Include="HdlEzvizDroid"> + <HintPath>..\..\..\HdlEzvizDroid.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -597,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" /> -- Gitblit v1.8.0