From a7adf98ff4ac801342853b1f9231cc1ab5acebf3 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 14 十一月 2019 17:25:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj | 261 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 202 insertions(+), 59 deletions(-)
diff --git a/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj b/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj
index d4ea1b0..81e3d08 100644
--- a/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj
+++ b/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj
@@ -27,7 +27,8 @@
<MtouchArch>x86_64</MtouchArch>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
<DeviceSpecificBuild>false</DeviceSpecificBuild>
- <MtouchVerbosity></MtouchVerbosity>
+ <MtouchVerbosity>
+ </MtouchVerbosity>
<CodesignProvision>VS: WildCard Development</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -42,7 +43,8 @@
<MtouchLink>SdkOnly</MtouchLink>
<MtouchArch>ARMv7, ARM64</MtouchArch>
<MtouchHttpClientHandler>CFNetworkHandler</MtouchHttpClientHandler>
- <MtouchVerbosity></MtouchVerbosity>
+ <MtouchVerbosity>
+ </MtouchVerbosity>
<CodesignProvision>iOS Team Provisioning Profile: com.hdl.home</CodesignProvision>
<MtouchI18n>cjk</MtouchI18n>
</PropertyGroup>
@@ -57,7 +59,8 @@
<MtouchLink>None</MtouchLink>
<MtouchArch>x86_64</MtouchArch>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
- <MtouchVerbosity></MtouchVerbosity>
+ <MtouchVerbosity>
+ </MtouchVerbosity>
<CodesignProvision>iOS Team Provisioning Profile: com.hdl.home</CodesignProvision>
<CodesignEntitlements>Info.plist</CodesignEntitlements>
</PropertyGroup>
@@ -78,10 +81,12 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<IOSDebuggerPort>35116</IOSDebuggerPort>
<MtouchLink>SdkOnly</MtouchLink>
- <MtouchArch>ARMv7, ARM64</MtouchArch>
+ <MtouchArch>ARM64</MtouchArch>
<MtouchHttpClientHandler>CFNetworkHandler</MtouchHttpClientHandler>
- <MtouchVerbosity></MtouchVerbosity>
+ <MtouchVerbosity>
+ </MtouchVerbosity>
<MtouchI18n>cjk</MtouchI18n>
+ <MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -93,9 +98,6 @@
</Reference>
<Reference Include="M2Mqtt.Net">
<HintPath>..\Shared\DLL\M2Mqtt.Net.dll</HintPath>
- </Reference>
- <Reference Include="Elian.iOS">
- <HintPath>..\Shared\DLL\Elian.iOS.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
@@ -126,8 +128,23 @@
<Reference Include="Microsoft.AppCenter.Crashes.iOS.Bindings">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.iOS.Bindings.dll</HintPath>
</Reference>
+ <Reference Include="ZXing.Net.Mobile.Core">
+ <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\Xamarin.iOS10\ZXing.Net.Mobile.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="zxing.portable">
+ <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\Xamarin.iOS10\zxing.portable.dll</HintPath>
+ </Reference>
+ <Reference Include="ZXingNetMobile">
+ <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\Xamarin.iOS10\ZXingNetMobile.dll</HintPath>
+ </Reference>
<Reference Include="Shared.IOS">
- <HintPath>..\Shared\DLL\Shared.IOS.dll</HintPath>
+ <HintPath>..\Shared\DLL\IOS\Shared.IOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.TBL">
+ <HintPath>..\Shared\DLL\IOS\Shared.IOS.TBL.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Essentials">
+ <HintPath>..\Shared\DLL\IOS\Xamarin.Essentials.dll</HintPath>
</Reference>
<Reference Include="Shared.IOS">
<HintPath>..\Shared\DLL\IOS\Shared.IOS.dll</HintPath>
@@ -140,50 +157,138 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\Contents.json" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242X2208.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1334.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208X1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X2732.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640X960.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640X1136.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768X1024.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536X2048.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024X768.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X1536.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320X480.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768X1004.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536X2008.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024X748.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X1496.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125X2436.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920X1080.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840X2160.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242X2688.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828X1792.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688X1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792X828.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436X1125.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-60%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-60%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20-ipad.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%402x-ipad.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29-ipad.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%402x-ipad.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%402x-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-76.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-76%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-83.5%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-1024.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\Contents.json">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242X2208.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1334.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208X1242.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X2732.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640X960.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640X1136.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768X1024.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536X2048.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024X768.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X1536.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320X480.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768X1004.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536X2008.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024X748.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X1496.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125X2436.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920X1080.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840X2160.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242X2688.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828X1792.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688X1242.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792X828.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436X1125.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%402x.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%403x.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%402x.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%403x.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%402x.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%403x.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-60%402x.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-60%403x.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20-ipad.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%402x-ipad.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29-ipad.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%402x-ipad.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%402x-1.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-76.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-76%402x.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-83.5%402x.png">
+ <Visible>false</Visible>
+ </ImageAsset>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-1024.png">
+ <Visible>false</Visible>
+ </ImageAsset>
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -265,6 +370,38 @@
<BundleResource Include="Resources\Phone\AC\Mode_FanSelected.png" />
<BundleResource Include="Resources\Phone\AC\Fan_LowSelected.png" />
<BundleResource Include="Resources\Phone\AC\SelectedModeBG.png" />
+ <BundleResource Include="Resources\Phone\Loading\8.png" />
+ <BundleResource Include="Resources\Phone\Loading\9.png" />
+ <BundleResource Include="Resources\Phone\Loading\14.png" />
+ <BundleResource Include="Resources\Phone\Loading\28.png" />
+ <BundleResource Include="Resources\Phone\Loading\29.png" />
+ <BundleResource Include="Resources\Phone\Loading\15.png" />
+ <BundleResource Include="Resources\Phone\Loading\17.png" />
+ <BundleResource Include="Resources\Phone\Loading\16.png" />
+ <BundleResource Include="Resources\Phone\Loading\12.png" />
+ <BundleResource Include="Resources\Phone\Loading\13.png" />
+ <BundleResource Include="Resources\Phone\Loading\11.png" />
+ <BundleResource Include="Resources\Phone\Loading\10.png" />
+ <BundleResource Include="Resources\Phone\Loading\21.png" />
+ <BundleResource Include="Resources\Phone\Loading\20.png" />
+ <BundleResource Include="Resources\Phone\Loading\22.png" />
+ <BundleResource Include="Resources\Phone\Loading\23.png" />
+ <BundleResource Include="Resources\Phone\Loading\27.png" />
+ <BundleResource Include="Resources\Phone\Loading\32.png" />
+ <BundleResource Include="Resources\Phone\Loading\26.png" />
+ <BundleResource Include="Resources\Phone\Loading\18.png" />
+ <BundleResource Include="Resources\Phone\Loading\30.png" />
+ <BundleResource Include="Resources\Phone\Loading\24.png" />
+ <BundleResource Include="Resources\Phone\Loading\25.png" />
+ <BundleResource Include="Resources\Phone\Loading\31.png" />
+ <BundleResource Include="Resources\Phone\Loading\19.png" />
+ <BundleResource Include="Resources\Phone\Loading\4.png" />
+ <BundleResource Include="Resources\Phone\Loading\5.png" />
+ <BundleResource Include="Resources\Phone\Loading\7.png" />
+ <BundleResource Include="Resources\Phone\Loading\6.png" />
+ <BundleResource Include="Resources\Phone\Loading\2.png" />
+ <BundleResource Include="Resources\Phone\Loading\3.png" />
+ <BundleResource Include="Resources\Phone\Loading\1.png" />
<BundleResource Include="Resources\Phone\Center\Abount.png" />
<BundleResource Include="Resources\Phone\Center\ResidenceManagement.png" />
<BundleResource Include="Resources\Phone\Center\Backup.png" />
@@ -558,34 +695,40 @@
<BundleResource Include="Resources\Phone\FunctionIcon\3IconSelected.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\1Icon.png" />
<BundleResource Include="Resources\Phone\RealDevice\CurtainSiphonate.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\ButtonPanelTwo.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorPir.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFourNotPower.png" />
<BundleResource Include="Resources\Phone\RealDevice\CurtainAutoOpen.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorInfrared.png" />
<BundleResource Include="Resources\Phone\RealDevice\AirSwitchCloudContr.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFour.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorEmergencyButton.png" />
<BundleResource Include="Resources\Phone\RealDevice\CommonDevice.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorMotion.png" />
- <BundleResource Include="Resources\Phone\RealDevice\PanelFourButton.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorDoorWindow.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorFire.png" />
- <BundleResource Include="Resources\Phone\RealDevice\PanelFourNotPowerButton.png" />
- <BundleResource Include="Resources\Phone\RealDevice\PanelThreeButton.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\ButtonPanelThree.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorCarbonMonoxide.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorWater.png" />
- <BundleResource Include="Resources\Phone\RealDevice\PanelTwoButton.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGatewaySearching.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway6.png" />
<BundleResource Include="Resources\Phone\Gateway\PhoneImage.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway1.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGatewayInstruct.png" />
+ <BundleResource Include="Resources\Phone\Gateway\WirelessApDirection.png" />
<BundleResource Include="Resources\Phone\Gateway\GatewayIcon1.png" />
+ <BundleResource Include="Resources\Phone\Gateway\WirelessApGatewaySearching.png" />
<BundleResource Include="Resources\Phone\Gateway\GatewayIcon6.png" />
- <BundleResource Include="Resources\Phone\Gateway\WirelessGatewayImage.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGateway.png" />
- <BundleResource Include="Resources\Phone\Gateway\WirelessGatewayInstruct.png" />
<BundleResource Include="Resources\Phone\Gateway\AddGatewaySuccess.png" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Elian.iOS\Elian.iOS.csproj">
+ <Project>{85F1AF50-75A6-4011-B811-56B32DA77568}</Project>
+ <Name>Elian.iOS</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
--
Gitblit v1.8.0