From c00da77d00a479fa5d022346a6d9075f90a5c087 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期六, 14 九月 2024 10:05:34 +0800
Subject: [PATCH] 退出登录时间调整,新风,音乐

---
 HDL-ON_Android/HDL-ON_Android.csproj |   70 +++++++++++++++++++++++++++++++---
 1 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index e9e4960..50108d5 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -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" />
@@ -164,9 +161,6 @@
     <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>
@@ -196,7 +190,16 @@
       <HintPath>..\DLL\Android\Shared.Droid.dll</HintPath>
     </Reference>
     <Reference Include="HdlEzvizDroid">
-      <HintPath>..\..\..\HdlEzvizDroid.dll</HintPath>
+      <HintPath>..\DLL\Android\HdlEzvizDroid.dll</HintPath>
+    </Reference>
+    <Reference Include="Aliyun.Api.LogService">
+      <HintPath>..\DLL\Aliyun.Api.LogService.dll</HintPath>
+    </Reference>
+    <Reference Include="Shared.Droid.JPush">
+      <HintPath>..\..\绗笁鏂瑰姛鑳絓鏋佸厜\Sdk5.4.0\2024-07-19\Shared.Droid.JPush.dll</HintPath>
+    </Reference>
+    <Reference Include="Shared.Droid.HDLLinphone">
+      <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -622,6 +625,47 @@
     <AndroidAsset Include="Assets\Phone\LogicIcon\electricaltvhisense.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Icon.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Bg.png" />
+    <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" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\values\colors.xml" />
@@ -973,6 +1017,18 @@
     <PackageReference Include="Square.OkHttp3">
       <Version>3.14.4</Version>
     </PackageReference>
+    <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>
     <AndroidAsset Include="Assets\Language.ini" />

--
Gitblit v1.8.0