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 | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 18901d3..198ecfc 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -194,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" />
@@ -223,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" />
@@ -416,12 +424,13 @@
<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" />
@@ -748,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>
@@ -781,6 +790,9 @@
</PackageReference>
<PackageReference Include="Square.OkHttp3">
<Version>3.14.4</Version>
+ </PackageReference>
+ <PackageReference Include="Bugly">
+ <Version>4.3.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -1635,11 +1647,12 @@
<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="..\ys\ys.csproj">
- <Project>{DF065E3F-C3A1-4908-9582-000974B7C290}</Project>
- <Name>ys</Name>
+ <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')" />
--
Gitblit v1.8.0