From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813
---
HDL-ON_Android/HDL-ON_Android.csproj | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index fbf558a..b63adb7 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -128,6 +128,8 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Application.cs" />
<Compile Include="Scan.cs" />
+ <Compile Include="ZXingCustomScanView.cs" />
+ <Compile Include="ZXingOverlayView.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
@@ -178,6 +180,10 @@
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
+ <AndroidResource Include="Resources\layout\zxing_layout.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\drawable\" />
@@ -220,8 +226,6 @@
<AndroidAsset Include="Assets\Phone\Navigation\IntellectualizationIconOn.png" />
<AndroidAsset Include="Assets\Phone\Navigation\ClassificationIcon.png" />
<AndroidAsset Include="Assets\Phone\Navigation\UserPageNavbg.png" />
- <AndroidAsset Include="Assets\Phone\Navigation\CollectionIconOn.png" />
- <AndroidAsset Include="Assets\Phone\Navigation\CollectionIcon.png" />
<AndroidAsset Include="Assets\Phone\Navigation\PersonalCenterIcon.png" />
<AndroidAsset Include="Assets\Phone\Navigation\IntellectualizationIcon.png" />
<AndroidAsset Include="Assets\Phone\Navigation\ClassificationIconOn.png" />
@@ -240,7 +244,6 @@
<AndroidAsset Include="Assets\Phone\LoginIcon\1.png" />
<AndroidAsset Include="Assets\Phone\Public\ChooseIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\DownIcon.png" />
- <AndroidAsset Include="Assets\Phone\Public\.DS_Store" />
<AndroidAsset Include="Assets\Phone\Public\RightIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\MinusSignIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\EditIcon.png" />
@@ -346,7 +349,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\.DS_Store" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TVIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanThinIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanIcon.png" />
@@ -358,7 +360,6 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\PlusIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TV123Icon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVRightIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\.DS_Store" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVUpIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVleftIcon.png" />
@@ -384,7 +385,6 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\AcOnIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\AcIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\DehumidificationIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\.DS_Store" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\AirSupplyIconGray.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\LowIconGray.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\DivBg2.png" />
@@ -406,7 +406,7 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\HighIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\HeatIconGray.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\HeatingIcon.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\AcThinIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\AcThinIcon1.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\HightIconGray.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainOnIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainCloseWhiteIcon_Shadow.png" />
@@ -482,7 +482,6 @@
<AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\3On.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\FingerIconRed.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\1On.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\.DS_Store" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\FingerprintIcon.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\2On.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\4On.png" />
@@ -518,6 +517,23 @@
<AndroidAsset Include="Assets\Echarts\theme\blue.js" />
<AndroidAsset Include="Assets\Echarts\theme\dark.js" />
<AndroidAsset Include="Assets\Echarts\theme\mint.js" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\DiyThumbIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\DiyThumbIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Music\MusicPlayOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Music\MusicPlayIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\InfoOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Music\MusicThinIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Navigation\HomePageIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Navigation\CollectionIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\Navigation\CollectionIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Navigation\HomePageIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\HomeList4bg.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\HomeList2bg.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\HomeList1bg.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\HomeList3bg.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\ResetPassword\DialogTipTitleIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\RelayOnBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\RelayBg.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" />
--
Gitblit v1.8.0