From 0a11352dffeb8d5f31dd40b9728fe1abf4537f04 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 01 九月 2023 18:06:45 +0800
Subject: [PATCH] 2023年09月01日18:06:42
---
HDL-ON_Android/HDL-ON_Android.csproj | 110 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 99 insertions(+), 11 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 57b3d90..f71fe68 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>
@@ -79,9 +80,6 @@
<Reference Include="System.Numerics.Vectors" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Net" />
- <Reference Include="Shared.Droid">
- <HintPath>..\DLL\Shared.Droid.dll</HintPath>
- </Reference>
<Reference Include="Shared.Droid.HDLWidget">
<HintPath>..\DLL\Shared.Droid.HDLWidget.dll</HintPath>
</Reference>
@@ -196,6 +194,9 @@
</Reference>
<Reference Include="HdlEzvizDroid">
<HintPath>..\DLL\HdlEzvizDroid.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid">
+ <HintPath>..\DLL\Android\Shared.Droid.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -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" />
@@ -464,8 +463,6 @@
<AndroidAsset Include="Assets\Phone\AksIcon\dianshi.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\dianying.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\fanhui.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\gongfang1.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\gongfang2.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\guan.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\huikan.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\jia.png" />
@@ -478,7 +475,6 @@
<AndroidAsset Include="Assets\Phone\AksIcon\mubujiang.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\mubusheng.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\pindao1.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\pingdao2.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\quxiao.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\shang.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\shangyibu.png" />
@@ -510,6 +506,98 @@
<AndroidAsset Include="Assets\Phone\AksIcon\zdyzuo2.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\zimu.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\zuo.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\pindao2.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_bofan.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_caidan.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_dankongdeng.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_dengguan.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_dianshi.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_dianying.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_fanhui.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_jingyin.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_kai.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_kuaijin.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_kuaitui.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_shang.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_shangyibu.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_shoucang.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_tingzhi.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_xia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_xiayibu.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_xinxi.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_yingui.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_you.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_yule.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_zanting.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_zhuye.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_zimu.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_zuo.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_left_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_ok_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_ok.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_right_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\hdmi.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\shang_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\xia_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\you_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\zuo_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\gfyingliangjia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\gfyingliangjian.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_bofan_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_caidan_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_dankongdeng_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_dengguang_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_dianshi_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_dianying_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_fanhui_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_jingyin_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_kaiguang_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_kuaijin_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_kuaitui_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_pindaojia_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_pindaojian_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_shangyibu_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_shoucang_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_tingzhi_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_touping_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_xiayibu_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_xinxi_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_yingliangjia_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_yingliangjian_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_yingui_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_yule_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_zanting_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_zhuye_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_zimu_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_shang_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_xia_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_yingliangjia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_yingliangjian.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_pindaojia.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_pindaojian.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\ykq_toupin.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricaltvhisense.png" />
+ <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\offbj.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\offtvbj.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" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -1429,7 +1517,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" />
@@ -1727,6 +1814,7 @@
<Folder Include="Assets\Phone\FunctionIcon\Inverter\" />
<Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" />
<Folder Include="Assets\Phone\AksIcon\" />
+ <Folder Include="Assets\Phone\HisenseTv\" />
</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" />
--
Gitblit v1.8.0