From 7ff70bc7c9460c395b59952d55df6e5d6a12a718 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 二月 2023 16:27:32 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr'
---
HDL-ON_Android/HDL-ON_Android.csproj | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index e5bbf10..bfd4a20 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -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" />
@@ -361,6 +380,16 @@
<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" />
@@ -380,22 +409,16 @@
<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\index.361009bb.js" />
<AndroidAsset Include="Assets\h5\static\js\chunk-vendors.c6df545a.js" />
- <AndroidAsset Include="Assets\h5\static\js\index.b9157150.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index.3667377f.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\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\h5\static\font\SourceHanSansCN-Normal.otf" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
--
Gitblit v1.8.0