From fd1f19e8479c764fa28b0da3a2f9b34a3debe772 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 03 八月 2023 21:47:04 +0800
Subject: [PATCH] 2023年08月03日21:47:02
---
HDL-ON_Android/HDL-ON_Android.csproj | 133 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 108 insertions(+), 25 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 9ef0e2b..b795dd1 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="HdlEzvizDroid">
+ <HintPath>..\DLL\HdlEzvizDroid.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@@ -223,6 +226,8 @@
<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>
<AndroidAsset Include="Assets\agconnect-services.json" />
@@ -381,8 +386,23 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\securityipcamimou_blue.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\securityipcamimou_white.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\securityipcamimou.png" />
+ <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\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" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorfulBar.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\groupControl_blue.png" />
<AndroidAsset Include="Assets\h5\index.html" />
- <AndroidAsset Include="Assets\h5\static\index.b0707a6a.css" />
+ <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" />
@@ -400,28 +420,96 @@
<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\index.361009bb.js" />
- <AndroidAsset Include="Assets\h5\static\js\chunk-vendors.c6df545a.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index.ab7a6c86.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.d05a76d6.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.44e518f0.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\h5\static\js\index.cf368d6e.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-index-index.cfb4b30d.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\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\DoorlockUserManager.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\groupControl.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\SeriesIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\NfcIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\DigitalPasswordIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\FingerprintIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\DigitalPasswordOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\FingerprintOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\NfcOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\FaceOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\FaceIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\peephole.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\securityipcamez.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\AutomaitcTriggerIcon_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\AutomaitcTriggerIcon_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\FaceUnlockImage.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\ManualTriggerIcon_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\ManualTriggerIcon_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\TouchUnlcokImage.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorlockHelpImage1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorlockHelpImage2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorlockHelpImage3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorlockHelpImage4.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HorseRaceLampIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorlockBatteryManagementBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\groupControl_white.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\HomePagebg.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\bofang.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\caidan.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\dankongdeng.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\dengguan.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\dianshi.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\dianying.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\fanhui.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\gongfang1.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\gongfang2.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\guan.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\huikan.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\jia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\jian.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\jinchucang.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\jingyin.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\kai.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\kauitui.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\kuaijin.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\mubujiang.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\mubusheng.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\pindao1.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\quxiao.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\shang.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\shangyibu.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\shengdao.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\shixuqi.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\tingzhi.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\touping.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xiangshang.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xiangxia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xiayibu.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xinhaoyuan.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xinxi.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xuanze.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yingku.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yingkunext.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yingui.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yingyinzhongkong1.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yingyinzhongkong2.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yinliangjia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yinliangjian.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\you.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\yule.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zanting.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zdyanjian.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zdyshang1.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zdyxia2.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zdyyou2.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zdyzuo2.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zimu.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zuo.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\pindao2.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -748,7 +836,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.0" />
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>28.0.0.3</Version>
</PackageReference>
@@ -1638,12 +1726,7 @@
<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>
+ <Folder Include="Assets\Phone\AksIcon\" />
</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