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_iOS/HDL-ON_iOS.csproj | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 5094f83..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">
@@ -1520,6 +1523,16 @@
<BundleResource Include="Resources\Phone\Public\IotCheckIcon.png" />
<BundleResource Include="Resources\Phone\Public\IotCheckOnIcon.png" />
<BundleResource Include="Resources\Phone\Public\LinkIotIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensormmv_pose.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\MechanicalArmBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\MechanicalArmOnBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\MechanicalArmFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalmechanical_arm.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalmechanical_arm_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalmechanical_arm_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\securityipcamimou.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\securityipcamimou_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\securityipcamimou_white.png" />
<BundleResource Include="Resources\h5\index.html" />
<BundleResource Include="Resources\h5\static\index.b0707a6a.css" />
<BundleResource Include="Resources\h5\static\images\coal-save-ic.png" />
@@ -1539,22 +1552,16 @@
<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\pages-inverter-index.8c87c530.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\index.b9157150.js" />
- <BundleResource Include="Resources\h5\static\js\pages-index-index.3667377f.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" />
<BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensormmv_pose.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\MechanicalArmBg.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\MechanicalArmOnBg.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\MechanicalArmFunctionBg.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalmechanical_arm.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalmechanical_arm_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalmechanical_arm_white.png" />
+ <BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
@@ -1598,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