From 0c1e29166e6b188939c092d16f87ce2a27662c5f Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 10:11:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 157 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 142 insertions(+), 15 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 3eee26f..c9fb05f 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -64,8 +64,7 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
- <CodesignProvision>Automatic:AdHoc</CodesignProvision>
+ <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
<MtouchLink>SdkOnly</MtouchLink>
</PropertyGroup>
<ItemGroup>
@@ -435,7 +434,6 @@
<Folder Include="Resources\Phone\FunctionIcon\Electrical\" />
<Folder Include="Resources\Phone\FunctionIcon\Socket\" />
<Folder Include="Resources\Phone\FunctionIcon\EnvironmentalScience\" />
- <Folder Include="Resources\Phone\Public\AirIcon\" />
<Folder Include="Resources\Phone\PersonalCenter\ResetPassword\" />
<Folder Include="Resources\Phone\Intelligence\Gallery\" />
<Folder Include="Resources\Phone\FunctionIcon\DeviceIcon\" />
@@ -444,6 +442,7 @@
<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\EnvirSensor\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -669,18 +668,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\DiagramIconOn.png" />
<BundleResource Include="Resources\Phone\Public\MsgIcon\LoadingIcon.png" />
<BundleResource Include="Resources\Phone\Collection\NoCollectionBg.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\0.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\1.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\13.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\18.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\2.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\20.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\29.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\3.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\4.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\45.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\5.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\6.png" />
<BundleResource Include="Resources\Phone\MusicIcon\bluetooth.png" />
<BundleResource Include="Resources\Phone\MusicIcon\addMusic1.png" />
<BundleResource Include="Resources\Phone\MusicIcon\prve1Selected.png" />
@@ -1066,6 +1053,146 @@
<BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\UploadToCloundSelect.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\MiniRemoteControlMenuIcon.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\WifiAndPhoneConnect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensortvoc.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorpir.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalai6HtccKFIw3dxo3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightrgb.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\airFreshstandard.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalracks.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalfan.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorpm25.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\acstandard.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalsocket.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorgas.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorhumidity.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalkoiGhMKwLf2ZP81g.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightcct.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtainroller.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irlearn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightdimming.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorco2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricaltv.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\floorHeatstandard.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtainswitch.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtainshades.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricaltyqborgovyzytytz.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\musicstandard.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensordoorwindow.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightrgbw.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensortemperature.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtaintrietex.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorsmoke.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalQ1RsefNf91tIXyyQ.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irac.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorwater.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightswitch.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irtv.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\FunctionIcon\Icon\irmodule.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\1.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\2.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\3.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\4.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\failed.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\icon1.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\icon2.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\left.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\right.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\succeed.png" />
+ <BundleResource Include="Resources\Phone\VideoIcon\hangup.png" />
+ <BundleResource Include="Resources\Phone\VideoIcon\danyuanji.png" />
+ <BundleResource Include="Resources\Phone\VideoIcon\weiqiangji.png" />
+ <BundleResource Include="Resources\Phone\VideoIcon\keshiduijiang.png" />
+ <BundleResource Include="Resources\Phone\VideoIcon\phone.png" />
+ <BundleResource Include="Resources\Phone\VideoIcon\menjin.png" />
+ <BundleResource Include="Resources\Phone\VideoIcon\answer.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVAV.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Co2Bg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\HumidityBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Pm25Bg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TempBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TvocBg.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\29.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\13.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\20.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\18.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\4.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\5.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\6.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\2.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\3.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\45.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\1.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\0.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\0.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\4.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\5.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\6.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\13.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\18.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\20.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\29.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\45.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\LowerLimit.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\UpperLimit.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Co2Icon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\HumidityIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\InfoIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Pm25Icon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TempIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TvocIcon.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\add.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\More.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0