Merge branch 'dev' into dev-temp

hxb

2022-08-29 9a4629512ccf8359efd88671c9317c3cc7faf0c8

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -44,6 +44,7 @@
    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>

    <BundleAssemblies>false</BundleAssemblies>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AndroidKeyStore></AndroidKeyStore>

  </PropertyGroup>

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

    <DebugSymbols>true</DebugSymbols>

@@ -63,6 +64,8 @@
    <BundleAssemblies>false</BundleAssemblies>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidUseAapt2>false</AndroidUseAapt2>

    <AndroidKeyStore></AndroidKeyStore>

    <AndroidSigningKeyStore>/Users/liaoshaosheng/Desktop/证书/Evoyo Home.keystore</AndroidSigningKeyStore>

  </PropertyGroup>

  <ItemGroup>

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

@@ -73,24 +76,6 @@
    </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>

@@ -119,30 +104,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="testLibs">

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

    </Reference>

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

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

    </Reference>

@@ -188,6 +149,27 @@
    <Reference Include="Xamarin.Android.Support.Vector.Drawable">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Vector.Drawable.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.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="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="MQTTnet">

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

    </Reference>

    <Reference Include="BouncyCastle.Crypto">

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

    </Reference>

@@ -206,15 +188,14 @@
  </ItemGroup>

  <ItemGroup>

    <Compile Include="Application.cs" />

    <Compile Include="FengLinVideo\Forms\MonitorFragment.cs" />

    <Compile Include="FengLinVideo\Forms\ReverseCallFragment.cs" />

    <Compile Include="FengLinVideo\Interface\VideoState.cs" />

    <Compile Include="FengLinVideo\widget\TipDiaglog.cs" />

    <Compile Include="Resources\Resource.designer.cs" />

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

    <Compile Include="VideoActivity.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" />

@@ -224,6 +205,8 @@
    <None Include="Properties\AndroidManifest.xml">

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

@@ -360,6 +343,10 @@
      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\xml\network_security_config.xml">

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

  </ItemGroup>

  <ItemGroup>

@@ -2717,6 +2704,17 @@
      <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>

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