From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 252 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 239 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 9a22a2e..709af84 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -39,9 +39,9 @@
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<AndroidDexTool>d8</AndroidDexTool>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-<AndroidKeyStore>True</AndroidKeyStore>
-<AndroidSigningKeyStore>/Users/hdl/Desktop/Keystore/HDL Home/HDL Home.keystore</AndroidSigningKeyStore>
-<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+<AndroidKeyStore></AndroidKeyStore>
+<AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
+<AndroidSupportedAbis>arm64-v8a;armeabi-v7a;x86;x86_64</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -57,8 +57,8 @@
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidUseAapt2>false</AndroidUseAapt2>
- <AndroidKeyStore></AndroidKeyStore>
- <AndroidSigningKeyStore>/Users/hdl/Desktop/Keystore/HDL\ Home/HDL\ Home.keystore</AndroidSigningKeyStore>
+ <AndroidKeyStore>True</AndroidKeyStore>
+ <AndroidSigningKeyStore>/Users/hdl/Desktop/Keystore/HDL EVOYO/Evoyo Home.keystore</AndroidSigningKeyStore>
</PropertyGroup>
<ItemGroup>
<Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
@@ -139,6 +139,9 @@
<Reference Include="Microsoft.AppCenter.Analytics">
<HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll</HintPath>
</Reference>
+ <Reference Include="testLibs">
+ <HintPath>..\Shared\DLL\Android\testLibs.dll</HintPath>
+ </Reference>
<Reference Include="Xamarin.Android.Arch.Core.Common">
<HintPath>..\Shared\DLL\Android\Xamarin.Android.Arch.Core.Common.dll</HintPath>
</Reference>
@@ -196,8 +199,13 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Application.cs" />
+ <Compile Include="FengLinVideo\Forms\MonitorFragment.cs" />
+ <Compile Include="FengLinVideo\Forms\ReverseCallFragment.cs" />
+ <Compile Include="FengLinVideo\Interface\VideoState.cs" />
+ <Compile Include="FengLinVideo\widget\TipDiaglog.cs" />
<Compile Include="Resources\Resource.designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="VideoActivity.cs" />
<Compile Include="ZXing\ZXingCustomScanView.cs" />
<Compile Include="ZXing\ZXingOverlayView.cs" />
</ItemGroup>
@@ -209,11 +217,175 @@
<None Include="Properties\AndroidManifest.xml">
<SubType>Designer</SubType>
</None>
+ <AndroidAsset Include="Assets\Phone\Instruct\AirQualitySensor.png" />
+ <AndroidAsset Include="Assets\Phone\Device\Airer.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirerSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirerSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirQualitySensor.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirQualitySensorSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirQualitySensorSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\WindOffline.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\Stop.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\LightSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\.DS_Store" />
+ <AndroidAsset Include="Assets\Phone\Airer\StopOffline.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\Dry.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\Up.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\Down.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\DetailAirerPic.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\DisinfectOffline.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\LightOffline.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\Airer216.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\DryOffline.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\AirerOnrange108.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\UpOffline.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\DownOffline.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\DisinfectSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\FunctionPic.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\Wind.png" />
+ <AndroidAsset Include="Assets\Phone\DoorLock\AddFaceIDTipPic.png" />
+ <AndroidAsset Include="Assets\Phone\DoorLock\faceId.png" />
+ <AndroidAsset Include="Assets\Phone\DoorLock\faceIdOn.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\Airer.png" />
+ <AndroidAsset Include="Assets\Phone\Airer\AirerFunPic.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\Airer.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\Main.axml" />
<AndroidResource Include="Resources\values\Strings.xml" />
<AndroidResource Include="Resources\values\Styles.xml" />
+ <AndroidResource Include="Resources\layout\activity_video_phone.xml">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\layout\dialog_tip.xml">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\layout\fragment_call.axml">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\layout\fragment_monitor.xml">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\back.png">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\call.png">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\dialog_background.xml">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\floor.png">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\hangup.png">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\screenshot_def.png">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\screenshot_sel.png">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\screenshot.xml">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\sure_background_def.xml">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\sure_background_sel.xml">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\tip_background.xml">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\unlock_def.png">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\unlock_disable.png">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\unlock_sel.png">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\unlock.xml">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\video_background.xml">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\color\text_color.xml">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\values\Color.xml">
+ <SubType>
+ </SubType>
+ <Generator>
+ </Generator>
+ </AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
@@ -252,7 +424,7 @@
<AndroidAsset Include="Assets\Phone\Account\Code.png" />
<AndroidAsset Include="Assets\Phone\Account\HidePwd.png" />
<AndroidAsset Include="Assets\Phone\Account\Logo_loginBG.png" />
- <AndroidAsset Include="Assets\Phone\Account\Logo_White.png" />
+ <AndroidAsset Include="Assets\Phone\Account\Logo_Evoyo.png" />
<AndroidAsset Include="Assets\Phone\Account\Password.png" />
<AndroidAsset Include="Assets\Phone\Account\PhoneEmail_White.png" />
<AndroidAsset Include="Assets\Phone\Account\UnhidePwd.png" />
@@ -1476,7 +1648,7 @@
<AndroidAsset Include="Assets\Phone\RealDevice\Repeater.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\SensorTemperatrueHumidity.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\SensorTemperatureHumidity.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Center\MainBack1.png" />
@@ -2235,12 +2407,6 @@
<AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelSimpleMultifunction.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\SmartSound\CheckBoxDef.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\SmartSound\CheckBoxSel.png" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\SmartSound\Nickname.png" />
</ItemGroup>
<ItemGroup>
@@ -2333,6 +2499,66 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\SynchronizationSelected.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\ZigeeLogic\iconBackgroundColor1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\ZigeeLogic\iconSelectedBackgroundColor1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\BindPic\CorrectTemperatureBackGround.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\BindPic\TemperaTureAdd.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\BindPic\TemperaTureAttention.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\BindPic\TemperaTureReduction.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Account\Logo_WhiteHome.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorMotionSelected2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorEmergencyButton.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorEmergencyButtonSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorEmergencyButtonSelected2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorMotion.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorMotionSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\ScanQrCodeGroud.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\TransferOfResidence.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\AdjustFailIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\AdjustSuccessIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\TransferOfResidenceIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon16.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SmartSound\Sibici.png" />
+ </ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />
--
Gitblit v1.8.0