From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL-ON_Android/HDL-ON_Android.csproj | 84 +++++++++++++++++++-----------------------
1 files changed, 38 insertions(+), 46 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index ac42475..f456c11 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>
@@ -67,6 +67,7 @@
<AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
<AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
<AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis>
+<AndroidPackageFormat>aab</AndroidPackageFormat>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -77,9 +78,6 @@
<Reference Include="System.Numerics.Vectors" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Net" />
- <Reference Include="Shared.Droid.HDLWidget">
- <HintPath>..\DLL\Shared.Droid.HDLWidget.dll</HintPath>
- </Reference>
<Reference Include="Shared.Droid.Smartrefresh">
<HintPath>..\DLL\Android\Shared.Droid.Smartrefresh.dll</HintPath>
</Reference>
@@ -152,15 +150,6 @@
<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="Mono.Android.Export" />
<Reference Include="ScanSdk">
<HintPath>..\DLL\Scan\ScanSdk.dll</HintPath>
@@ -186,17 +175,14 @@
<Reference Include="LcVideoSdk">
<HintPath>..\DLL\LC\Android\LcVideoSdk.dll</HintPath>
</Reference>
+ <Reference Include="Aliyun.Api.LogService">
+ <HintPath>..\..\绗笁鏂瑰姛鑳絓闃块噷浜慭Net Code\Aliyun.Api.LogService.dll</HintPath>
+ </Reference>
<Reference Include="Shared.Droid">
<HintPath>..\DLL\Android\Shared.Droid.dll</HintPath>
</Reference>
- <Reference Include="HdlEzvizDroid">
- <HintPath>..\DLL\Android\HdlEzvizDroid.dll</HintPath>
- </Reference>
- <Reference Include="Aliyun.Api.LogService">
- <HintPath>..\DLL\Aliyun.Api.LogService.dll</HintPath>
- </Reference>
- <Reference Include="Shared.Droid.JPush">
- <HintPath>..\..\绗笁鏂瑰姛鑳絓鏋佸厜\Sdk5.4.0\2024-07-19\Shared.Droid.JPush.dll</HintPath>
+ <Reference Include="Shared.Droid.HDLWidget">
+ <HintPath>..\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>
</Reference>
<Reference Include="Shared.Droid.HDLLinphone">
<HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
@@ -206,7 +192,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="MainActivity.cs" />
<Compile Include="Other\JPush\JPushFirmBroadcast.cs" />
<Compile Include="Other\JPush\JPushOpenClickActivity.cs" />
<Compile Include="Resources\Resource.designer.cs" />
@@ -219,11 +204,6 @@
<Compile Include="Other\JLCountrycode.cs" />
<Compile Include="Other\JPush\JPushReceiver.cs" />
<Compile Include="Other\JPush\JPushService.cs" />
- <Compile Include="VideoActivity.cs" />
- <Compile Include="FengLinVideo\Interface\VideoState.cs" />
- <Compile Include="FengLinVideo\Form\MonitorFragment.cs" />
- <Compile Include="FengLinVideo\Form\ReverseCallFragment.cs" />
- <Compile Include="FengLinVideo\widget\TipDiaglog.cs" />
<Compile Include="LeChengVideo\Form\MonitorFragment.cs" />
<Compile Include="LeChengVideo\Form\ReverseCallFragment.cs" />
<Compile Include="LeChengVideoActivity.cs" />
@@ -233,7 +213,6 @@
<Compile Include="Zxing\CustomCaptureActivity.cs" />
<Compile Include="Zxing\ScanActivity.cs" />
<Compile Include="LeChengVideo\LeTest.cs" />
- <Compile Include="Other\LocationUtils.cs" />
<Compile Include="Other\MyLocationListener_V2.cs" />
</ItemGroup>
<ItemGroup>
@@ -564,21 +543,7 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricaltvhisense.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\aks.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\like.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\caidan.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\offbj.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\offtvbj.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\onbj.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\shouye.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjia.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjian.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\electricaltvhisense.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricaltvhisense_blue.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\guan.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\kai.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\kaiguanSelected.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\shouyeSelected.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjianSelected.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjiaSelected.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
<AndroidAsset Include="Assets\Phone\Collection\GatewayOnlineTipIcon.png" />
@@ -628,6 +593,8 @@
<AndroidAsset Include="Assets\Phone\LogicIcon\electricaltvhisense.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Icon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Bg.png" />
+ <None Include="libs\armeabi-v7a\libjcore212.so" />
+ <None Include="libs\arm64-v8a\libjcore212.so" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_1.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_3.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_2.png" />
@@ -669,6 +636,9 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconDischarg100.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconFault100.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconShutdown100.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\TokenInvalidTipIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\RightIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\Power80pIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -995,7 +965,6 @@
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
- <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>28.0.0.3</Version>
</PackageReference>
@@ -1020,8 +989,23 @@
<PackageReference Include="Square.OkHttp3">
<Version>3.14.4</Version>
</PackageReference>
- <PackageReference Include="Google.Protobuf">
- <Version>3.5.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>
+ <PackageReference Include="Xamarin.AndroidX.Browser">
+ <Version>1.8.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AspNet.WebApi.Client">
<Version>5.2.4</Version>
@@ -1031,6 +1015,9 @@
</PackageReference>
<PackageReference Include="lz4net">
<Version>1.0.15.93</Version>
+ </PackageReference>
+ <PackageReference Include="Google.Protobuf">
+ <Version>3.5.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -1885,9 +1872,14 @@
<Folder Include="Assets\Phone\FunctionIcon\Inverter\" />
<Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" />
<Folder Include="Assets\Phone\AksIcon\" />
- <Folder Include="Assets\Phone\HisenseTv\" />
<Folder Include="Assets\Phone\FunctionIcon\GroupControl\" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\OnPro_JPush\OnPro_JPush.csproj">
+ <Project>{723098FE-214B-4E79-A5D0-DA31B9366611}</Project>
+ <Name>OnPro_JPush</Name>
+ </ProjectReference>
+ </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" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
--
Gitblit v1.8.0