From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 11 八月 2020 14:13:55 +0800 Subject: [PATCH] 20200811 --- HDL-ON_Android/HDL-ON_Android.csproj | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj index 3c1f95b..e342995 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" /> @@ -405,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" /> @@ -481,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" /> @@ -522,6 +522,8 @@ <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" /> </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