From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 11 八月 2020 14:13:55 +0800 Subject: [PATCH] 20200811 --- HDL-ON_iOS/HDL-ON_iOS.csproj | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 deletions(-) diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj index 3d2abd2..a9c9834 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,7 @@ <Folder Include="Resources\Phone\FunctionIcon\Socket\" /> <Folder Include="Resources\Phone\FunctionIcon\EnvironmentalScience\" /> <Folder Include="Resources\Phone\Public\AirIcon\" /> + <Folder Include="Resources\Phone\PersonalCenter\ResetPassword\" /> </ItemGroup> <ItemGroup> <InterfaceDefinition Include="LaunchScreen.storyboard" /> @@ -188,6 +190,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" /> @@ -221,14 +224,12 @@ <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" /> @@ -273,7 +274,7 @@ <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\AC\AcThinIcon1.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" /> @@ -498,11 +499,29 @@ <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\AC\MediumIconGray.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\AC\MediumIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\AC\LowIconGray.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\AC\LowIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\AC\HightIconGray.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\AC\HighIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatIconGray.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicThinIcon.png" /> + <BundleResource Include="Resources\Phone\Navigation\HomePageIconOn.png" /> + <BundleResource Include="Resources\Phone\Navigation\HomePageIcon.png" /> + <BundleResource Include="Resources\Phone\PersonalCenter\HomeList1bg.png" /> + <BundleResource Include="Resources\Phone\PersonalCenter\HomeList2bg.png" /> + <BundleResource Include="Resources\Phone\PersonalCenter\HomeList4bg.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> <ITunesArtwork Include="iTunesArtwork%402x" /> </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Resources\Phone\Navigation\ClassificationIcon.png" /> + <AndroidAsset Include="Resources\Phone\Navigation\ClassificationIconOn.png" /> + </ItemGroup> <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> </Project> \ No newline at end of file -- Gitblit v1.8.0