From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 53 +++++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 941a5d6..0a2ee62 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -52,6 +52,7 @@
<MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
<CodesignProvision>Home_Dev</CodesignProvision>
+<MtouchHttpClientHandler>CFNetworkHandler</MtouchHttpClientHandler>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -199,30 +200,6 @@
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1536-1.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920_1080-1.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840_2160-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-3.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60_60-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-2.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87_87-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-2.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-2.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-3.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180_180-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20_20-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-4.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29_29-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-3.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-2-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-3.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76_76-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152_152-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167_167-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-4.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180_180-2.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-4.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87_87-2.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-4.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024-2.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1242*2688.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴828*1792.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2688*1242.png" />
@@ -250,6 +227,30 @@
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048_1496澶囦唤.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1024_768澶囦唤.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048_1536澶囦唤.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60*60.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87*87.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180*180.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20*20.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29*29.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76*76.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152*152.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167*167.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024*1024.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180*180-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87*87-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024*1024-1.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Language.ini" />
@@ -465,6 +466,7 @@
<BundleResource Include="Resources\Phone\BindPic\EmptyTargets.png" />
<BundleResource Include="Resources\Phone\BindPic\BindEmptyPic.png" />
<BundleResource Include="Resources\Phone\BindPic\Curtain.png" />
+ <BundleResource Include="Resources\Phone\BindPic\TemperaTureReduction.png" />
<BundleResource Include="Resources\Phone\BindPic\BindLeft.png" />
<BundleResource Include="Resources\Phone\BindPic\FreshAirIcon.png" />
<BundleResource Include="Resources\Phone\BindPic\Roller.png" />
@@ -473,7 +475,10 @@
<BundleResource Include="Resources\Phone\BindPic\EmptyTargetsSelected.png" />
<BundleResource Include="Resources\Phone\BindPic\BindRoomColor.png" />
<BundleResource Include="Resources\Phone\BindPic\Switch.png" />
+ <BundleResource Include="Resources\Phone\BindPic\TemperaTureAdd.png" />
<BundleResource Include="Resources\Phone\BindPic\BindRight.png" />
+ <BundleResource Include="Resources\Phone\BindPic\CorrectTemperatureBackGround.png" />
+ <BundleResource Include="Resources\Phone\BindPic\TemperaTureAttention.png" />
<BundleResource Include="Resources\Phone\BindPic\BindRoomColorOn.png" />
<BundleResource Include="Resources\Phone\DoorLock\DistributeUnlockIcon.png" />
<BundleResource Include="Resources\Phone\DoorLock\TypeIcon.png" />
--
Gitblit v1.8.0