From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL-ON_Android/HDL-ON_Android.csproj | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 3a93835..1ccbe08 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -263,6 +263,9 @@
<AndroidAsset Include="Assets\Phone\Public\LinkIotIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\IotCheckIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\IotCheckOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BackIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\ThumbImage.png" />
+ <AndroidAsset Include="Assets\h5\index.html" />
<AndroidAsset Include="Assets\h5\static\index.2772579d.css" />
<AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" />
<AndroidAsset Include="Assets\h5\static\images\inverter-center.svg" />
@@ -281,24 +284,15 @@
<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.3b3b0fdd.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.aea6a122.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-index-index.7634b70a.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0b8ec7be.js" />
<AndroidAsset Include="Assets\h5\static\js\chunk-vendors.9e7e69a0.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index.3041b8b8.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.cac3b1d6.js" />
- <AndroidAsset Include="Assets\h5\static\js\index.16008a1b.js" />
+ <AndroidAsset Include="Assets\h5\static\js\index.95903989.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\index.html" />
- <AndroidAsset Include="Assets\h5\static\js\index.07f79ca2.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index.963cb1b0.js" />
- <AndroidAsset Include="Assets\h5\static\js\index.12e3fcbf.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index.66eb9118.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index.9f0b60c5.js" />
- <AndroidAsset Include="Assets\h5\static\js\index.be443243.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index.931f9b30.js" />
- <AndroidAsset Include="Assets\h5\static\js\index.4a0472a0.js" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -1507,7 +1501,6 @@
<Folder Include="Zxing\" />
<Folder Include="Assets\Phone\FunctionIcon\CAC\" />
<Folder Include="Assets\Phone\FunctionIcon\Panel\" />
- <Folder Include="Assets\h5\" />
</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