From af1cb3ecd0f4b0589e00b28f7f9edccf39e6e12b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 10 九月 2020 16:15:11 +0800
Subject: [PATCH] 202009101
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 116 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 82 insertions(+), 34 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index bd209ad..25ca707 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -46,10 +46,10 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Developer</CodesignKey>
+ <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
- <CodesignProvision>On_Dev-0327</CodesignProvision>
+ <CodesignProvision>onpro0804</CodesignProvision>
<MtouchI18n>cjk</MtouchI18n>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -60,7 +60,8 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Developer</CodesignKey>
+ <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
+ <CodesignProvision>dis-onpro-080401</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -169,6 +170,8 @@
<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\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -188,6 +191,7 @@
<Compile Include="ViewControllerBase.cs" />
<Compile Include="Reachability.cs" />
<Compile Include="Scan.cs" />
+ <Compile Include="ZXingOverlayView.cs" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -219,16 +223,7 @@
<BundleResource Include="Resources\Phone\PersonalCenter\SwitchIcon.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\GeneralSettingsIcon.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\SupportIcon.png" />
- <BundleResource Include="Resources\Phone\Navigation\UserPageNavbg.png" />
- <BundleResource Include="Resources\Phone\Navigation\CollectionIcon.png" />
- <BundleResource Include="Resources\Phone\Navigation\ClassificationIcon.png" />
- <BundleResource Include="Resources\Phone\Navigation\IntellectualizationIcon.png" />
- <BundleResource Include="Resources\Phone\Navigation\PersonalCenterIcon.png" />
- <BundleResource Include="Resources\Phone\Navigation\PersonalCenterIconOn.png" />
- <BundleResource Include="Resources\Phone\Navigation\ClassificationIconOn.png" />
- <BundleResource Include="Resources\Phone\Navigation\IntellectualizationIconOn.png" />
- <BundleResource Include="Resources\Phone\Navigation\CollectionIconOn.png" />
- <BundleResource Include="Resources\Phone\PersonalCenter\HomeListbg.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\HomeList3bg.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\PersonalData\QRcodeIcon.png" />
<BundleResource Include="Resources\Phone\Classification\ToggleDisplayThumbnail.png" />
<BundleResource Include="Resources\Phone\Classification\ToggleDisplayLarge.png" />
@@ -248,8 +243,6 @@
<BundleResource Include="Resources\Phone\Classification\Room\AllCloseIcon.png" />
<BundleResource Include="Resources\Phone\Public\PowerClose.png" />
<BundleResource Include="Resources\Phone\Public\PowerOpen.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcOnIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainStopIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseOnIcon.png" />
@@ -273,7 +266,6 @@
<BundleResource Include="Resources\Phone\Public\Restored_Shadow.png" />
<BundleResource Include="Resources\Phone\Public\Edit.png" />
<BundleResource Include="Resources\Phone\Public\RightIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcThinIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainThinIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingThinIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Light\LightThinIcon.png" />
@@ -298,11 +290,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Scene\s1.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainBgOnIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainBgIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AirSupplyIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AutoIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\CoolIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\DehumidificationIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatingIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\MusicFunctionBg.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\FreshAirFunctionBg.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\EnergyMonitoringFunctionBg.png" />
@@ -322,19 +309,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOpenWhiteIcon_Shadow.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseWhiteIcon_Shadow.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseBlueIcon_Shadow.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\DivBg1.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\DivBg2.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AirSupplyIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AutoIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\CoolIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\DehumidificationIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatingIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindHighIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindHighIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindLowIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindLowIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindMediumIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindMediumIconGray.png" />
<BundleResource Include="Resources\Phone\Public\MsgIcon\TipIconBlack.png" />
<BundleResource Include="Resources\Phone\Public\MsgIcon\TipIconWhite.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\4.png" />
@@ -493,6 +467,80 @@
<BundleResource Include="Resources\js\echarts.min.js" />
<BundleResource Include="Resources\js\ecStat.min.js" />
<BundleResource Include="Resources\js\world.js" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicPlayOnIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicPlayIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\InfoOnIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\ResetPassword\DialogTipTitleIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicThinIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\HomeList1bg.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\HomeList2bg.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\HomeList4bg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\RelayOnBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\RelayBg.png" />
+ <BundleResource Include="Resources\Phone\Navigation\HomePageIconOn.png" />
+ <BundleResource Include="Resources\Phone\Navigation\HomePageIcon.png" />
+ <BundleResource Include="Resources\Phone\Navigation\UserPageNavbg.png" />
+ <BundleResource Include="Resources\Phone\Navigation\PersonalCenterIconOn.png" />
+ <BundleResource Include="Resources\Phone\Navigation\PersonalCenterIcon.png" />
+ <BundleResource Include="Resources\Phone\Navigation\IntellectualizationIconOn.png" />
+ <BundleResource Include="Resources\Phone\Navigation\IntellectualizationIcon.png" />
+ <BundleResource Include="Resources\Phone\Navigation\CollectionIconOn.png" />
+ <BundleResource Include="Resources\Phone\Navigation\CollectionIcon.png" />
+ <BundleResource Include="Resources\Phone\Navigation\ClassificationIconOn.png" />
+ <BundleResource Include="Resources\Phone\Navigation\ClassificationIcon.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\CreateScene3Bg.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\CreateScene1Bg.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\CreateScene2Bg.png" />
+ <BundleResource Include="Resources\Phone\Public\FuncInfoSetIcon_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\FunctionIconHumidity.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\FunctionIconTemp.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\FunctionIconPm25.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\FunctionIconTVOC.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\FunctionIconCO2.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\HomeListbg.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg1.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg2.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg3.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg4.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg5.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg6.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg7.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg8.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg9.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg10.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\chooseTipIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AutoIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\LowIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DiyThumbIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcOnIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DehumidificationIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AirSupplyIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\LowIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DiyThumbIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DivBg2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DivBg1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\CoolIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindMediumIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindLowIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AirSupplyIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindLowIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcThinIcon1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindMediumIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatingIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\MediumIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\CoolIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AutoIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DehumidificationIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindHighIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindHighIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\MediumIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HighIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatingIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DiyThumbIcon2On.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HightIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\BrightnessBg.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0