From 1cd93851bde6ec19c07f1445899a76ab0dfa507d Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 13 四月 2023 16:01:53 +0800
Subject: [PATCH] 1.增加推送判断是否加载了类的方法 2.修改launch screen引用 3.去掉门锁测试环境appkey逻辑

---
 HDL-ON_Android/HDL-ON_Android.csproj |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 8db0e94..2d7ca0c 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -65,7 +65,7 @@
     <AndroidSigningStorePass>85521566</AndroidSigningStorePass>
     <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
     <AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
-    <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
+    <AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Shared.Droid.JPush">
@@ -411,16 +411,17 @@
     <AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
     <AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" />
     <AndroidAsset Include="Assets\Phone\MusicIcon\currentPlayList.png" />
+    <AndroidAsset Include="Assets\Phone\PersonalCenter\CombinedDimmingIcon.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\OneOpenLock.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\RTV.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLocked.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLocking.png" />
-    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorlockClose.png" />
-    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\History.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Cell.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\VideoDoorLockFunctionBg.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\securitydoorezviz.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorlockClose1.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\values\colors.xml" />
@@ -780,6 +781,9 @@
     </PackageReference>
     <PackageReference Include="Square.OkHttp3">
       <Version>3.14.4</Version>
+    </PackageReference>
+    <PackageReference Include="Bugly">
+      <Version>4.3.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -1636,7 +1640,7 @@
     <Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\ys\ys.csproj">
+    <ProjectReference Include="..\ys\ys.csproj">
       <Project>{DF065E3F-C3A1-4908-9582-000974B7C290}</Project>
       <Name>ys</Name>
     </ProjectReference>

--
Gitblit v1.8.0