From cd70a2a8a2bdebf51259d8f39ed110a34b9be9e5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 四月 2023 14:50:21 +0800
Subject: [PATCH] 修改启动屏幕
---
HDL-ON_Android/HDL-ON_Android.csproj | 77 +++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 34 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index ccd34e5..18901d3 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">
@@ -163,15 +163,6 @@
<Reference Include="videophone">
<HintPath>..\DLL\FL\Android\videophone.dll</HintPath>
</Reference>
- <Reference Include="Square.OkHttp3">
- <HintPath>..\DLL\EZvizMonitor\Square.OkHttp3.dll</HintPath>
- </Reference>
- <Reference Include="Square.OkIO">
- <HintPath>..\DLL\EZvizMonitor\Square.OkIO.dll</HintPath>
- </Reference>
- <Reference Include="ys">
- <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
- </Reference>
<Reference Include="UMSdkDroid">
<HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath>
</Reference>
@@ -179,29 +170,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="Shared.Droid.LCVideoSDK">
<HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath>
</Reference>
- <Reference Include="LcVideoSdk">
- <HintPath>..\..\LC\Android\LcVideoSdk.dll</HintPath>
- </Reference>
<Reference Include="LCDeviceAddModule">
- <HintPath>..\..\LC\Android\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>..\DLL\LC\Android\LcVideoSdk.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -409,16 +400,28 @@
<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\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" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -767,14 +770,17 @@
<PackageReference Include="Xamarin.Android.Support.Constraint.Layout.Solver">
<Version>1.1.0</Version>
</PackageReference>
- <PackageReference Include="Microsoft.AppCenter">
- <Version>4.2.0</Version>
- </PackageReference>
<PackageReference Include="Microsoft.AppCenter.Crashes">
<Version>4.2.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Analytics">
<Version>4.2.0</Version>
+ </PackageReference>
+ <PackageReference Include="Microsoft.AppCenter">
+ <Version>4.2.0</Version>
+ </PackageReference>
+ <PackageReference Include="Square.OkHttp3">
+ <Version>3.14.4</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -1616,7 +1622,7 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\History.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\HistoryList.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" />
@@ -1631,7 +1637,10 @@
<Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" />
</ItemGroup>
<ItemGroup>
- <AndroidJavaLibrary Include="libs\eventbus-3.0.0.jar" />
+ <ProjectReference Include="..\ys\ys.csproj">
+ <Project>{DF065E3F-C3A1-4908-9582-000974B7C290}</Project>
+ <Name>ys</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" />
--
Gitblit v1.8.0