合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -68,33 +68,6 @@
    <AndroidSigningKeyStore>/Users/liaoshaosheng/Desktop/证书/Evoyo Home.keystore</AndroidSigningKeyStore>

  </PropertyGroup>

  <ItemGroup>

    <Reference Include="LeakCanary, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\LeakCanaryBinding.1.5.1.1\lib\MonoAndroid10\LeakCanary.dll</HintPath>

    </Reference>

    <Reference Include="LeakCanary.Analyzer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\LeakCanaryBinding.1.5.1.1\lib\MonoAndroid10\LeakCanary.Analyzer.dll</HintPath>

    </Reference>

    <Reference Include="LeakCanary.Watcher, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\LeakCanaryBinding.1.5.1.1\lib\MonoAndroid10\LeakCanary.Watcher.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Analytics, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Analytics.Android.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Android.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Crashes, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Crashes.Android.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid">

      <HintPath>..\Shared\DLL\Android\Shared.Droid.dll</HintPath>

    </Reference>

@@ -122,27 +95,6 @@
    </Reference>

    <Reference Include="System.IO.Compression" />

    <Reference Include="System.Net.Http" />

    <Reference Include="MQTTnet">

      <HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Android.Bindings">

      <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter">

      <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Crashes.Android.Bindings">

      <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Crashes">

      <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Analytics.Android.Bindings">

      <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Analytics">

      <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Arch.Core.Common">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Arch.Core.Common.dll</HintPath>

    </Reference>

@@ -191,6 +143,27 @@
    <Reference Include="BouncyCastle.Crypto">

      <HintPath>..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Android.Bindings">

      <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter">

      <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Crashes.Android.Bindings">

      <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Crashes">

      <HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Analytics.Android.Bindings">

      <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.Android.Bindings.dll</HintPath>

    </Reference>

    <Reference Include="Microsoft.AppCenter.Analytics">

      <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll</HintPath>

    </Reference>

    <Reference Include="MQTTnet">

      <HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath>

    </Reference>

    <Reference Include="FastAndroidCamera">

      <HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.dll</HintPath>

    </Reference>

@@ -210,6 +183,10 @@
    <Compile Include="Properties\AssemblyInfo.cs" />

    <Compile Include="ZXing\ZXingCustomScanView.cs" />

    <Compile Include="ZXing\ZXingOverlayView.cs" />

    <Compile Include="JPush\JPushFirmBroadcast.cs" />

    <Compile Include="JPush\JPushOpenClickActivity.cs" />

    <Compile Include="JPush\JpushNotificationReceiver.cs" />

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

  </ItemGroup>

  <ItemGroup>

    <None Include="app.config" />

@@ -220,6 +197,7 @@
      <SubType>Designer</SubType>

    </None>

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

    <AndroidAsset Include="Assets\agconnect-services.json" />

  </ItemGroup>

  <ItemGroup>

    <AndroidResource Include="Resources\layout\Main.axml" />

@@ -2713,14 +2691,21 @@
      <Project>{47EFF987-3192-4A56-A463-A940F245FF7D}</Project>

      <Name>DroidLib</Name>

    </ProjectReference>

    <ProjectReference Include="..\AndriodBluetooth\AndriodBluetooth.csproj">

      <Project>{930FE62C-60E3-4AB6-8645-CAD9E33ADC45}</Project>

      <Name>AndriodBluetooth</Name>

    </ProjectReference>

    <ProjectReference Include="..\SPhoneLib\SPhoneLib.csproj">

      <Project>{A6CA3387-58A7-4819-992F-C800C8839AFB}</Project>

      <Name>SPhoneLib</Name>

    </ProjectReference>

    <ProjectReference Include="..\Shared.Droid.JPush\Shared.Droid.JPush.csproj">

      <Project>{06B9C874-B9B2-4417-8280-B321F966E46B}</Project>

      <Name>Shared.Droid.JPush</Name>

    </ProjectReference>

    <ProjectReference Include="..\AndroidBluetooth\AndroidBluetooth.csproj">

      <Project>{ECD67F44-FA96-415A-8BC0-27B14A88C68A}</Project>

      <Name>AndroidBluetooth</Name>

    </ProjectReference>

  </ItemGroup>

  <ItemGroup>

    <Folder Include="JPush\" />

  </ItemGroup>

  <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />

  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />