From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 25 七月 2024 17:25:59 +0800 Subject: [PATCH] 2024年07月25日17:24:45 --- HDL-ON_Android/HDL-ON_Android.csproj | 229 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 202 insertions(+), 27 deletions(-) diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj index 4b32131..8c3c5b0 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> @@ -163,8 +161,8 @@ <Reference Include="videophone"> <HintPath>..\DLL\FL\Android\videophone.dll</HintPath> </Reference> - <Reference Include="Shared.Droid.HDLLinphone"> - <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath> + <Reference Include="UMSdkDroid"> + <HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath> </Reference> <Reference Include="Mono.Android.Export" /> <Reference Include="ScanSdk"> @@ -191,11 +189,17 @@ <Reference Include="LcVideoSdk"> <HintPath>..\DLL\LC\Android\LcVideoSdk.dll</HintPath> </Reference> - <Reference Include="HdlEzvizDroid"> - <HintPath>..\DLL\HdlEzvizDroid.dll</HintPath> + <Reference Include="Shared.Droid"> + <HintPath>..\DLL\Android\Shared.Droid.dll</HintPath> </Reference> - <Reference Include="UMSdkDroid"> - <HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath> + <Reference Include="Shared.Droid.HDLLinphone"> + <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath> + </Reference> + <Reference Include="HdlEzvizDroid"> + <HintPath>..\DLL\Android\HdlEzvizDroid.dll</HintPath> + </Reference> + <Reference Include="Aliyun.Api.LogService"> + <HintPath>..\DLL\Aliyun.Api.LogService.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -401,6 +405,12 @@ <AndroidAsset Include="Assets\Phone\LogicIcon\selectlocation.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorfulBar.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\groupControl_blue.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\FunctionIcon\DoorLock\DoorlockUserManager.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\groupControl.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\SeriesIcon.png" /> @@ -428,6 +438,148 @@ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorlockBatteryManagementBg.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\groupControl_white.png" /> <AndroidAsset Include="Assets\Phone\Classification\Room\HomePagebg.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\bofang.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\caidan.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\dankongdeng.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\dengguan.png" /> + <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\guan.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\huikan.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\jia.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\jian.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\jinchucang.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\jingyin.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\kai.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\kauitui.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\kuaijin.png" /> + <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\quxiao.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\shang.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\shangyibu.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\shengdao.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\shixuqi.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\tingzhi.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\touping.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\xia.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\xiangshang.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\xiangxia.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\xiayibu.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\xinhaoyuan.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\xinxi.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\xuanze.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\yingku.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\yingkunext.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\yingui.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\yingyinzhongkong1.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\yingyinzhongkong2.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\yinliangjia.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\yinliangjian.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\you.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\yule.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\zanting.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\zdyanjian.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\zdyshang1.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\zdyxia2.png" /> + <AndroidAsset Include="Assets\Phone\AksIcon\zdyyou2.png" /> + <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\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\Phone\Collection\GatewayOnlineTipIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" /> <AndroidAsset Include="Assets\h5\index.html" /> <AndroidAsset Include="Assets\h5\static\index.63b34199.css" /> <AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" /> @@ -447,16 +599,32 @@ <AndroidAsset Include="Assets\h5\static\images\down-icon-unselect.png" /> <AndroidAsset Include="Assets\h5\static\images\co2-reduction-ic.png" /> <AndroidAsset Include="Assets\h5\static\images\left-icon.png" /> + <AndroidAsset Include="Assets\h5\static\js\pages-index-index.a5a00a32.js" /> + <AndroidAsset Include="Assets\h5\static\js\index.3517131b.js" /> <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.31e0ba7a.js" /> - <AndroidAsset Include="Assets\h5\static\js\pages-index-index.25064587.js" /> - <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\FunctionIcon\GroupControl\gp_all_off_home_click.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_off_home.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_off.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on_home_click.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on_home.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensordryContact.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorpir_hold.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensordryContact_blue.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensordryContact_white.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorpir_hold_blue.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorpir_hold_white.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorlight.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_off_home_click.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_off_home.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_off.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_on_home_click.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_on_home.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_on.png" /> + <AndroidAsset Include="Assets\Phone\LogicIcon\electricaltvhisense.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Icon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Bg.png" /> </ItemGroup> <ItemGroup> <AndroidResource Include="Resources\values\colors.xml" /> @@ -783,6 +951,7 @@ <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" /> <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" /> <PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" /> + <PackageReference Include="Xamarin.Essentials" Version="1.7.0" /> <PackageReference Include="Xamarin.Android.Support.v4"> <Version>28.0.0.3</Version> </PackageReference> @@ -807,8 +976,17 @@ <PackageReference Include="Square.OkHttp3"> <Version>3.14.4</Version> </PackageReference> - <PackageReference Include="Bugly"> - <Version>4.3.1</Version> + <PackageReference Include="Google.Protobuf"> + <Version>3.5.1</Version> + </PackageReference> + <PackageReference Include="Microsoft.AspNet.WebApi.Client"> + <Version>5.2.4</Version> + </PackageReference> + <PackageReference Include="Iconic.Zlib.Netstandard"> + <Version>1.0.0</Version> + </PackageReference> + <PackageReference Include="lz4net"> + <Version>1.0.15.93</Version> </PackageReference> </ItemGroup> <ItemGroup> @@ -1366,7 +1544,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" /> @@ -1663,11 +1840,9 @@ <Folder Include="Assets\Phone\FunctionIcon\Panel\" /> <Folder Include="Assets\Phone\FunctionIcon\Inverter\" /> <Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\AliyuLog\AliyuLog.csproj"> - <Name>AliyuLog</Name> - </ProjectReference> + <Folder Include="Assets\Phone\AksIcon\" /> + <Folder Include="Assets\Phone\HisenseTv\" /> + <Folder Include="Assets\Phone\FunctionIcon\GroupControl\" /> </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