From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 15 三月 2021 14:55:49 +0800
Subject: [PATCH] 合并前上传一个版本
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index ef3de29..3eee26f 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -47,14 +47,14 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchI18n>cjk</MtouchI18n>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-<CodesignProvision>ComHdlOnProDevelopment20210225-1</CodesignProvision>
+<CodesignProvision>ComHdlOnProDevelopment20210305-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -885,7 +885,6 @@
<BundleResource Include="Resources\Phone\LogicIcon\-.png" />
<BundleResource Include="Resources\Phone\LogicIcon\+.png" />
<BundleResource Include="Resources\Phone\LogicIcon\point.png" />
- <BundleResource Include="Resources\Phone\LogicIcon\ selected+.png" />
<BundleResource Include="Resources\Phone\LogicIcon\selected-.png" />
<BundleResource Include="Resources\Phone\oRobot.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheelGray.png" />
@@ -1039,16 +1038,38 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon1On.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon2.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon2On.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\fan.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\dvd.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\stb.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\tv.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\projector.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\air.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\custom.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\priequipment.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\offline.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\search.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\del.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\dropdown.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\addlbuton.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\delbuton.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\Infraredtreasure.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\online.png" />
+ <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\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" />
<ITunesArtwork Include="iTunesArtwork%402x" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\HdlBluWi\Blufi.csproj">
- <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
- <Name>Blufi</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
@@ -1084,6 +1105,12 @@
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960-1.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136-1.png" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\HdlBluWi\Blufi.csproj">
+ <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
+ <Name>Blufi</Name>
+ </ProjectReference>
+ </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" />
<ProjectExtensions>
--
Gitblit v1.8.0