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_Android/HDL-ON_Android.csproj | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index c83cd17..75f234a 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -125,9 +125,6 @@
<Reference Include="Shared.Droid.JLCountryCode">
<HintPath>..\DLL\Android\Shared.Droid.JLCountryCode.dll</HintPath>
</Reference>
- <Reference Include="AndriodBluetoothLibrary">
- <HintPath>..\DLL\Android\AndriodBluetoothLibrary.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@@ -833,15 +830,12 @@
<AndroidAsset Include="Assets\Phone\PirIcon\icon2.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\succeed.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\selected+.png" />
- <AndroidAsset Include="Assets\Phone\Public\ProgressMsg.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\UploadToClound.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\NetConnectSelect.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\ConnectSuccess.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\ConnectSuccessSelect.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\MiniRemoteControlBigPictrue.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\UploadToCloundSelect.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\MiniRemoteControlMenuIcon.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\WifiAndPhoneConnect.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\1.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\2.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\3.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\4.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\left.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\right.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
--
Gitblit v1.8.0