From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 90 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 84 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 3ff7737..575a8c7 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -36,6 +36,9 @@
<MtouchLink>None</MtouchLink>
<MtouchArch>x86_64</MtouchArch>
<CodesignKey>iPhone Developer</CodesignKey>
+ <ConsolePause>true</ConsolePause>
+ <MtouchInterpreter></MtouchInterpreter>
+ <IpaMetadata></IpaMetadata>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>true</DebugSymbols>
@@ -51,7 +54,11 @@
<MtouchDebug>true</MtouchDebug>
<MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
-<CodesignProvision>Home_Dev</CodesignProvision>
+<CodesignProvision>ComEvoyoHomeDevelopment20200806</CodesignProvision>
+<MtouchHttpClientHandler>CFNetworkHandler</MtouchHttpClientHandler>
+<OnDemandResourcesInitialInstallTags></OnDemandResourcesInitialInstallTags>
+<OnDemandResourcesInitialInstallTags></OnDemandResourcesInitialInstallTags>
+<OnDemandResourcesPrefetchOrder></OnDemandResourcesPrefetchOrder>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -62,10 +69,11 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Developer</CodesignKey>
+ <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchI18n>cjk</MtouchI18n>
<DeviceSpecificBuild>true</DeviceSpecificBuild>
<MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
+ <CodesignProvision>ComEvoyoHomeDevelopment20200806</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -197,9 +205,63 @@
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1496.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024*768-1.png" />
<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\LaunchImage.launchimage\鏄撴1242*2688.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴828*1792.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2688*1242.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1792*828.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1125*2436.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2436*1125.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1242*2208.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2208*1242.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048*2732.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴768*1024.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1536*2048.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1024*768.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048*1536.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴750_1334澶囦唤.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_960澶囦唤.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_1136澶囦唤.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴320_480澶囦唤.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_960澶囦唤-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_1136澶囦唤-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴768_1004澶囦唤.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1536_2008澶囦唤.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴768_1024澶囦唤.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1536_2048澶囦唤.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1024_748澶囦唤.png" />
+ <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" />
+ <BundleResource Include="Resources\DeviceName.ini" />
<BundleResource Include="Resources\Phone\Guide\RightIcon.png" />
<BundleResource Include="Resources\Phone\Guide\LeftIcon.png" />
<BundleResource Include="Resources\Phone\Guide\Finger.png" />
@@ -382,8 +444,6 @@
<BundleResource Include="Resources\Phone\SmartSound\Nickname.png" />
<BundleResource Include="Resources\Phone\SmartSound\SoundIcon.png" />
<BundleResource Include="Resources\Phone\SmartSound\Tianmao.png" />
- <BundleResource Include="Resources\Phone\SmartSound\CheckBoxDef.png" />
- <BundleResource Include="Resources\Phone\SmartSound\CheckBoxSel.png" />
<BundleResource Include="Resources\Phone\RollerShade\Stop.png" />
<BundleResource Include="Resources\Phone\RollerShade\DownSelected.png" />
<BundleResource Include="Resources\Phone\RollerShade\Up.png" />
@@ -411,6 +471,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" />
@@ -419,7 +480,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" />
@@ -496,6 +560,7 @@
<BundleResource Include="Resources\Phone\Item\Switch1.png" />
<BundleResource Include="Resources\Phone\Item\RoomIconSelected.png" />
<BundleResource Include="Resources\Phone\Item\Check.png" />
+ <BundleResource Include="Resources\Phone\Item\ScanQrCodeGroud.png" />
<BundleResource Include="Resources\Phone\Item\MessageManagement.png" />
<BundleResource Include="Resources\Phone\Item\Add_GW.png" />
<BundleResource Include="Resources\Phone\Item\Battery.png" />
@@ -505,6 +570,7 @@
<BundleResource Include="Resources\Phone\Item\PersentIcon.png" />
<BundleResource Include="Resources\Phone\Item\WrongIcon.png" />
<BundleResource Include="Resources\Phone\Item\RoomIconBackground.png" />
+ <BundleResource Include="Resources\Phone\Item\AdjustSuccessIcon.png" />
<BundleResource Include="Resources\Phone\Item\PlusSign2.png" />
<BundleResource Include="Resources\Phone\Item\DateSearchIcon.png" />
<BundleResource Include="Resources\Phone\Item\Time.png" />
@@ -541,6 +607,7 @@
<BundleResource Include="Resources\Phone\Item\Category_FunctionBG.png" />
<BundleResource Include="Resources\Phone\Item\Remote.png" />
<BundleResource Include="Resources\Phone\Item\ScreeningType.png" />
+ <BundleResource Include="Resources\Phone\Item\TransferOfResidenceIcon.png" />
<BundleResource Include="Resources\Phone\Item\Safety.png" />
<BundleResource Include="Resources\Phone\Item\UpTriangle.png" />
<BundleResource Include="Resources\Phone\Item\CreatFloor.png" />
@@ -569,6 +636,7 @@
<BundleResource Include="Resources\Phone\Item\SynchronizationSelected.png" />
<BundleResource Include="Resources\Phone\Item\BottomButtonGround.png" />
<BundleResource Include="Resources\Phone\Item\AutoBackup.png" />
+ <BundleResource Include="Resources\Phone\Item\TransferOfResidence.png" />
<BundleResource Include="Resources\Phone\Item\BatterySelected.png" />
<BundleResource Include="Resources\Phone\Item\Category_FunctionBGSelected.png" />
<BundleResource Include="Resources\Phone\Item\NoFunction.png" />
@@ -590,6 +658,7 @@
<BundleResource Include="Resources\Phone\Item\Floor.png" />
<BundleResource Include="Resources\Phone\Item\videoIntercom.png" />
<BundleResource Include="Resources\Phone\Item\MinusSign2.png" />
+ <BundleResource Include="Resources\Phone\Item\AdjustFailIcon.png" />
<BundleResource Include="Resources\Phone\Item\NotAuthority.png" />
<BundleResource Include="Resources\Phone\Item\IndoorUnitGround.png" />
<BundleResource Include="Resources\Phone\Item\FixedPositionSelected.png" />
@@ -652,6 +721,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\withdrawal.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicaddcolor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor13.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\iconSelectedBackgroundColor1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\nightLight.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicclose.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\function.png" />
@@ -695,6 +765,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor21.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor0.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\next.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\iconBackgroundColor1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\iconSelectedBackgroundColor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\security.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor44.png" />
@@ -789,6 +860,7 @@
<BundleResource Include="Resources\Phone\Device\ConverterSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchSelected.png" />
<BundleResource Include="Resources\Phone\Device\AirQualitySensorEpointSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorMotionSelected.png" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocksSelected.png" />
<BundleResource Include="Resources\Phone\Device\RelaySelected.png" />
<BundleResource Include="Resources\Phone\Device\Socket1Selected.png" />
@@ -796,6 +868,7 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\Device\ConverterZb485Selected.png" />
<BundleResource Include="Resources\Phone\Device\ColorLightSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorEmergencyButton.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitch.png" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocksH06CSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SwitchSelected.png" />
@@ -806,6 +879,7 @@
<BundleResource Include="Resources\Phone\Device\ThirdPartyDevice.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerZbGatewaySelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEightSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorMotion.png" />
<BundleResource Include="Resources\Phone\Device\SensorSphericalMotion.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEnvironment.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelOneSelected2.png" />
@@ -828,6 +902,7 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanel.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelTwoSelected2.png" />
<BundleResource Include="Resources\Phone\Device\FreshAirEpointSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorEmergencyButtonSelected.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerZbGateway.png" />
<BundleResource Include="Resources\Phone\Device\DryContact.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchCloudContrSelected2.png" />
@@ -864,6 +939,7 @@
<BundleResource Include="Resources\Phone\Device\RepeaterSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorPMTwoPointFive.png" />
<BundleResource Include="Resources\Phone\Device\ConverterSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorEmergencyButtonSelected2.png" />
<BundleResource Include="Resources\Phone\Device\RepeaterZigbeeSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorCarbonMonoxide.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFourSelected2.png" />
@@ -871,6 +947,7 @@
<BundleResource Include="Resources\Phone\Device\DimmableLightOneLoad.png" />
<BundleResource Include="Resources\Phone\Device\SensorHumiditySelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorPirSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorMotionSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleEnvironmentSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchCloudContrSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueTwo.png" />
@@ -936,14 +1013,15 @@
<BundleResource Include="Resources\Phone\RoomIcon\3.jpg" />
<BundleResource Include="Resources\Phone\RoomIcon\1.jpg" />
<BundleResource Include="Resources\Phone\RoomIcon\0.jpg" />
+ <BundleResource Include="Resources\Phone\Account\Logo_WhiteHome.png" />
<BundleResource Include="Resources\Phone\Account\Code.png" />
<BundleResource Include="Resources\Phone\Account\Cancle.png" />
<BundleResource Include="Resources\Phone\Account\HidePwd.png" />
<BundleResource Include="Resources\Phone\Account\Account.png" />
<BundleResource Include="Resources\Phone\Account\Cat.png" />
<BundleResource Include="Resources\Phone\Account\Password.png" />
- <BundleResource Include="Resources\Phone\Account\Logo_White.png" />
<BundleResource Include="Resources\Phone\Account\QQ.png" />
+ <BundleResource Include="Resources\Phone\Account\Logo_Evoyo.png" />
<BundleResource Include="Resources\Phone\Account\PhoneEmail_White.png" />
<BundleResource Include="Resources\Phone\Account\ChangeSuccess.png" />
<BundleResource Include="Resources\Phone\Account\Wechat.png" />
@@ -1050,9 +1128,9 @@
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueFreshAir.png" />
<BundleResource Include="Resources\Phone\RealDevice\AirSwitchCloudContr.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFour.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\SensorTemperatureHumidity.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelCurtain.png" />
<BundleResource Include="Resources\Phone\RealDevice\Repeater.png" />
- <BundleResource Include="Resources\Phone\RealDevice\SensorTemperatrueHumidity.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueFour.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\RealDevice\CommonDevice.png" />
--
Gitblit v1.8.0