blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
JLChen
2020-12-09 e87985ec1dcb69beedaf9f95e8e7aba14b7c08d6 
 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" />


@@ -128,6 +132,11 @@


    <Compile Include="Properties\AssemblyInfo.cs" />


    <Compile Include="Application.cs" />


    <Compile Include="Scan.cs" />


    <Compile Include="ZXingCustomScanView.cs" />


    <Compile Include="ZXingOverlayView.cs" />


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


    <Compile Include="Other\JPush\JPushReceiver.cs" />


    <Compile Include="Other\JPush\JPushService.cs" />


  </ItemGroup>


  <ItemGroup>


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


@@ -143,21 +152,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>


@@ -178,16 +172,44 @@


      <SubType></SubType>


      <Generator></Generator>


    </AndroidResource>


    <AndroidResource Include="Resources\layout\zxing_layout.xml">


      <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="Other\" />


    <Folder Include="Other\JPush\" />


  </ItemGroup>


  <ItemGroup>


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


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


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


    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />


    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />


    <PackageReference Include="Xamarin.Android.Support.v4">


      <Version>28.0.0.3</Version>


    </PackageReference>


@@ -195,10 +217,16 @@


      <Version>12.0.3</Version>


    </PackageReference>


    <PackageReference Include="MQTTnet">


      <Version>3.0.8</Version>


      <Version>3.0.13</Version>


    </PackageReference>


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


      <Version>2.4.1</Version>


    </PackageReference>


    <PackageReference Include="RestSharp">


      <Version>106.11.7</Version>


    </PackageReference>


    <PackageReference Include="XamarinLibrary.Xamarin.Android.Manual.JPush">


      <Version>3.7.0</Version>


    </PackageReference>


  </ItemGroup>


  <ItemGroup>


@@ -220,8 +248,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 +266,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 +371,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 +382,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 +428,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 +504,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 +544,113 @@


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


    <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\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\LoginIcon\Server.png" />


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


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


    <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Function.png" />


    <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Search.png" />


    <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Menu.png" />


    <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Help.png" />


    <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Telephone.png" />


    <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\SendMessage.png" />


    <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Scene.png" />


    <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Close.png" />


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


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


    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\All.png" />


    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\System.png" />


    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\Alarm.png" />


    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\AllOn.png" />


    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\Share.png" />


    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\AlarmOn.png" />


    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\ShareOn.png" />


    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\SystemOn.png" />


    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg1.png" />


    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg2.png" />


    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg3.png" />


    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg4.png" />


    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg5.png" />


    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg6.png" />


    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg7.png" />


    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg8.png" />


    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg9.png" />


    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg10.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\bjicon5.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" />


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


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


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


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


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


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


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


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


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


  </ItemGroup>


  <ItemGroup>


    <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />


    <AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />


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