From 171bf03f3664226eeff2b20ee9bd2e914b63a17d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 13 三月 2020 09:18:50 +0800
Subject: [PATCH] 20200313

---
 HDL-ON_iOS/HDL-ON_iOS.csproj |  153 ++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 126 insertions(+), 27 deletions(-)

diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index f6e615c..9c41574 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -27,7 +27,6 @@
         <MtouchDebug>true</MtouchDebug>
         <CodesignKey>iPhone Developer</CodesignKey>
         <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
-        <MtouchSdkVersion>13.1</MtouchSdkVersion>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
         <DebugType>none</DebugType>
@@ -47,7 +46,6 @@
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
         <MtouchArch>ARM64</MtouchArch>
-        <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
         <CodesignKey>iPhone Developer</CodesignKey>
         <MtouchDebug>true</MtouchDebug>
         <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
@@ -70,15 +68,6 @@
         <Reference Include="System.Numerics" />
         <Reference Include="System.Numerics.Vectors" />
         <Reference Include="System.Web.Services" />
-        <Reference Include="Shared.IOS.TCL">
-          <HintPath>..\..\ON\SmartHome\SmartHome\dll\Shared.IOS.TCL.dll</HintPath>
-        </Reference>
-        <Reference Include="Shared.IOS">
-          <HintPath>..\..\ON\SmartHome\SmartHome\dll\Shared.IOS.dll</HintPath>
-        </Reference>
-        <Reference Include="Shared.IOS.TBL">
-          <HintPath>..\..\ON\SmartHome\SmartHome\dll\Shared.IOS.TBL.dll</HintPath>
-        </Reference>
     </ItemGroup>
     <ItemGroup>
       <PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
@@ -92,25 +81,9 @@
     <ItemGroup>
         <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
         <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024x500.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024X748.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024X768.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125X2436.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242x2208.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536X2008.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536X2048.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X1496.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X1536.png" />
         <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X2732 .png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208X1242.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436X1125.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320X480.png" />
         <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\4096X4096.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640X1136.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640X960.png" />
         <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1134.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1334.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768X1004.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768X1024.png" />
         <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\1024.png" />
         <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\120.png" />
         <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\152.png" />
@@ -139,12 +112,35 @@
         <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29路29.png" />
         <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58路58%402x-1.png" />
         <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024路1024%402x.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\750*1334.png" />
+        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208*1242.png" />
+        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960.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.png" />
+        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136-1.png" />
     </ItemGroup>
     <ItemGroup>
         <Folder Include="Resources\" />
         <Folder Include="Resources\Phone\" />
         <Folder Include="Assets.xcassets\LaunchImage.launchimage\" />
         <Folder Include="Resources\Phone\Public\" />
+        <Folder Include="Resources\Phone\PersonalCenter\" />
+        <Folder Include="Resources\Phone\Navigation\" />
+        <Folder Include="Resources\Phone\PersonalCenter\PersonalData\" />
+        <Folder Include="Resources\Phone\Classification\" />
+        <Folder Include="Resources\Phone\Classification\Room\" />
+        <Folder Include="Resources\Phone\Collection\" />
+        <Folder Include="Resources\Phone\Public\InfoIcon\" />
+        <Folder Include="Resources\Phone\FunctionIcon\" />
+        <Folder Include="Resources\Phone\FunctionIcon\Scene\" />
     </ItemGroup>
     <ItemGroup>
         <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -181,11 +177,114 @@
       <BundleResource Include="Resources\Phone\Public\BackIcon.png" />
       <BundleResource Include="Resources\Phone\Public\Logo.png" />
       <BundleResource Include="Resources\Phone\Public\Logo-bg.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\UserTypebg.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\AdminTypeIcon.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\MemberTypeIcon.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceManageIcon.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceMemberIcon.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceArmIcon.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceDataBackupIcon.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\AuxiliaryFunctionIcon.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\AddFunctionIcon.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\NightViewIcon.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\SwitchIcon.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\GeneralSettingsIcon.png" />
+      <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\PersonalData\QRcodeIcon.png" />
+      <BundleResource Include="Resources\Phone\Classification\ToggleDisplayThumbnail.png" />
+      <BundleResource Include="Resources\Phone\Classification\ToggleDisplayLarge.png" />
+      <BundleResource Include="Resources\Phone\Classification\Room\Roombg.png" />
+      <BundleResource Include="Resources\Phone\Collection\MsgIcon.png" />
+      <BundleResource Include="Resources\Phone\Collection\MsgIconTip.png" />
+      <BundleResource Include="Resources\Phone\Collection\Functionbg.png" />
+      <BundleResource Include="Resources\Phone\Collection\FunctionOnbg.png" />
+      <BundleResource Include="Resources\Phone\Collection\ChangeViewbg.png" />
+      <BundleResource Include="Resources\Phone\Public\InfoIcon\HumidityIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\InfoIcon\Pm25Icon.png" />
+      <BundleResource Include="Resources\Phone\Public\InfoIcon\TempIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\DownIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\transparent.png" />
+      <BundleResource Include="Resources\Phone\Collection\CollectionIcon.png" />
+      <BundleResource Include="Resources\Phone\Collection\CollectionWhiteIcon.png" />
+      <BundleResource Include="Resources\Phone\Classification\Room\AllCloseIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\PowerClose.png" />
+      <BundleResource Include="Resources\Phone\Public\PowerOpen.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainStopIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOpenIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOpenOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainStopOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Switch.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\SwitchOn.png" />
+      <BundleResource Include="Resources\Phone\Public\FuncInfoSetIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheel.png" />
+      <BundleResource Include="Resources\Phone\Public\ThumbImage.png" />
+      <BundleResource Include="Resources\Phone\Public\Fragmentbg.png" />
+      <BundleResource Include="Resources\Phone\Public\PowerClose_Shadow.png" />
+      <BundleResource Include="Resources\Phone\Public\PowerOpen_Shadow.png" />
+      <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\Curtain\CurtainThinIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingThinIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightThinIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\ChooseIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\ChooseOnIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\PlusSignIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\MinusSignIcon.png" />
+      <BundleResource Include="Resources\Phone\Collection\CollectionGrayIcon.png" />
+      <BundleResource Include="Resources\Phone\Public\Switch.png" />
+      <BundleResource Include="Resources\Phone\Public\SwitchOn.png" />
+      <BundleResource Include="Resources\Phone\Public\LocationAddressIcon.png" />
+      <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" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Scene\SceneIcon.png" />
+      <BundleResource Include="Resources\Phone\Collection\SceneCovered.png" />
+      <BundleResource Include="Resources\Phone\Collection\SceneCoveredOn.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Scene\DelayIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Scene\s2.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Scene\s1.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainBgOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainBgIcon.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" />
 </Project>
\ No newline at end of file

--
Gitblit v1.8.0