From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:46:32 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6
---
HDL-ON_Android/HDL-ON_Android.csproj | 257 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 202 insertions(+), 55 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 40665d6..783fb5d 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -33,7 +33,7 @@
<DefineConstants>DEBUG;TRACE;__Android__</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
+ <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<MandroidI18n>cjk</MandroidI18n>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
@@ -52,6 +52,7 @@
<MandroidI18n>cjk</MandroidI18n>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+ <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -254,104 +255,156 @@
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\answer.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\back_icon.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\dialog_background.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\hangup.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\mic.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\screenshot_def.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\screenshot_sel.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\screenshot.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\sure_background_def.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\sure_background_sel.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\tip_background.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\unlock_def.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\unlock_sel.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\unlock.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\video_background.png">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\layout\activity_video_phone.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\layout\dialog_tip.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\layout\fragment_call.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\layout\fragment_monitor.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\values-zh\strings.xml">
- <SubType></SubType>
- <Generator></Generator>
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\launchImage.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
+ <AndroidResource Include="Resources\mipmap-xhdpi\Loading.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\mipmap-hdpi\Loading.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\mipmap-mdpi\Loading.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\mipmap-xxhdpi\Loading.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\mipmap-xxxhdpi\Loading.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
</ItemGroup>
<ItemGroup>
- <Folder Include="Resources\drawable\" />
- <Folder Include="Resources\layout\" />
- <Folder Include="Assets\Phone\Intelligence\" />
- <Folder Include="Assets\Phone\DeviceIcon\" />
- <Folder Include="Other\" />
- <Folder Include="Other\JPush\" />
- <Folder Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\" />
- <Folder Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\" />
- <Folder Include="Assets\Phone\PirIcon\" />
- <Folder Include="Assets\Phone\VideoIcon\" />
- <Folder Include="Assets\Phone\FunctionIcon\Energy\" />
+ <AndroidAsset Include="Assets\Phone\Public\MsgIcon\TipSuccessIcon.png" />
</ItemGroup>
- <ItemGroup />
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\BindScene.png" />
+ </ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
@@ -533,7 +586,6 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Music\MusicIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Music\MusicOnIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanIconBg.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TVIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanThinIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanIconOnBg.png" />
@@ -841,7 +893,6 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\AirCleanerThiinIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobotThinIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\MuteSelect.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\Battery.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ControlRight.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\AreaMode.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\AutoMode.png" />
@@ -1136,11 +1187,107 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\SmartSpeaker.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irpjt.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irstb.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irpjt_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irpjt_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irstb_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irstb_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Energy\EnergyDrodUpIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensormegahealth.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconDown.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconLeft.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconRight.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconUp.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconOk.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irtvxm.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irtvxm_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irtvxm_white.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\SenesorMegahealthBg.png" />
+ <AndroidAsset Include="Assets\Phone\Public\Scan.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\SomeoneFellBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\SomeoneInBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\UnderProtectionBgIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
<AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Connect.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Delete.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Editor.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Hide.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\More.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Mute.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Redistribution.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Screen.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Shard.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnConnect.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLockManager.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Voice.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Public\BatteryEnough.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Public\BatteryNot.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\LockPictrue1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\LockPictrue2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\History.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" />
+ </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" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
--
Gitblit v1.8.0