From ea0b1e8e5f43c5fd0a7d479e25ede3b8cbea464a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 02 十二月 2024 17:17:19 +0800
Subject: [PATCH] tcp;可视对讲；
---
HDL-ON_Android/APP_Android.csproj | 60 ++++++++++++++++++++++--------------------------------------
1 files changed, 22 insertions(+), 38 deletions(-)
diff --git a/HDL-ON_Android/APP_Android.csproj b/HDL-ON_Android/APP_Android.csproj
index 73a94f9..a30ce33 100644
--- a/HDL-ON_Android/APP_Android.csproj
+++ b/HDL-ON_Android/APP_Android.csproj
@@ -69,9 +69,6 @@
<AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Shared.Droid.JPush">
- <HintPath>..\DLL\Shared.Droid.JPush.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
@@ -153,11 +150,17 @@
<Reference Include="ZxingSDK">
<HintPath>..\DLL\LC\Android\ZxingSDK.dll</HintPath>
</Reference>
+ <Reference Include="Shared.Droid.HDLLinphone">
+ <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
+ </Reference>
<Reference Include="Shared.Droid">
<HintPath>..\DLL\Android\Shared.Droid.dll</HintPath>
</Reference>
- <Reference Include="Shared.Droid.HDLLinphone">
- <HintPath>..\..\..\Shared.Droid.HDLLinphone.dll</HintPath>
+ <Reference Include="HdlEzvizDroid">
+ <HintPath>..\DLL\Android\HdlEzvizDroid.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.JPush">
+ <HintPath>..\..\绗笁鏂瑰姛鑳絓鏋佸厜\Sdk5.3.1\Shared.Droid.JPush.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -354,12 +357,6 @@
<AndroidAsset Include="Assets\Phone\LogicIcon\selectlocation.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorfulBar.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\groupControl_blue.png" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
- <AndroidAsset Include="Assets\h5\static\img\inverter-center.18b181f4.png" />
- <AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" />
- <AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" />
- <AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
- <AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorlockUserManager.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\groupControl.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\SeriesIcon.png" />
@@ -529,29 +526,6 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
<AndroidAsset Include="Assets\Phone\Collection\GatewayOnlineTipIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" />
- <AndroidAsset Include="Assets\h5\index.html" />
- <AndroidAsset Include="Assets\h5\static\index.63b34199.css" />
- <AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" />
- <AndroidAsset Include="Assets\h5\static\images\inverter-center.svg" />
- <AndroidAsset Include="Assets\h5\static\images\equal-plant-ic.png" />
- <AndroidAsset Include="Assets\h5\static\images\left-icon-unselect.png" />
- <AndroidAsset Include="Assets\h5\static\images\eidt.png" />
- <AndroidAsset Include="Assets\h5\static\images\switch-off.svg" />
- <AndroidAsset Include="Assets\h5\static\images\circle-ic.png" />
- <AndroidAsset Include="Assets\h5\static\images\inverter-center.png" />
- <AndroidAsset Include="Assets\h5\static\images\pan_ic.png" />
- <AndroidAsset Include="Assets\h5\static\images\right-icon-unselect.png" />
- <AndroidAsset Include="Assets\h5\static\images\up-icon-unselect.png" />
- <AndroidAsset Include="Assets\h5\static\images\switch-on.svg" />
- <AndroidAsset Include="Assets\h5\static\images\inverter-center.webp" />
- <AndroidAsset Include="Assets\h5\static\images\yinying.png" />
- <AndroidAsset Include="Assets\h5\static\images\down-icon-unselect.png" />
- <AndroidAsset Include="Assets\h5\static\images\co2-reduction-ic.png" />
- <AndroidAsset Include="Assets\h5\static\images\left-icon.png" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index.a5a00a32.js" />
- <AndroidAsset Include="Assets\h5\static\js\index.3517131b.js" />
- <AndroidAsset Include="Assets\h5\static\js\chunk-vendors.56c88730.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.e5e9499f.js" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_off_home_click.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_off_home.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_off.png" />
@@ -574,6 +548,8 @@
<AndroidAsset Include="Assets\Phone\LogicIcon\electricaltvhisense.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Icon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Bg.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\stb.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\default_image.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -900,7 +876,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>
@@ -909,9 +884,6 @@
</PackageReference>
<PackageReference Include="MQTTnet">
<Version>3.0.13</Version>
- </PackageReference>
- <PackageReference Include="ZXing.Net.Mobile">
- <Version>2.4.1</Version>
</PackageReference>
<PackageReference Include="RestSharp">
<Version>106.11.7</Version>
@@ -924,6 +896,12 @@
</PackageReference>
<PackageReference Include="Square.OkHttp3">
<Version>3.14.4</Version>
+ </PackageReference>
+ <PackageReference Include="ZXing.Net.Mobile">
+ <Version>2.4.1</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.Essentials">
+ <Version>1.7.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -1781,6 +1759,12 @@
<Folder Include="Assets\Phone\HisenseTv\" />
<Folder Include="Assets\Phone\FunctionIcon\GroupControl\" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Android_Lib_EventBus\Android_Lib_EventBus.csproj">
+ <Project>{97E1B0D8-34AE-4FE4-887B-3B1241D7AE19}</Project>
+ <Name>Android_Lib_EventBus</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