From 6e580804d74d7a6fb118b6ba381e88aa81f267c7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 15 三月 2021 15:30:23 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into dev-tzy
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 93 ++++------------------------------------------
1 files changed, 9 insertions(+), 84 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index bc1dcf8..3eee26f 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -444,7 +444,6 @@
<Folder Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\" />
<Folder Include="Resources\Phone\FunctionIcon\ArmSensor\" />
<Folder Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\" />
- <Folder Include="Resources\Phone\FunctionIcon\Icon\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1058,89 +1057,15 @@
<BundleResource Include="Resources\Phone\PirIcon\adddevice.png" />
<BundleResource Include="Resources\Phone\PirIcon\next.png" />
<BundleResource Include="Resources\Phone\LogicIcon\selected+.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\More.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irtv.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\acstandard.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\airFreshstandard.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtainroller.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtainshades.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtainswitch.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtaintrietex.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalai6HtccKFIw3dxo3.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalfan.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalkoiGhMKwLf2ZP81g.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalQ1RsefNf91tIXyyQ.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalracks.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalsocket.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricaltv.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricaltyqborgovyzytytz.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\floorHeatstandard.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irac.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irlearn.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightcct.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightdimming.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightrgb.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightrgbw.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightswitch.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\musicstandard.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorco2.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensordoorwindow.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorgas.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorhumidity.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorpir.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorpm25.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorsmoke.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensortemperature.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensortvoc.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorwater.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightrgbw_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irac_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltv_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalai6HtccKFIw3dxo3_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtaintrietex_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\floorHeatstandard_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\musicstandard_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalfan_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainswitch_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightdimming_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightrgbw_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltyqborgovyzytytz_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\airFreshstandard_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightrgb_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irtv_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irlearn_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\musicstandard_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalfan_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainshades_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalkoiGhMKwLf2ZP81g_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irac_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalkoiGhMKwLf2ZP81g_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\acstandard_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightcct_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalracks_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalai6HtccKFIw3dxo3_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightswitch_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtaintrietex_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\airFreshstandard_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\floorHeatstandard_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainshades_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalQ1RsefNf91tIXyyQ_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltyqborgovyzytytz_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightcct_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightrgb_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainroller_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainroller_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalQ1RsefNf91tIXyyQ_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irtv_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalsocket_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightswitch_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightdimming_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltv_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalsocket_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\acstandard_blue.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irlearn_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainswitch_white.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalracks_white.png" />
+ <BundleResource Include="Resources\Phone\Public\ProgressMsg.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\UploadToClound.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\NetConnectSelect.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\ConnectSuccess.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\ConnectSuccessSelect.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\MiniRemoteControlBigPictrue.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\UploadToCloundSelect.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\MiniRemoteControlMenuIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\WifiAndPhoneConnect.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0