From af9c3e0b3b1eb370e966b3ca9db3f62848d4189b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 21 八月 2021 13:03:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 771b4c0..2e079e1 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -457,6 +457,8 @@
<Folder Include="Resources\Phone\FunctionIcon\Energy\" />
<Folder Include="Resources\Phone\FunctionIcon\IrFan\" />
<Folder Include="Assets.xcassets\device_bg.imageset\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Light\LightScene\" />
+ <Folder Include="Resources\Phone\PersonalCenter\FacePassage\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1315,6 +1317,19 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irfan_white.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorenvironment.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\EnvironmentalSensorbg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\AirFreshBgIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\EnvirSensorQingpingCGS1bg.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\EnvirSensorQingpingLitebg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorenvironment2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorenvironment3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\CheckIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\CheckOnIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\SetLightSceneIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\AddTargetIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\RightIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\FacePassage\FaceIcon.png" />
+ <BundleResource Include="Resources\Phone\Collection\DefenseStatusIcon.png" />
+ <BundleResource Include="Resources\Phone\Collection\DisarmStatusIcon.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0