blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
陈嘉乐
2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3 
 HDL-ON_Android/HDL-ON_Android.csproj


@@ -17,40 +17,41 @@


    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>


    <AndroidResgenClass>Resource</AndroidResgenClass>


    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>


    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>


    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>


    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>


    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>


    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>


    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>


    <AndroidUseAapt2>true</AndroidUseAapt2>


    <AndroidSupportedAbis>armeabi-v7a</AndroidSupportedAbis>


  </PropertyGroup>


  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">


    <DebugSymbols>True</DebugSymbols>


    <DebugType>portable</DebugType>


    <Optimize>False</Optimize>


    <OutputPath>bin\Debug\</OutputPath>


    <DefineConstants>DEBUG;TRACE</DefineConstants>


    <DefineConstants>DEBUG;TRACE;__Android__</DefineConstants>


    <ErrorReport>prompt</ErrorReport>


    <WarningLevel>4</WarningLevel>


    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>


    <AndroidLinkMode>None</AndroidLinkMode>


    <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>


    <MandroidI18n>cjk</MandroidI18n>


    <AndroidDexTool>d8</AndroidDexTool>


    <AndroidSupportedAbis>arm64-v8a;armeabi-v7a</AndroidSupportedAbis>


    <AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>


    <AndroidLinkMode>None</AndroidLinkMode>


  </PropertyGroup>


  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">


    <DebugSymbols>True</DebugSymbols>


    <DebugType>portable</DebugType>


    <Optimize>True</Optimize>


    <Optimize>false</Optimize>


    <OutputPath>bin\Release\</OutputPath>


    <DefineConstants>TRACE</DefineConstants>


    <DefineConstants>TRACE;__Android__;</DefineConstants>


    <ErrorReport>prompt</ErrorReport>


    <WarningLevel>4</WarningLevel>


    <AndroidManagedSymbols>true</AndroidManagedSymbols>


    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>


    <AndroidLinkMode>SdkOnly</AndroidLinkMode>


    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>


    <MandroidI18n>cjk</MandroidI18n>


    <AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>


    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>


  </PropertyGroup>


  <ItemGroup>


    <Reference Include="System" />


@@ -121,6 +122,9 @@


    <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" />


@@ -130,6 +134,7 @@


    <Compile Include="Scan.cs" />


    <Compile Include="ZXingCustomScanView.cs" />


    <Compile Include="ZXingOverlayView.cs" />


    <Compile Include="Other\JLCountrycode.cs" />


  </ItemGroup>


  <ItemGroup>


    <None Include="Resources\AboutResources.txt" />


@@ -145,21 +150,6 @@


    <AndroidResource Include="Resources\menu\menu_main.xml" />


    <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />


    <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher_round.xml" />


    <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher.png" />


    <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher_foreground.png" />


    <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher_round.png" />


    <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher.png" />


    <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher_foreground.png" />


    <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher_round.png" />


    <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher.png" />


    <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher_foreground.png" />


    <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher_round.png" />


    <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher.png" />


    <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher_foreground.png" />


    <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher_round.png" />


    <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher.png" />


    <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_foreground.png" />


    <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_round.png" />


    <AndroidResource Include="Resources\drawable\Loading.png">


      <SubType></SubType>


      <Generator></Generator>


@@ -184,10 +174,33 @@


      <SubType></SubType>


      <Generator></Generator>


    </AndroidResource>


    <AndroidResource Include="Resources\mipmap-xhdpi\Icon.png">


      <SubType></SubType>


      <Generator></Generator>


    </AndroidResource>


    <AndroidResource Include="Resources\mipmap-mdpi\Icon.png">


      <SubType></SubType>


      <Generator></Generator>


    </AndroidResource>


    <AndroidResource Include="Resources\mipmap-hdpi\Icon.png">


      <SubType></SubType>


      <Generator></Generator>


    </AndroidResource>


    <AndroidResource Include="Resources\mipmap-anydpi-v26\Icon.png">


      <SubType></SubType>


      <Generator></Generator>


    </AndroidResource>


    <AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png">


      <SubType></SubType>


      <Generator></Generator>


    </AndroidResource>


  </ItemGroup>


  <ItemGroup>


    <Folder Include="Resources\drawable\" />


    <Folder Include="Resources\layout\" />


    <Folder Include="Assets\Phone\Intelligence\" />


    <Folder Include="Assets\Phone\DeviceIcon\" />


    <Folder Include="Assets\Phone\LogicIcon\" />


  </ItemGroup>


  <ItemGroup>


    <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />


@@ -205,6 +218,9 @@


    </PackageReference>


    <PackageReference Include="ZXing.Net.Mobile">


      <Version>2.4.1</Version>


    </PackageReference>


    <PackageReference Include="RestSharp">


      <Version>106.11.7</Version>


    </PackageReference>


  </ItemGroup>


  <ItemGroup>


@@ -534,6 +550,54 @@


    <AndroidAsset Include="Assets\Phone\PersonalCenter\ResetPassword\DialogTipTitleIcon.png" />


    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\RelayOnBg.png" />


    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\RelayBg.png" />


    <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\DiyThumbIcon2On.png" />


    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\FunctionIconTVOC.png" />


    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\FunctionIconPm25.png" />


    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\FunctionIconCO2.png" />


    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\FunctionIconTemp.png" />


    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\FunctionIconHumidity.png" />


    <AndroidAsset Include="Assets\Phone\Intelligence\CreateScene3Bg.png" />


    <AndroidAsset Include="Assets\Phone\Intelligence\CreateScene1Bg.png" />


    <AndroidAsset Include="Assets\Phone\Intelligence\CreateScene2Bg.png" />


    <AndroidAsset Include="Assets\Phone\Public\FuncInfoSetIcon_white.png" />


    <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\chooseTipIcon.png" />


    <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg10.png" />


    <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg9.png" />


    <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg8.png" />


    <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg6.png" />


    <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg7.png" />


    <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg5.png" />


    <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg4.png" />


    <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg1.png" />


    <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg3.png" />


    <AndroidAsset Include="Assets\Phone\Intelligence\Gallery\scenebg2.png" />


    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\BrightnessBg.png" />


    <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\RollingShutterIcon.png" />


    <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\MotorCurtainIcon.png" />


    <AndroidAsset Include="Assets\Phone\OnIcon.png" />


    <AndroidAsset Include="Assets\Phone\TipNot.png" />


    <AndroidAsset Include="Assets\Phone\DeviceIcon\VoicePanelIcon.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\addconditiontarget.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\back.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\next.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\off.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\functionicon.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\timeicon.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\timecondition.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\down.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\airconditionerlogic.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\curtainlogic.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\heatlogic.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\lightloguc.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\outletlogic.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\on.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\weekoff.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\weekon.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\set.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\editname.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\delayed.png" />


    <AndroidAsset Include="Assets\Phone\LogicIcon\scene.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" />