From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL-ON_Android/HDL-ON_Android.csproj | 106 +++--------------------------------------------------
1 files changed, 6 insertions(+), 100 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 2024a47..1ccbe08 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -263,100 +263,8 @@
<AndroidAsset Include="Assets\Phone\Public\LinkIotIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\IotCheckIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\IotCheckOnIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHumiIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\PowerIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeCoolIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatHumiIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAtHome2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeFanIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\TempAndHumiBack.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\CollectionIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatHumiIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHumiIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeCoolIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneSleepIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneSleepIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeFanIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeDeHumiIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAtHome.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeDeHumiIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAwayHomeIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\MsgViewBg.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAwayHomeIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatHumiIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeFanIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\CollectionIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHumiIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeCoolIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneSleepIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\BgSubControlView.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeDeHumiIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAtHome.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAwayHomeIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHumiIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\PowerIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeCoolIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatHumiIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAtHome2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeFanIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\TempAndHumiBack.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\CollectionIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatHumiIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHumiIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeCoolIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneSleepIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneSleepIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeFanIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeDeHumiIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAtHome.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeDeHumiIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAwayHomeIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\MsgViewBg.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAwayHomeIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHumiIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\PowerIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeCoolIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatHumiIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAtHome2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeFanIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\TempAndHumiBack.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\CollectionIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatHumiIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHumiIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeCoolIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneSleepIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneSleepIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeFanIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeDeHumiIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAtHome.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeDeHumiIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAwayHomeIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\MsgViewBg.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAwayHomeIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\TopViewBg.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\TopViewBg.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\TopViewBg.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BgChooseMode.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BgChooseScene.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\PowerOffIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\LvJianLogo.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeCoolIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeDeHumiIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeFanIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatHumiIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHumiIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAtHome2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAwayHomeIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneSleepIcon2.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\AcstFunctionBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BackIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\ThumbImage.png" />
<AndroidAsset Include="Assets\h5\index.html" />
<AndroidAsset Include="Assets\h5\static\index.2772579d.css" />
<AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" />
@@ -376,17 +284,15 @@
<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-inverter-index.3b3b0fdd.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.aea6a122.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-index-index.7634b70a.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0b8ec7be.js" />
<AndroidAsset Include="Assets\h5\static\js\chunk-vendors.9e7e69a0.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.cac3b1d6.js" />
- <AndroidAsset Include="Assets\h5\static\js\index.12e3fcbf.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index.66eb9118.js" />
+ <AndroidAsset Include="Assets\h5\static\js\index.95903989.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\Phone\FunctionIcon\Acst\BackIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\ThumbImage.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
--
Gitblit v1.8.0