From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 67 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 13 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index d9f96fe..d006c83 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -46,10 +46,10 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Developer</CodesignKey>
+ <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
- <CodesignProvision>On_Dev-0327</CodesignProvision>
+ <CodesignProvision>onpro0804</CodesignProvision>
<MtouchI18n>cjk</MtouchI18n>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -60,7 +60,8 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Developer</CodesignKey>
+ <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
+ <CodesignProvision>dis-onpro-080401</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -70,6 +71,17 @@
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors" />
<Reference Include="System.Web.Services" />
+ <Reference Include="Shared.IOS">
+ <HintPath>..\DLL\Shared.IOS.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Shared.IOS.TBL">
+ <HintPath>..\DLL\Shared.IOS.TBL.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="MJRefresh_Xamarin">
+ <HintPath>..\DLL\IOS\MJRefresh_Xamarin.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
@@ -158,6 +170,7 @@
<Folder Include="Resources\Phone\FunctionIcon\Socket\" />
<Folder Include="Resources\Phone\FunctionIcon\EnvironmentalScience\" />
<Folder Include="Resources\Phone\Public\AirIcon\" />
+ <Folder Include="Resources\Phone\PersonalCenter\ResetPassword\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -177,6 +190,7 @@
<Compile Include="ViewControllerBase.cs" />
<Compile Include="Reachability.cs" />
<Compile Include="Scan.cs" />
+ <Compile Include="ZXingOverlayView.cs" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -210,14 +224,12 @@
<BundleResource Include="Resources\Phone\PersonalCenter\SupportIcon.png" />
<BundleResource Include="Resources\Phone\Navigation\UserPageNavbg.png" />
<BundleResource Include="Resources\Phone\Navigation\CollectionIcon.png" />
- <BundleResource Include="Resources\Phone\Navigation\ClassificationIcon.png" />
<BundleResource Include="Resources\Phone\Navigation\IntellectualizationIcon.png" />
<BundleResource Include="Resources\Phone\Navigation\PersonalCenterIcon.png" />
<BundleResource Include="Resources\Phone\Navigation\PersonalCenterIconOn.png" />
- <BundleResource Include="Resources\Phone\Navigation\ClassificationIconOn.png" />
<BundleResource Include="Resources\Phone\Navigation\IntellectualizationIconOn.png" />
<BundleResource Include="Resources\Phone\Navigation\CollectionIconOn.png" />
- <BundleResource Include="Resources\Phone\PersonalCenter\HomeListbg.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\HomeList3bg.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\PersonalData\QRcodeIcon.png" />
<BundleResource Include="Resources\Phone\Classification\ToggleDisplayThumbnail.png" />
<BundleResource Include="Resources\Phone\Classification\ToggleDisplayLarge.png" />
@@ -262,7 +274,7 @@
<BundleResource Include="Resources\Phone\Public\Restored_Shadow.png" />
<BundleResource Include="Resources\Phone\Public\Edit.png" />
<BundleResource Include="Resources\Phone\Public\RightIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcThinIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcThinIcon1.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainThinIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingThinIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Light\LightThinIcon.png" />
@@ -387,7 +399,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorColorTipBg.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg2.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg3.png" />
- <BundleResource Include="Resources\echarts.html" />
<BundleResource Include="Resources\theme\macarons.js" />
<BundleResource Include="Resources\theme\macarons2.js" />
<BundleResource Include="Resources\theme\red.js" />
@@ -401,7 +412,6 @@
<BundleResource Include="Resources\theme\blue.js" />
<BundleResource Include="Resources\theme\dark.js" />
<BundleResource Include="Resources\theme\mint.js" />
- <BundleResource Include="Resources\js\echarts-all.tmp" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\DiagramIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\DiagramIconOn.png" />
<BundleResource Include="Resources\Phone\Public\MsgIcon\LoadingIcon.png" />
@@ -472,16 +482,47 @@
<BundleResource Include="Resources\Phone\MusicIcon\next1Selected.png" />
<BundleResource Include="Resources\Phone\MusicIcon\prev.png" />
<BundleResource Include="Resources\Phone\MusicIcon\prve1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\Pm25Icon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\HumidityIcon.png" />
+ <BundleResource Include="Resources\echartsNew.html" />
+ <BundleResource Include="Resources\js\bmap.min.js" />
+ <BundleResource Include="Resources\js\20190126.js" />
+ <BundleResource Include="Resources\js\china.js" />
+ <BundleResource Include="Resources\js\dataTool.min.js" />
+ <BundleResource Include="Resources\js\echarts-all.js" />
+ <BundleResource Include="Resources\js\echarts-gl.min.js" />
+ <BundleResource Include="Resources\js\echarts.min.js" />
+ <BundleResource Include="Resources\js\ecStat.min.js" />
+ <BundleResource Include="Resources\js\world.js" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DiyThumbIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DiyThumbIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicPlayOnIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicPlayIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\InfoOnIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\ResetPassword\DialogTipTitleIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\MediumIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\MediumIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\LowIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\LowIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HightIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HighIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicThinIcon.png" />
+ <BundleResource Include="Resources\Phone\Navigation\HomePageIconOn.png" />
+ <BundleResource Include="Resources\Phone\Navigation\HomePageIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\HomeList1bg.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\HomeList2bg.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\HomeList4bg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\RelayOnBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\RelayBg.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
<ITunesArtwork Include="iTunesArtwork%402x" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\Shared.IOS\Shared.IOS.csproj">
- <Project>{0048AB87-2130-4437-8F01-8CADAB787004}</Project>
- <Name>Shared.IOS</Name>
- </ProjectReference>
+ <AndroidAsset Include="Resources\Phone\Navigation\ClassificationIcon.png" />
+ <AndroidAsset Include="Resources\Phone\Navigation\ClassificationIconOn.png" />
</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" />
--
Gitblit v1.8.0