From fdbcb1f7463cb766f90bd29dd715485ba9d88524 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 06 九月 2023 17:55:03 +0800
Subject: [PATCH] Merge branch 'wxr-2.0' into Dev-Branch
---
HDL-ON_Android/HDL-ON_Android.csproj | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 33669a4..9a632bf 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -23,7 +23,7 @@
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<AndroidUseAapt2>true</AndroidUseAapt2>
- <AndroidSupportedAbis>armeabi-v7a</AndroidSupportedAbis>
+ <AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
@@ -36,7 +36,7 @@
<MandroidI18n>cjk</MandroidI18n>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
- <AndroidSigningKeyStore>/Users/kaede/Desktop/HDL_APP_Project/on_plus.keystore</AndroidSigningKeyStore>
+ <AndroidSigningKeyStore>/Users/user/Desktop/project/OnPro/on_plus.keystore</AndroidSigningKeyStore>
<AndroidSigningStorePass>85521566</AndroidSigningStorePass>
<AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
<AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
@@ -47,6 +47,7 @@
<AndroidEnableMultiDex>false</AndroidEnableMultiDex>
<AndroidUseAapt2>true</AndroidUseAapt2>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+ <AndroidSupportedAbis>arm64-v8a;armeabi-v7a</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
@@ -422,9 +423,7 @@
<AndroidAsset Include="Assets\h5\static\images\left-icon.png" />
<AndroidAsset Include="Assets\h5\static\js\chunk-vendors.56c88730.js" />
<AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.e5e9499f.js" />
- <AndroidAsset Include="Assets\h5\static\js\index.cf368d6e.js" />
<AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index.cfb4b30d.js" />
<AndroidAsset Include="Assets\h5\static\img\inverter-center.18b181f4.png" />
<AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" />
<AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" />
@@ -581,14 +580,31 @@
<AndroidAsset Include="Assets\Phone\AksIcon\aks.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\like.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\caidan.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\kaiguan.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\offbj.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\offtvbj.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\on.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\onbj.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\shouye.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjia.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjian.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\electricaltvhisense.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricaltvhisense_blue.png" />
+ <AndroidAsset Include="Assets\h5\static\js\index.31e0ba7a.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-index-index.25064587.js" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\guan.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\kai.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\kaiguanSelected.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\shouyeSelected.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjianSelected.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjiaSelected.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
+ <AndroidAsset Include="Assets\h5\static\img\inverter-center.18b181f4.png" />
+ <AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" />
+ <AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" />
+ <AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
+ <AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" />
+ <AndroidAsset Include="Assets\Phone\Collection\GatewayOnlineTipIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -1508,7 +1524,6 @@
<AndroidAsset Include="Assets\Phone\PirIcon\projector.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\search.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\tv.png" />
- <AndroidAsset Include="Assets\Phone\PirIcon\stb.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\offline.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\online.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\priequipment.png" />
--
Gitblit v1.8.0