Merge branch 'dev--wxr'

wxr

2022-10-27 bbd6b592a6b883e013ff1e0a574976ceba5009ea

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -184,6 +184,7 @@
    <Reference Include="Shared.Droid.HDLLinphone">
      <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
    </Reference>
    <Reference Include="Mono.Android.Export" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="MainActivity.cs" />
@@ -260,6 +261,134 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensormegahealth.png" />
    <AndroidAsset Include="Assets\Phone\Public\Iot_agreement_icon.png" />
    <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\BackIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\ThumbImage.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Inverter\Icon1.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Inverter\Icon2.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Inverter\Icon3.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BgChooseScene.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\LvJianLogo.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BgChooseMode.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\TopViewBg.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\ModeHumiIcon2.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeCoolIcon2.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatHumiIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatIcon2.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAtHome2.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\ModeHeatHumiIcon2.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\PowerOffIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneSleepIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneSleepIcon2.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\BgSubControlView.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeFanIcon2.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\ModeDeHumiIcon2.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAwayHomeIcon2.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\TopViewBg.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\TopViewBg.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\h5\index.html" />
    <AndroidAsset Include="Assets\h5\static\index.b0707a6a.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-inverter-index.8c87c530.js" />
    <AndroidAsset Include="Assets\h5\static\js\chunk-vendors.c6df545a.js" />
    <AndroidAsset Include="Assets\h5\static\js\index.b9157150.js" />
    <AndroidAsset Include="Assets\h5\static\js\pages-index-index.3667377f.js" />
    <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.d05a76d6.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" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />
@@ -1468,6 +1597,7 @@
    <Folder Include="Zxing\" />
    <Folder Include="Assets\Phone\FunctionIcon\CAC\" />
    <Folder Include="Assets\Phone\FunctionIcon\Panel\" />
    <Folder Include="Assets\Phone\FunctionIcon\Inverter\" />
  </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" />