From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 06 六月 2023 11:51:12 +0800 Subject: [PATCH] Merge branch 'Dev-Branch' --- HDL-ON_Android/HDL-ON_Android.csproj | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj index 18901d3..361fa47 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,7 @@ <Compile Include="Zxing\CustomCaptureActivity.cs" /> <Compile Include="Zxing\ScanActivity.cs" /> <Compile Include="LeChengVideo\LeTest.cs" /> + <Compile Include="Other\LocationUtils.cs" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\agconnect-services.json" /> @@ -416,12 +420,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" /> @@ -781,6 +786,9 @@ </PackageReference> <PackageReference Include="Square.OkHttp3"> <Version>3.14.4</Version> + </PackageReference> + <PackageReference Include="Bugly"> + <Version>4.3.1</Version> </PackageReference> </ItemGroup> <ItemGroup> @@ -1635,12 +1643,6 @@ <Folder Include="Assets\Phone\FunctionIcon\Panel\" /> <Folder Include="Assets\Phone\FunctionIcon\Inverter\" /> <Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\ys\ys.csproj"> - <Project>{DF065E3F-C3A1-4908-9582-000974B7C290}</Project> - <Name>ys</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