From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL-ON_Android/HDL-ON_Android.csproj | 271 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 193 insertions(+), 78 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index b407030..f456c11 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -17,13 +17,13 @@
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
- <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<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>
@@ -66,11 +67,9 @@
<AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
<AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
<AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis>
+<AndroidPackageFormat>aab</AndroidPackageFormat>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Shared.Droid.JPush">
- <HintPath>..\DLL\Shared.Droid.JPush.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
@@ -79,12 +78,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>
<Reference Include="Shared.Droid.Smartrefresh">
<HintPath>..\DLL\Android\Shared.Droid.Smartrefresh.dll</HintPath>
</Reference>
@@ -157,18 +150,6 @@
<Reference Include="http">
<HintPath>..\DLL\FL\Android\http.dll</HintPath>
</Reference>
- <Reference Include="VideoLibs">
- <HintPath>..\DLL\FL\Android\VideoLibs.dll</HintPath>
- </Reference>
- <Reference Include="videophone">
- <HintPath>..\DLL\FL\Android\videophone.dll</HintPath>
- </Reference>
- <Reference Include="UMSdkDroid">
- <HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath>
- </Reference>
- <Reference Include="Shared.Droid.HDLLinphone">
- <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
- </Reference>
<Reference Include="Mono.Android.Export" />
<Reference Include="ScanSdk">
<HintPath>..\DLL\Scan\ScanSdk.dll</HintPath>
@@ -194,12 +175,23 @@
<Reference Include="LcVideoSdk">
<HintPath>..\DLL\LC\Android\LcVideoSdk.dll</HintPath>
</Reference>
- <Reference Include="HdlEzvizDroid">
- <HintPath>..\DLL\HdlEzvizDroid.dll</HintPath>
+ <Reference Include="Aliyun.Api.LogService">
+ <HintPath>..\..\绗笁鏂瑰姛鑳絓闃块噷浜慭Net Code\Aliyun.Api.LogService.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid">
+ <HintPath>..\DLL\Android\Shared.Droid.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.HDLWidget">
+ <HintPath>..\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.HDLLinphone">
+ <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Net.Http">
+ <HintPath>..\..\..\..\..\..\Library\Frameworks\Xamarin.Android.framework\Versions\13.2.2.0\lib\xamarin.android\xbuild-frameworks\MonoAndroid\v1.0\System.Net.Http.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="MainActivity.cs" />
<Compile Include="Other\JPush\JPushFirmBroadcast.cs" />
<Compile Include="Other\JPush\JPushOpenClickActivity.cs" />
<Compile Include="Resources\Resource.designer.cs" />
@@ -212,11 +204,6 @@
<Compile Include="Other\JLCountrycode.cs" />
<Compile Include="Other\JPush\JPushReceiver.cs" />
<Compile Include="Other\JPush\JPushService.cs" />
- <Compile Include="VideoActivity.cs" />
- <Compile Include="FengLinVideo\Interface\VideoState.cs" />
- <Compile Include="FengLinVideo\Form\MonitorFragment.cs" />
- <Compile Include="FengLinVideo\Form\ReverseCallFragment.cs" />
- <Compile Include="FengLinVideo\widget\TipDiaglog.cs" />
<Compile Include="LeChengVideo\Form\MonitorFragment.cs" />
<Compile Include="LeChengVideo\Form\ReverseCallFragment.cs" />
<Compile Include="LeChengVideoActivity.cs" />
@@ -226,7 +213,6 @@
<Compile Include="Zxing\CustomCaptureActivity.cs" />
<Compile Include="Zxing\ScanActivity.cs" />
<Compile Include="LeChengVideo\LeTest.cs" />
- <Compile Include="Other\LocationUtils.cs" />
<Compile Include="Other\MyLocationListener_V2.cs" />
</ItemGroup>
<ItemGroup>
@@ -401,30 +387,7 @@
<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\index.html" />
- <AndroidAsset Include="Assets\h5\static\index.63b34199.css" />
- <AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" />
- <AndroidAsset Include="Assets\h5\static\images\inverter-center.svg" />
- <AndroidAsset Include="Assets\h5\static\images\equal-plant-ic.png" />
- <AndroidAsset Include="Assets\h5\static\images\left-icon-unselect.png" />
- <AndroidAsset Include="Assets\h5\static\images\eidt.png" />
- <AndroidAsset Include="Assets\h5\static\images\switch-off.svg" />
- <AndroidAsset Include="Assets\h5\static\images\circle-ic.png" />
- <AndroidAsset Include="Assets\h5\static\images\inverter-center.png" />
- <AndroidAsset Include="Assets\h5\static\images\pan_ic.png" />
- <AndroidAsset Include="Assets\h5\static\images\right-icon-unselect.png" />
- <AndroidAsset Include="Assets\h5\static\images\up-icon-unselect.png" />
- <AndroidAsset Include="Assets\h5\static\images\switch-on.svg" />
- <AndroidAsset Include="Assets\h5\static\images\inverter-center.webp" />
- <AndroidAsset Include="Assets\h5\static\images\yinying.png" />
- <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\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 +427,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" />
@@ -517,14 +478,10 @@
<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_hou.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\ykq_jia.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\ykq_jian.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_qian.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" />
@@ -534,7 +491,6 @@
<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_youpin.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" />
@@ -543,10 +499,146 @@
<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_qian_selected.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_right_selected.png" />
- <AndroidAsset Include="Assets\Phone\AksIcon\ykq_hou_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\FunctionIcon\Icon\HomeIcon\electricaltvhisense_blue.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" />
+ <AndroidAsset Include="Assets\h5\static\images\inverter-center.svg" />
+ <AndroidAsset Include="Assets\h5\static\images\equal-plant-ic.png" />
+ <AndroidAsset Include="Assets\h5\static\images\left-icon-unselect.png" />
+ <AndroidAsset Include="Assets\h5\static\images\eidt.png" />
+ <AndroidAsset Include="Assets\h5\static\images\switch-off.svg" />
+ <AndroidAsset Include="Assets\h5\static\images\circle-ic.png" />
+ <AndroidAsset Include="Assets\h5\static\images\inverter-center.png" />
+ <AndroidAsset Include="Assets\h5\static\images\pan_ic.png" />
+ <AndroidAsset Include="Assets\h5\static\images\right-icon-unselect.png" />
+ <AndroidAsset Include="Assets\h5\static\images\up-icon-unselect.png" />
+ <AndroidAsset Include="Assets\h5\static\images\switch-on.svg" />
+ <AndroidAsset Include="Assets\h5\static\images\inverter-center.webp" />
+ <AndroidAsset Include="Assets\h5\static\images\yinying.png" />
+ <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\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" />
+ <None Include="libs\armeabi-v7a\libjcore212.so" />
+ <None Include="libs\arm64-v8a\libjcore212.so" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\Mode_QuickHeat.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\NextIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\ModeFree_False.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\Mode_Economic.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\PreIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\Mode_QuickHeat_On.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\TempBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoIcon_3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\Mode_Economic_On.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\ModeFree_True.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoIcon_2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoIcon_1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EsIconDischarge.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvIconFault.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EsIconCharg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconFault.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconDischarg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\SocialContributionInfoIcon_Coal.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvBgDischarge.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvIconStandby.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconShutdown.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\ElectricityConsumptionBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\SocialContributionInfoBg_Coal.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EnergyStorageStatusBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EsIconShutdown.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\ElectricityGenerationIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\ElectricityConsumptionIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconCharg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\ElectricityGenerationBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvBgRun.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvIconRun.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EsIconFault.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\AcstFunctionBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\InverterJinmaoFunctionBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconCharg100.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconDischarg100.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconFault100.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconShutdown100.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\TokenInvalidTipIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\RightIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\Power80pIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -873,7 +965,6 @@
<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>
@@ -895,20 +986,38 @@
<PackageReference Include="Xamarin.Android.Support.Constraint.Layout.Solver">
<Version>1.1.0</Version>
</PackageReference>
- <PackageReference Include="Microsoft.AppCenter.Crashes">
- <Version>4.2.0</Version>
- </PackageReference>
- <PackageReference Include="Microsoft.AppCenter.Analytics">
- <Version>4.2.0</Version>
- </PackageReference>
- <PackageReference Include="Microsoft.AppCenter">
- <Version>4.2.0</Version>
- </PackageReference>
<PackageReference Include="Square.OkHttp3">
<Version>3.14.4</Version>
</PackageReference>
- <PackageReference Include="Bugly">
- <Version>4.3.1</Version>
+ <PackageReference Include="Xamarin.Google.Android.Material">
+ <Version>1.10.0.3</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
+ <Version>2.7.0.1</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.AndroidX.DataBinding.ViewBinding">
+ <Version>8.3.2</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.AndroidX.ConstraintLayout.Solver">
+ <Version>2.0.4.18</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4">
+ <Version>1.0.0.23</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.AndroidX.Browser">
+ <Version>1.8.0</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>
+ <PackageReference Include="Google.Protobuf">
+ <Version>3.5.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -1466,7 +1575,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" />
@@ -1764,6 +1872,13 @@
<Folder Include="Assets\Phone\FunctionIcon\Inverter\" />
<Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" />
<Folder Include="Assets\Phone\AksIcon\" />
+ <Folder Include="Assets\Phone\FunctionIcon\GroupControl\" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\OnPro_JPush\OnPro_JPush.csproj">
+ <Project>{723098FE-214B-4E79-A5D0-DA31B9366611}</Project>
+ <Name>OnPro_JPush</Name>
+ </ProjectReference>
</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