2020-11-30-2

陈嘉乐

2020-11-30 ed3bfb7462d44747230437717e8673a5192f833f

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -122,9 +122,6 @@
    <Reference Include="Xamarin.Android.Support.Vector.Drawable">
      <HintPath>..\DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
    </Reference>
    <Reference Include="Shared.Droid.JLCountryCode">
      <HintPath>..\DLL\Android\Shared.Droid.JLCountryCode.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="MainActivity.cs" />
@@ -134,7 +131,6 @@
    <Compile Include="Scan.cs" />
    <Compile Include="ZXingCustomScanView.cs" />
    <Compile Include="ZXingOverlayView.cs" />
    <Compile Include="Other\JLCountrycode.cs" />
  </ItemGroup>
  <ItemGroup>
    <None Include="Resources\AboutResources.txt" />
@@ -200,7 +196,6 @@
    <Folder Include="Resources\layout\" />
    <Folder Include="Assets\Phone\Intelligence\" />
    <Folder Include="Assets\Phone\DeviceIcon\" />
    <Folder Include="Other\" />
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
@@ -218,9 +213,6 @@
    </PackageReference>
    <PackageReference Include="ZXing.Net.Mobile">
      <Version>2.4.1</Version>
    </PackageReference>
    <PackageReference Include="RestSharp">
      <Version>106.11.7</Version>
    </PackageReference>
  </ItemGroup>
  <ItemGroup>
@@ -577,9 +569,27 @@
    <AndroidAsset Include="Assets\Phone\OnIcon.png" />
    <AndroidAsset Include="Assets\Phone\TipNot.png" />
    <AndroidAsset Include="Assets\Phone\DeviceIcon\VoicePanelIcon.png" />
    <AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_3.png" />
    <AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_2.png" />
    <AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_1.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\heatlogic.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\on.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\off.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\timecondition.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\down.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\timeicon.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\lightloguc.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\set.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\addconditiontarget.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\functionicon.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\airconditionerlogic.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\delayed.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\next.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\curtainlogic.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\weekoff.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\weekon.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\outletlogic.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\back.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\scene.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\editname.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" />