From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 30 十二月 2019 15:47:51 +0800 Subject: [PATCH] 合并了代码 --- ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 73 +++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 2 deletions(-) diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj index 9f7ee17..124c03d 100644 --- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj +++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj @@ -194,6 +194,8 @@ <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 +526,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" /> @@ -1467,6 +1467,75 @@ <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> <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