From fdbcb1f7463cb766f90bd29dd715485ba9d88524 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 06 九月 2023 17:55:03 +0800
Subject: [PATCH] Merge branch 'wxr-2.0' into Dev-Branch
---
HDL-ON_Android/HDL-ON_Android.csproj | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index e7a4c18..9a632bf 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -580,10 +580,8 @@
<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\kaiguan.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\offbj.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\offtvbj.png" />
- <AndroidAsset Include="Assets\Phone\HisenseTv\on.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\onbj.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\shouye.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjia.png" />
@@ -592,6 +590,21 @@
<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\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\Collection\GatewayOnlineTipIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
--
Gitblit v1.8.0