From f71e74b5f0d2716fbf05da016cdaa18d64e09f80 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 31 十二月 2020 17:01:18 +0800
Subject: [PATCH] 又换完成最新门锁。空气质量传感器完成数据和基本配置功能。开发图表和自动化的同事可下载此代码
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 169 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 132 insertions(+), 37 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 709af84..56a9354 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></AndroidKeyStore>
-<AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
-<AndroidSupportedAbis>arm64-v8a;armeabi-v7a;x86;x86_64</AndroidSupportedAbis>
+ <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,6 @@
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidUseAapt2>false</AndroidUseAapt2>
- <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">
@@ -66,6 +64,15 @@
</Reference>
<Reference Include="FastAndroidCamera, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.dll</HintPath>
+ </Reference>
+ <Reference Include="LeakCanary, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\LeakCanaryBinding.1.5.1.1\lib\MonoAndroid10\LeakCanary.dll</HintPath>
+ </Reference>
+ <Reference Include="LeakCanary.Analyzer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\LeakCanaryBinding.1.5.1.1\lib\MonoAndroid10\LeakCanary.Analyzer.dll</HintPath>
+ </Reference>
+ <Reference Include="LeakCanary.Watcher, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\LeakCanaryBinding.1.5.1.1\lib\MonoAndroid10\LeakCanary.Watcher.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>
@@ -217,38 +224,15 @@
<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" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\AirQualitySensor.png" />
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\LedSelected.png" />
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\Led.png" />
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\CO2Pic.png" />
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\light.png" />
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\lightOn.png" />
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\LED72.png" />
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\LED84.png" />
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\LEDLogic1.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\Main.axml" />
@@ -2559,6 +2543,117 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\SmartSound\Sibici.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\ReplaceIconSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon10.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon12.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon13.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon15.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\Airer216.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\AirerFunPic.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\AirerOnrange108.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\DetailAirerPic.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\DisinfectOffline.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\DisinfectSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\Down.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\DownOffline.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\Dry.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\DryOffline.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\FunctionPic.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\LightOffline.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\LightSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\Stop.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\StopOffline.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\Up.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\UpOffline.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\Wind.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\WindOffline.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\Airer.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirerSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirerSelected2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirQualitySensor.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirQualitySensorSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirQualitySensorSelected2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\DoorLock\AddFaceIDTipPic.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\DoorLock\faceId.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\DoorLock\faceIdOn.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\Airer.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\AirQualitySensor.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RealDevice\Airer.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