From c5cb6840bd986bbd71a9ebc232bbf44ed0e1fc3d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 五月 2024 17:43:11 +0800
Subject: [PATCH] jpush更新完成
---
HDL-ON_Android/HDL-ON_Android.csproj | 147 ++++++++++++++++++++++++------------------------
1 files changed, 74 insertions(+), 73 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index f71fe68..c6a8439 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -17,7 +17,7 @@
<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>
@@ -69,9 +69,6 @@
<AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis>
</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" />
@@ -155,17 +152,8 @@
<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">
@@ -192,15 +180,11 @@
<Reference Include="LcVideoSdk">
<HintPath>..\DLL\LC\Android\LcVideoSdk.dll</HintPath>
</Reference>
- <Reference Include="HdlEzvizDroid">
- <HintPath>..\DLL\HdlEzvizDroid.dll</HintPath>
- </Reference>
<Reference Include="Shared.Droid">
<HintPath>..\DLL\Android\Shared.Droid.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" />
@@ -213,11 +197,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" />
@@ -227,7 +206,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>
@@ -402,27 +380,6 @@
<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\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" />
@@ -579,25 +536,58 @@
<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" />
+ <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" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -924,7 +914,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>
@@ -946,20 +935,26 @@
<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>
</ItemGroup>
<ItemGroup>
@@ -1814,7 +1809,13 @@
<Folder Include="Assets\Phone\FunctionIcon\Inverter\" />
<Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" />
<Folder Include="Assets\Phone\AksIcon\" />
- <Folder Include="Assets\Phone\HisenseTv\" />
+ <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