From c88a3777ab456af4ecf01604f4b2ae4762852148 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 14 二月 2023 15:02:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 514a434..db8fc14 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -113,6 +113,9 @@
<Reference Include="HDL.Shared.IOS.ScanQRCode">
<HintPath>..\DLL\IOS\HDL.Shared.IOS.ScanQRCode.dll</HintPath>
</Reference>
+ <Reference Include="Shared.IOS">
+ <HintPath>..\DLL\Shared.IOS.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
@@ -1549,11 +1552,11 @@
<BundleResource Include="Resources\h5\static\images\down-icon-unselect.png" />
<BundleResource Include="Resources\h5\static\images\co2-reduction-ic.png" />
<BundleResource Include="Resources\h5\static\images\left-icon.png" />
- <BundleResource Include="Resources\h5\static\js\index.fdfbe853.js" />
+ <BundleResource Include="Resources\h5\static\js\index.2e54df77.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-inverter-index.c7bff58c.js" />
<BundleResource Include="Resources\h5\static\js\chunk-vendors.c6df545a.js" />
- <BundleResource Include="Resources\h5\static\js\pages-inverter-index.8da2cd44.js" />
- <BundleResource Include="Resources\h5\static\js\pages-index-index.fee066cc.js" />
<BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.d05a76d6.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-index-index.e7dd0a58.js" />
<BundleResource Include="Resources\h5\static\img\inverter-center.18b181f4.png" />
<BundleResource Include="Resources\h5\static\img\co2-reduction-ic.9c75228c.png" />
<BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
@@ -1602,10 +1605,6 @@
<ProjectReference Include="..\SiriKit\SiriKit.csproj">
<Project>{8B1652FA-5158-4D57-B90D-07BB91766625}</Project>
<Name>SiriKit</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Downloads\Library\Shared.IOS\Shared.IOS.csproj">
- <Project>{0048AB87-2130-4437-8F01-8CADAB787004}</Project>
- <Name>Shared.IOS</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
--
Gitblit v1.8.0