From f703a411c0ebdf7ada490fda75b52fd839dae079 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 14:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-cqy（1.5.9）' into dev--wxr
---
HDL-ON_Android/HDL-ON_Android.csproj | 103 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 68 insertions(+), 35 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index d98ab2d..cccb443 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">
@@ -169,22 +169,40 @@
<Reference Include="Square.OkIO">
<HintPath>..\DLL\EZvizMonitor\Square.OkIO.dll</HintPath>
</Reference>
- <Reference Include="Shared.Droid.LCVideoSDK">
- <HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath>
- </Reference>
<Reference Include="ys">
<HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
</Reference>
<Reference Include="UMSdkDroid">
<HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath>
</Reference>
- <Reference Include="ScanSdk">
- <HintPath>..\DLL\Scan\ScanSdk.dll</HintPath>
- </Reference>
<Reference Include="Shared.Droid.HDLLinphone">
<HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
</Reference>
<Reference Include="Mono.Android.Export" />
+ <Reference Include="ScanSdk">
+ <HintPath>..\DLL\Scan\ScanSdk.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.LCVideoSDK">
+ <HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath>
+ </Reference>
+ <Reference Include="LCDeviceAddModule">
+ <HintPath>..\DLL\LC\Android\LCDeviceAddModule.dll</HintPath>
+ </Reference>
+ <Reference Include="LcDHMobileToolset">
+ <HintPath>..\DLL\LC\Android\LcDHMobileToolset.dll</HintPath>
+ </Reference>
+ <Reference Include="LcDHScanner">
+ <HintPath>..\DLL\LC\Android\LcDHScanner.dll</HintPath>
+ </Reference>
+ <Reference Include="LcPullToRefreshRecyclerView">
+ <HintPath>..\DLL\LC\Android\LcPullToRefreshRecyclerView.dll</HintPath>
+ </Reference>
+ <Reference Include="ZxingSDK">
+ <HintPath>..\DLL\LC\Android\ZxingSDK.dll</HintPath>
+ </Reference>
+ <Reference Include="LcVideoSdk">
+ <HintPath>..\DLL\LC\Android\LcVideoSdk.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@@ -213,6 +231,7 @@
<Compile Include="AgreementActivity.cs" />
<Compile Include="Zxing\CustomCaptureActivity.cs" />
<Compile Include="Zxing\ScanActivity.cs" />
+ <Compile Include="LeChengVideo\LeTest.cs" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\agconnect-services.json" />
@@ -268,34 +287,6 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Inverter\Icon1.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Inverter\Icon2.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Inverter\Icon3.png" />
- <AndroidAsset Include="Assets\h5\index.html" />
- <AndroidAsset Include="Assets\h5\static\index.b0707a6a.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-inverter-index.8c87c530.js" />
- <AndroidAsset Include="Assets\h5\static\js\chunk-vendors.c6df545a.js" />
- <AndroidAsset Include="Assets\h5\static\js\index.c15d616d.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.d05a76d6.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index.f095af27.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\Phone\FunctionIcon\Acst\BgChooseScene.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\LvJianLogo.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BgChooseMode.png" />
@@ -389,6 +380,47 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAwayHomeIcon2.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\MsgViewBg.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAwayHomeIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensormmv_pose.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\MechanicalArmBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\MechanicalArmOnBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\MechanicalArmFunctionBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricalmechanical_arm.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalmechanical_arm_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalmechanical_arm_white.png" />
+ <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\h5\index.html" />
+ <AndroidAsset Include="Assets\h5\static\index.b0707a6a.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\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\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\FaceManagementIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -1598,6 +1630,7 @@
<Folder Include="Assets\Phone\FunctionIcon\CAC\" />
<Folder Include="Assets\Phone\FunctionIcon\Panel\" />
<Folder Include="Assets\Phone\FunctionIcon\Inverter\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" />
</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