From 2562ee38c58a113113a2943ae057c1937ae533cb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 02 七月 2020 13:49:20 +0800
Subject: [PATCH] 2020-07-01 1.去掉读电能操作，去掉kwh状态显示。 2.当前是分享住宅，不允许删除备份。 3.进入搜索网关页面，切换到本地模式。 4.Alexa页面 增加添加设备失败提示。 5.子账号页面，底部增加文字提示。6.Android 默认隐藏底部虚拟按键。
---
Crabtree/ON.Ios/ON.Ios.csproj | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/Crabtree/ON.Ios/ON.Ios.csproj b/Crabtree/ON.Ios/ON.Ios.csproj
index a35f8ff..78b44c3 100644
--- a/Crabtree/ON.Ios/ON.Ios.csproj
+++ b/Crabtree/ON.Ios/ON.Ios.csproj
@@ -47,7 +47,7 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<DeviceSpecificBuild>true</DeviceSpecificBuild>
-<CodesignProvision>Automatic:AdHoc</CodesignProvision>
+<CodesignProvision>HDL-ON-AdHoc-1126</CodesignProvision>
<CodesignProvision>HDL-ON-AdHoc-1126</CodesignProvision>
<CodesignProvision>HDL-ON-AdHoc-1126</CodesignProvision>
<NoStdLib>false</NoStdLib>
@@ -59,12 +59,13 @@
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;HDL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <CodesignKey>iPhone Distribution: Havells India Limited (6FQDUKMB48)</CodesignKey>
+ <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchLink>None</MtouchLink>
<MtouchArch>i386</MtouchArch>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
<MtouchTlsProvider>Default</MtouchTlsProvider>
<MtouchI18n>cjk</MtouchI18n>
+ <CodesignProvision>iOS Team Provisioning Profile: com.hdl.SimpleControl</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>true</DebugSymbols>
@@ -92,7 +93,6 @@
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
<SignAssembly>true</SignAssembly>
-<CodesignProvision>On_Dev</CodesignProvision>
<IntermediateOutputPath></IntermediateOutputPath>
<RunWithWarnings>true</RunWithWarnings>
<CrashReportingDelay>-1</CrashReportingDelay>
@@ -107,7 +107,7 @@
<WarningsNotAsErrors></WarningsNotAsErrors>
<OnDemandResourcesInitialInstallTags></OnDemandResourcesInitialInstallTags>
<OnDemandResourcesPrefetchOrder></OnDemandResourcesPrefetchOrder>
-<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+<CodesignProvision>Test</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -117,7 +117,7 @@
<Reference Include="System.Web.Services" />
<Reference Include="System.Net" />
<Reference Include="Newtonsoft.Json">
- <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
@@ -133,32 +133,45 @@
<HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\Xamarin.iOS10\ZXingNetMobile.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter">
- <HintPath>..\packages\Microsoft.AppCenter.1.7.0\lib\Xamarin.iOS10\Microsoft.AppCenter.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.3.1.0\lib\Xamarin.iOS10\Microsoft.AppCenter.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.iOS.Bindings">
- <HintPath>..\packages\Microsoft.AppCenter.1.7.0\lib\Xamarin.iOS10\Microsoft.AppCenter.iOS.Bindings.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.3.1.0\lib\Xamarin.iOS10\Microsoft.AppCenter.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes">
- <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.7.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.Crashes.3.1.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes.iOS.Bindings">
- <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.7.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.iOS.Bindings.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.Crashes.3.1.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics">
- <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.7.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.Analytics.3.1.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics.iOS.Bindings">
- <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.7.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.iOS.Bindings.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AppCenter.Analytics.3.1.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable">
- <HintPath>..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
+ <HintPath>..\packages\System.Collections.Immutable.1.7.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe">
- <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+ <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Essentials">
- <HintPath>..\packages\Xamarin.Essentials.1.0.0\lib\xamarinios10\Xamarin.Essentials.dll</HintPath>
+ <HintPath>..\packages\Xamarin.Essentials.1.5.2\lib\xamarinios10\Xamarin.Essentials.dll</HintPath>
</Reference>
+ <Reference Include="MQTTnet">
+ <HintPath>..\packages\MQTTnet.3.0.9\lib\netstandard2.0\MQTTnet.dll</HintPath>
+ </Reference>
+ <Reference Include="MJRefresh_Xamarin">
+ <HintPath>..\SmartHome\dll\IOS\MJRefresh_Xamarin.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS">
+ <HintPath>..\SmartHome\dll\IOS\Shared.IOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.TBL">
+ <HintPath>..\SmartHome\dll\IOS\Shared.IOS.TBL.dll</HintPath>
+ </Reference>
+ <Reference Include="OpenTK-1.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
@@ -979,6 +992,10 @@
<BundleResource Include="Resources\Phone2\TVNum0.png" />
<BundleResource Include="Resources\Phone2\DownIRCodeIcon.png" />
<BundleResource Include="Resources\Phone2\TV\DownIRCodeIcon.png" />
+ <BundleResource Include="Resources\Phone2\CrabtreeAdd\FromSharing.png" />
+ <BundleResource Include="Resources\Phone2\CrabtreeAdd\Logout.png" />
+ <BundleResource Include="Resources\Phone2\CrabtreeAdd\WiFiOffline.png" />
+ <BundleResource Include="Resources\Phone2\CrabtreeAdd\CloudOffline.png" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="AddDevice.storyboard" />
@@ -1427,12 +1444,8 @@
<Project>{0F9672A4-CD14-43CD-BCAD-FDA522E932F7}</Project>
<Name>IosService</Name>
</ProjectReference>
- <ProjectReference Include="..\Shared.IOS\Shared.IOS.csproj">
- <Project>{0048AB87-2130-4437-8F01-8CADAB787004}</Project>
- <Name>Shared.IOS</Name>
- </ProjectReference>
</ItemGroup>
<Import Project="..\SmartHome\SmartHome.projitems" Label="Shared" Condition="Exists('..\SmartHome\SmartHome.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
- <Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
+ <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
</Project>
\ No newline at end of file
--
Gitblit v1.8.0