From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 170 insertions(+), 10 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 28f743f..cdd41a1 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -49,7 +49,7 @@
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
- <CodesignProvision>On_Dev-0327</CodesignProvision>
+ <CodesignProvision>On_Dev</CodesignProvision>
<MtouchI18n>cjk</MtouchI18n>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -70,6 +70,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" />
@@ -84,6 +95,9 @@
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Crashes">
<Version>3.1.0</Version>
+ </PackageReference>
+ <PackageReference Include="ZXing.Net.Mobile">
+ <Version>2.4.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -151,6 +165,10 @@
<Folder Include="Resources\Phone\FunctionIcon\Scene\" />
<Folder Include="Resources\Phone\Public\MsgIcon\" />
<Folder Include="Resources\Phone\PersonalCenter\AppUnlockSetting\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Electrical\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Socket\" />
+ <Folder Include="Resources\Phone\FunctionIcon\EnvironmentalScience\" />
+ <Folder Include="Resources\Phone\Public\AirIcon\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -169,6 +187,7 @@
</Compile>
<Compile Include="ViewControllerBase.cs" />
<Compile Include="Reachability.cs" />
+ <Compile Include="Scan.cs" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -269,8 +288,6 @@
<BundleResource Include="Resources\Phone\Public\AddIcon.png" />
<BundleResource Include="Resources\Phone\Public\EditIcon.png" />
<BundleResource Include="Resources\Phone\Public\Right.png" />
- <BundleResource Include="Resources\Phone\Public\UnSelectionIcon.png" />
- <BundleResource Include="Resources\Phone\Public\SelectionIcon.png" />
<BundleResource Include="Resources\Phone\Public\DownIcon_2.png" />
<BundleResource Include="Resources\Phone\Public\ChooseRoomListbg.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Scene\MovieMark.png" />
@@ -324,24 +341,167 @@
<BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\1On.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\2.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\3.png" />
- <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\3On.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\4On.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\3On.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\1.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\2On.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FingerprintIcon.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FaceIdIcon.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\GestureIcon.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\PasswordIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\TipIcon_Successfully.png" />
+ <BundleResource Include="Resources\Phone\Public\TipIcon_Failed.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\GestureGrayIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\Switch_2.png" />
+ <BundleResource Include="Resources\Phone\Public\SwitchOn_2.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FingerIconRed.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\NightIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\NightIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\OrdinaryIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\OrdinaryIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\AwayIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\AwayIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIconBgGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIconBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanThinIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketThinIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanOnIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketOnIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIconOnBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketIconOnBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketIconBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVPowerIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TV123Icon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVRightIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVOkIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVUpIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVleftIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVDownIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMenuUpIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMenuIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVBackIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMuteIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMenuDownIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\MenuBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\PlusIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\ReduceIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TVThinIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TVIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SmogIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\LocationIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\UpArrow.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\WeatherFanSpeedIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\TipInfoIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg1.png" />
+ <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\theme\macarons.js" />
+ <BundleResource Include="Resources\theme\macarons2.js" />
+ <BundleResource Include="Resources\theme\red.js" />
+ <BundleResource Include="Resources\theme\roma.js" />
+ <BundleResource Include="Resources\theme\helianthus.js" />
+ <BundleResource Include="Resources\theme\green.js" />
+ <BundleResource Include="Resources\theme\infographic.js" />
+ <BundleResource Include="Resources\theme\shine.js" />
+ <BundleResource Include="Resources\theme\gray.js" />
+ <BundleResource Include="Resources\theme\sakura.js" />
+ <BundleResource Include="Resources\theme\blue.js" />
+ <BundleResource Include="Resources\theme\dark.js" />
+ <BundleResource Include="Resources\theme\mint.js" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\DiagramIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\DiagramIconOn.png" />
+ <BundleResource Include="Resources\Phone\Public\MsgIcon\LoadingIcon.png" />
+ <BundleResource Include="Resources\Phone\Collection\NoCollectionBg.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\0.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\1.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\13.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\18.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\2.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\20.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\29.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\3.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\4.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\45.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\5.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\6.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\bluetooth.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\addMusic1.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\prve1Selected.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\love1.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\selectedIcon.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\playList.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\myLove.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\radio.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\filePlay.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\collect.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\loveMusic.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\qqMusic.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\clear.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\radioIcon.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\musicIcon.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\file.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\vol.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\usb.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\localMusic.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\next1.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\loveSelected1.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\selectedMusic.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\noMusic.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\addMusic.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\playBj.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\loveRadio.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\list.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\set.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\nextSelected.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\Merge.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\playStatus.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\random.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\collectSelected.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\pause.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\progressIcon.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\prevSeletced.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\MusicBack.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\fileList.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\myList.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\single.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\edit.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\next.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\filePause.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\line.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\loveSelected.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\sourceNetx.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\love.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\pause1.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\play1.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\play.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\noSelectedIcon.png" />
+ <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" />
</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>
</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