From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 09:01:53 +0800
Subject: [PATCH] 更新

---
 HDL-ON_Android/HDL-ON_Android.csproj |   33 ++++++++++++++-------------------
 1 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 69087ed..28741b6 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -33,16 +33,13 @@
     <DefineConstants>DEBUG;TRACE;__Android__</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
     <MandroidI18n>cjk</MandroidI18n>
     <AndroidDexTool>d8</AndroidDexTool>
     <AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
-    <AndroidKeyStore>true</AndroidKeyStore>
-    <AndroidSigningKeyStore>D:\job\job\On+\HDL_APP_Project\on_plus.keystore</AndroidSigningKeyStore>
+    <AndroidSigningKeyStore>/Users/kaede/Desktop/HDL_APP_Project/on_plus.keystore</AndroidSigningKeyStore>
     <AndroidSigningStorePass>85521566</AndroidSigningStorePass>
     <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
     <AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <AotAssemblies>false</AotAssemblies>
     <EnableLLVM>false</EnableLLVM>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
@@ -63,8 +60,7 @@
     <MandroidI18n>cjk</MandroidI18n>
     <AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <AndroidKeyStore>true</AndroidKeyStore>
-    <AndroidSigningKeyStore>D:\job\job\On+\HDL_APP_Project\on_plus.keystore</AndroidSigningKeyStore>
+    <AndroidSigningKeyStore>/Users/kaede/Desktop/HDL_APP_Project/on_plus.keystore</AndroidSigningKeyStore>
     <AndroidSigningStorePass>85521566</AndroidSigningStorePass>
     <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
     <AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
@@ -165,9 +161,6 @@
     <Reference Include="videophone">
       <HintPath>..\DLL\FL\Android\videophone.dll</HintPath>
     </Reference>
-    <Reference Include="LC_SDK">
-      <HintPath>..\DLL\LC\Android\LC_SDK.dll</HintPath>
-    </Reference>
     <Reference Include="Square.OkHttp3">
       <HintPath>..\DLL\EZvizMonitor\Square.OkHttp3.dll</HintPath>
     </Reference>
@@ -179,6 +172,9 @@
     </Reference>
     <Reference Include="Shared.Droid.HDLLinphone">
       <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
+    </Reference>
+    <Reference Include="Shared.Droid.LCVideoSDK">
+      <HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -210,6 +206,10 @@
     <None Include="Resources\AboutResources.txt" />
     <None Include="Properties\AndroidManifest.xml" />
     <None Include="Assets\AboutAssets.txt" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\HumiIcon.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\btnCloseIcon.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\btnInfoIcon.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\HumiOnIcon.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\values\colors.xml" />
@@ -499,6 +499,8 @@
     <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_white.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\security.png" />
     <AndroidAsset Include="Assets\Phone\Public\HookIcon.png" />
+    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\Property.png" />
+    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\PropertyOn.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\BindScene.png" />
@@ -1306,16 +1308,6 @@
   </ItemGroup>
   <ItemGroup>
     <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
-    <AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
-    <AndroidNativeLibrary Include="libs\armeabi-v7a\libconfigsdk.so" />
-    <AndroidNativeLibrary Include="libs\armeabi-v7a\libGMCrypto.so" />
-    <AndroidNativeLibrary Include="libs\armeabi-v7a\libgnustl_shared.so" />
-    <AndroidNativeLibrary Include="libs\armeabi-v7a\libjninetsdk.so" />
-    <AndroidNativeLibrary Include="libs\armeabi-v7a\libLCOpenApiClient.so" />
-    <AndroidNativeLibrary Include="libs\armeabi-v7a\libLechangeSDK.so" />
-    <AndroidNativeLibrary Include="libs\armeabi-v7a\libnetsdk.so" />
-    <AndroidNativeLibrary Include="libs\armeabi-v7a\libSmartConfig.so" />
-    <AndroidNativeLibrary Include="libs\armeabi-v7a\libSoftAPConfig.so" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Connect.png" />
@@ -1393,6 +1385,9 @@
     <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" />
   </ItemGroup>
   <ItemGroup />
+  <ItemGroup>
+    <Folder Include="libs\arm64-v8a\" />
+  </ItemGroup>
   <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

--
Gitblit v1.8.0