From 134811c790a982d505567e2ba69b5de566410367 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 三月 2021 10:20:06 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into temp-wxr
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 85 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 75 insertions(+), 10 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index ae25681..09c443f 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</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>ComHdlOnProDevelopment20210116-2</CodesignProvision>
+<CodesignProvision>ComHdlOnProDevelopment20210305-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -442,6 +442,8 @@
<Folder Include="Other\" />
<Folder Include="Resources\zh-Hans.lproj\" />
<Folder Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\" />
+ <Folder Include="Resources\Phone\FunctionIcon\ArmSensor\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -883,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" />
@@ -984,7 +985,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveBg.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveOnBg.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\ref.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WaterValveIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WeepRobotIconOn.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\AirCleanerIconOn.png" />
@@ -993,16 +993,75 @@
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WaterValveIconOn.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\FanIconOn.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\AirCleanerIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\SetTimeIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorDoorIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorPirIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorDoorStateBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorDoorStateBgIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorPirStateBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorPirStateBgIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeStateBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeStateBgIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionStateBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionStateBgIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\PowerLowIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerAnionIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerAnionIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerBgIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDisinfectIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDisinfectIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerHotDryIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerHotDryIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerLightIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerLightIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerStopIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerStopIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerTimeIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerTimeIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerWindDryIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerWindDryIconOn.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\changesinoutdoor.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerBlueIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerGrayIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon1On.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon2On.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon1.png" />
+ <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\FunctionIcon\AC\More.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" />
@@ -1038,6 +1097,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