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 | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index e38b2fa..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">
@@ -179,32 +179,29 @@
<HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
</Reference>
<Reference Include="Mono.Android.Export" />
- <Reference Include="LcDHMobileToolset">
- <HintPath>..\..\LC\Android\LcDHMobileToolset.dll</HintPath>
- </Reference>
- <Reference Include="LcDHScanner">
- <HintPath>..\..\LC\Android\LcDHScanner.dll</HintPath>
- </Reference>
- <Reference Include="LcPullToRefreshRecyclerView">
- <HintPath>..\..\LC\Android\LcPullToRefreshRecyclerView.dll</HintPath>
- </Reference>
<Reference Include="ScanSdk">
<HintPath>..\DLL\Scan\ScanSdk.dll</HintPath>
- </Reference>
- <Reference Include="ZxingSDK">
- <HintPath>..\..\LC\Android\ZxingSDK.dll</HintPath>
- </Reference>
- <Reference Include="LeChengSDK">
- <HintPath>..\..\LC\Android\LeChengSDK.dll</HintPath>
</Reference>
<Reference Include="Shared.Droid.LCVideoSDK">
<HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath>
</Reference>
<Reference Include="LCDeviceAddModule">
- <HintPath>..\..\lc2022-11-17\LCDeviceAddModule.dll</HintPath>
+ <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>..\..\lc2022-11-17\LcVideoSdk.dll</HintPath>
+ <HintPath>..\DLL\LC\Android\LcVideoSdk.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -412,16 +409,18 @@
<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.fdfbe853.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\pages-inverter-index.8da2cd44.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index.fee066cc.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" />
--
Gitblit v1.8.0