From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 318 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 289 insertions(+), 29 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 9981784..9f43cab 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -40,6 +40,7 @@
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<AndroidSupportedAbis />
<AndroidDexTool>d8</AndroidDexTool>
+<AndroidKeyStore></AndroidKeyStore>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -81,21 +82,13 @@
<Reference Include="Microsoft.AppCenter.Crashes.Android.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll</HintPath>
</Reference>
- <Reference Include="Shared.Droid">
- <HintPath>..\Shared\DLL\Android\Shared.Droid.dll</HintPath>
- </Reference>
<Reference Include="Shared.Droid.HDLWidget">
<HintPath>..\Shared\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>
- </Reference>
- <Reference Include="Shared.Droid.Smartrefresh">
- <HintPath>..\Shared\DLL\Android\Shared.Droid.Smartrefresh.dll</HintPath>
</Reference>
<Reference Include="Shared.Droid.TouchID">
<HintPath>..\Shared\DLL\Android\Shared.Droid.TouchID.dll</HintPath>
</Reference>
<Reference Include="System" />
- <Reference Include="System.IO.Compression" />
- <Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
@@ -108,9 +101,6 @@
</Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
- <Reference Include="MQTTnet.Core">
- <HintPath>..\packages\MQTTnet.2.4.0\lib\netstandard1.3\MQTTnet.Core.dll</HintPath>
- </Reference>
<Reference Include="MQTTnet">
<HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath>
</Reference>
@@ -174,9 +164,6 @@
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
<HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
</Reference>
- <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
- <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
- </Reference>
<Reference Include="Xamarin.Android.Support.Vector.Drawable">
<HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
</Reference>
@@ -189,11 +176,25 @@
<Reference Include="ZXingNetMobile, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXingNetMobile.dll</HintPath>
</Reference>
+ <Reference Include="Shared.Droid.Smartrefresh">
+ <HintPath>..\Shared\DLL\Android\Shared.Droid.Smartrefresh.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid">
+ <HintPath>..\Shared\DLL\Android\Shared.Droid.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Design">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Design.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Application.cs" />
<Compile Include="Resources\Resource.designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="ZXing\ZXingCustomScanView.cs" />
+ <Compile Include="ZXing\ZXingOverlayView.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
@@ -524,10 +525,8 @@
<AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelTwo.png" />
<AndroidAsset Include="Assets\Phone\RealDevice\SensorCarbonMonoxide.png" />
<AndroidAsset Include="Assets\Phone\RealDevice\SensorDoorWindow.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\SensorEmergencyButton.png" />
<AndroidAsset Include="Assets\Phone\RealDevice\SensorFire.png" />
<AndroidAsset Include="Assets\Phone\RealDevice\SensorInfrared.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\SensorMotion.png" />
<AndroidAsset Include="Assets\Phone\RealDevice\SensorPir.png" />
<AndroidAsset Include="Assets\Phone\RealDevice\SensorWater.png" />
<AndroidAsset Include="Assets\Phone\Room\RoomCardView.png" />
@@ -539,6 +538,45 @@
<AndroidAsset Include="Assets\Phone\Safeguard\ProtectionRemoveHomeSelected.png" />
<AndroidAsset Include="Assets\Phone\Safeguard\WithdrawGarrison.png" />
<AndroidAsset Include="Assets\Phone\Safeguard\WithdrawGarrisonSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Account\Back.png" />
+ <AndroidAsset Include="Assets\Phone\Scene\Delaying.png" />
+ <AndroidAsset Include="Assets\Phone\AC\AC_TIP.png" />
+ <AndroidAsset Include="Assets\Phone\RoomIcon\0.JPG" />
+ <AndroidAsset Include="Assets\Phone\RoomIcon\1.JPG" />
+ <AndroidAsset Include="Assets\Phone\RoomIcon\5.JPG" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\0.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\1.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\2.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\3.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\4.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\5.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\6.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\7.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\8.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\9.jpg" />
+ <AndroidAsset Include="Assets\Phone\Room\List.png" />
+ <AndroidAsset Include="Assets\Phone\Room\Humidity.png" />
+ <AndroidAsset Include="Assets\Phone\Room\Temperature.png" />
+ <AndroidAsset Include="Assets\Phone\Scene\Background.png" />
+ <AndroidAsset Include="Assets\Phone\Room\AddBackground.png" />
+ <AndroidAsset Include="Assets\Phone\Logo\2.jpg" />
+ <AndroidAsset Include="Assets\Phone\Item\SafetyShortcut.png" />
+ <AndroidAsset Include="Assets\Phone\Item\SafetyShortcut_background.png" />
+ <AndroidAsset Include="Assets\Phone\Item\SafetyShortcut_itemSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Item\SafetyShortcut_item.png" />
+ <AndroidAsset Include="Assets\Phone\Item\ProgressBubbles.png" />
+ <AndroidAsset Include="Assets\Phone\Room\IconBackground.png" />
+ <AndroidAsset Include="Assets\Phone\Room\IconSelectedBackground.png" />
+ <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_1.png" />
+ <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_2.png" />
+ <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_3.png" />
+ <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_4.png" />
+ <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_5.png" />
+ <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_1.png" />
+ <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_2.png" />
+ <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_3.png" />
+ <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_4.png" />
+ <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_5.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\InputAccountIcon.png" />
@@ -1213,12 +1251,6 @@
<AndroidAsset Include="Assets\Phone\Account\Back.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\RoomIcon\0.JPG" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RoomIcon\1.JPG" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\RoomIcon\2.JPG" />
</ItemGroup>
<ItemGroup>
@@ -1231,13 +1263,7 @@
<AndroidAsset Include="Assets\Phone\AC\AC_TIP.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\Scene\Delaying.png" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\RoomIcon\4.JPG" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RoomIcon\5.JPG" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\SceneIcon\0.jpg" />
@@ -1308,6 +1334,240 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\ZigeeLogic\progressbtn2.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorPir.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorTemperatureHumidity.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureHumidity.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirConditionerSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\MenuGroud\TopRightMenu1_1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\MenuGroud\TopRightMenu1_2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\MenuGroud\TopRightMenu1_3.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\MenuGroud\TopRightMenu1_4.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\MenuGroud\TopRightMenu1_5.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\MenuGroud\TopRightMenu2_1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\MenuGroud\TopRightMenu2_2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\MenuGroud\TopRightMenu2_3.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\MenuGroud\TopRightMenu2_4.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\MenuGroud\TopRightMenu2_5.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirConditionerZbGatewaySelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirSwitchCloudContrSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirSwitchSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFourSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelOneSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelThreeSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelTwoSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\ColorLightSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\ConverterSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\ConverterZb485Selected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\CurtainAutoOpenSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\CurtainSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\CurtainSiphonateSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\DimmableLightOneLoadSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\DimmableLightSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\DryContactSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksH06CSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\LightSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\RelayEpointSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\RelaySelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\RelayThreeLoadSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\RepeaterSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\RepeaterZigbeeSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorCarbonMonoxideSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorDoorWindowSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorFireSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorHumiditySelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorInfraredSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorPirSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureHumiditySelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SensorWaterSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\Socket1Selected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\SwitchSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Logo\2.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Room\AddBackground.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\LogicMsgIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\SceneMsgIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\RightNext.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Guide\Finger.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Guide\Arrows1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Guide\LeftIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Guide\RightIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidResource Include="Resources\layout\zxing_layout.xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\ProgressBubbles.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\SafetyShortcut.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\SafetyShortcut_background.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\SafetyShortcut_item.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\SafetyShortcut_itemSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Room\IconBackground.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Room\IconSelectedBackground.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\RealGateway.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RealDevice\AirConditionerZbGateway.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RealDevice\DimmableLightOneLoad.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RealDevice\RelayThreeLoad.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RealDevice\Repeater.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RealDevice\SensorTemperatrueHumidity.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Center\MainBack1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Center\MainBack2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Guide\Arrows2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Guide\WorkRoomIcon.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')" />
@@ -1337,4 +1597,4 @@
<Import Project="..\packages\Xamarin.Android.Support.Fragment.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Fragment.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.v4.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.v4.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v4.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.v4.targets')" />
<Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
-</Project>
\ No newline at end of file
+</Project>
--
Gitblit v1.8.0