From 313e9339114e672eb2b281ee323f9f480f980679 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 14 六月 2023 20:37:46 +0800
Subject: [PATCH] Merge branch 'dev-hxb' into Dev-Wxr-1.8.1
---
HDL-ON_Android/HDL-ON_Android.csproj | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 891aed0..198ecfc 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -65,7 +65,7 @@
<AndroidSigningStorePass>85521566</AndroidSigningStorePass>
<AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
<AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
- <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
+ <AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
<Reference Include="Shared.Droid.JPush">
@@ -163,15 +163,6 @@
<Reference Include="videophone">
<HintPath>..\DLL\FL\Android\videophone.dll</HintPath>
</Reference>
- <Reference Include="Square.OkHttp3">
- <HintPath>..\DLL\EZvizMonitor\Square.OkHttp3.dll</HintPath>
- </Reference>
- <Reference Include="Square.OkIO">
- <HintPath>..\DLL\EZvizMonitor\Square.OkIO.dll</HintPath>
- </Reference>
- <Reference Include="ys">
- <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
- </Reference>
<Reference Include="UMSdkDroid">
<HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath>
</Reference>
@@ -203,6 +194,9 @@
<Reference Include="LcVideoSdk">
<HintPath>..\DLL\LC\Android\LcVideoSdk.dll</HintPath>
</Reference>
+ <Reference Include="ys">
+ <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@@ -232,6 +226,11 @@
<Compile Include="Zxing\CustomCaptureActivity.cs" />
<Compile Include="Zxing\ScanActivity.cs" />
<Compile Include="LeChengVideo\LeTest.cs" />
+ <Compile Include="Other\LocationUtils.cs" />
+ <Compile Include="Aliyu\AliyuLogUtil.cs" />
+ <Compile Include="Aliyu\AliyuLogProducerClient.cs" />
+ <Compile Include="Aliyu\LogBean.cs" />
+ <Compile Include="Aliyu\Level.cs" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\agconnect-services.json" />
@@ -420,15 +419,18 @@
<AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
<AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" />
<AndroidAsset Include="Assets\Phone\MusicIcon\currentPlayList.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\CombinedDimmingIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\OneOpenLock.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\RTV.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLocked.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLocking.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorlockClose.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\History.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Cell.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\VideoDoorLockFunctionBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\securitydoorezviz.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorlockClose1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\selectlocation.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -755,7 +757,7 @@
<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.6.0" />
+ <PackageReference Include="Xamarin.Essentials" Version="1.7.5" />
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>28.0.0.3</Version>
</PackageReference>
@@ -777,14 +779,20 @@
<PackageReference Include="Xamarin.Android.Support.Constraint.Layout.Solver">
<Version>1.1.0</Version>
</PackageReference>
- <PackageReference Include="Microsoft.AppCenter">
- <Version>4.2.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>
@@ -1639,6 +1647,13 @@
<Folder Include="Assets\Phone\FunctionIcon\Panel\" />
<Folder Include="Assets\Phone\FunctionIcon\Inverter\" />
<Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" />
+ <Folder Include="Aliyu\" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\AliyuLog\AliyuLog.csproj">
+ <Project>{3A0E9FF9-56B6-4323-9AE6-2B22975E399B}</Project>
+ <Name>AliyuLog</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" />
--
Gitblit v1.8.0