From e1ac4ab0e68024e6289e0b11756962d662749b04 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 17:15:23 +0800
Subject: [PATCH] Revert "Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC"
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 3eee26f..e375828 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1057,19 +1057,26 @@
<BundleResource Include="Resources\Phone\PirIcon\adddevice.png" />
<BundleResource Include="Resources\Phone\PirIcon\next.png" />
<BundleResource Include="Resources\Phone\LogicIcon\selected+.png" />
- <BundleResource Include="Resources\Phone\Public\ProgressMsg.png" />
- <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\UploadToClound.png" />
- <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\NetConnectSelect.png" />
- <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\ConnectSuccess.png" />
- <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\ConnectSuccessSelect.png" />
- <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\MiniRemoteControlBigPictrue.png" />
- <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\UploadToCloundSelect.png" />
- <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\MiniRemoteControlMenuIcon.png" />
- <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\WifiAndPhoneConnect.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\1.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\2.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\3.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\4.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\failed.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\icon1.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\icon2.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\left.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\right.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\succeed.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
<ITunesArtwork Include="iTunesArtwork%402x" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\HdlBluWi\Blufi.csproj">
+ <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
+ <Name>Blufi</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
@@ -1104,12 +1111,6 @@
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320480.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960-1.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136-1.png" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\HdlBluWi\Blufi.csproj">
- <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
- <Name>Blufi</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