From 223b318d0070d06e7b64192dc93aa8103865d657 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 16 三月 2021 11:42:57 +0800
Subject: [PATCH] 1.

---
 HDL-ON_Android/HDL-ON_Android.csproj |   81 +++++++++++++++++++++++++++++-----------
 1 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index d35a52a..c83cd17 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -125,6 +125,9 @@
     <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" />
@@ -153,48 +156,70 @@
     <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />
     <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher_round.xml" />
     <AndroidResource Include="Resources\drawable\Loading.png">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\drawable\Icon.png">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\mipmap-xxhdpi\Icon.png">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\xml\network_security_config.xml">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\xml\file_paths.xml">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\layout\zxing_layout.xml">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\mipmap-xhdpi\Icon.png">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\mipmap-mdpi\Icon.png">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\mipmap-hdpi\Icon.png">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\mipmap-anydpi-v26\Icon.png">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
   </ItemGroup>
   <ItemGroup>
@@ -208,6 +233,7 @@
     <Folder Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\" />
     <Folder Include="Assets\Phone\PirIcon\" />
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
@@ -648,7 +674,6 @@
     <AndroidAsset Include="Assets\Phone\LogicIcon\-.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\+.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\point.png" />
-    <AndroidAsset Include="Assets\Phone\LogicIcon\ selected+.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\selected-.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\link.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheFun.png" />
@@ -807,6 +832,16 @@
     <AndroidAsset Include="Assets\Phone\PirIcon\icon1.png" />
     <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" />
   </ItemGroup>
   <ItemGroup>
     <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />

--
Gitblit v1.8.0