2020-08-07-1

陈嘉乐

2020-08-07 76cf0461cef89c62560ee4e2a508a14a43d72e87

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -38,7 +38,6 @@
    <AndroidTlsProvider>btls</AndroidTlsProvider>

    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>

    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>

    <AndroidSupportedAbis />

    <AndroidDexTool>d8</AndroidDexTool>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AndroidKeyStore></AndroidKeyStore>

@@ -57,6 +56,7 @@
    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidUseAapt2>false</AndroidUseAapt2>

    <AndroidKeyStore></AndroidKeyStore>

  </PropertyGroup>

  <ItemGroup>

    <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">

@@ -191,6 +191,9 @@
    <Reference Include="ZXingNetMobile, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXingNetMobile.dll</HintPath>

    </Reference>

    <Reference Include="testLibs">

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

    </Reference>

  </ItemGroup>

  <ItemGroup>

    <Compile Include="Application.cs" />

@@ -198,6 +201,11 @@
    <Compile Include="Properties\AssemblyInfo.cs" />

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

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

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

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

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

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

    <Compile Include="VideoActivity.cs" />

  </ItemGroup>

  <ItemGroup>

    <None Include="app.config" />

@@ -211,6 +219,94 @@
    <AndroidResource Include="Resources\layout\Main.axml" />

    <AndroidResource Include="Resources\values\Strings.xml" />

    <AndroidResource Include="Resources\values\Styles.xml" />

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

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

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

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\layout\fragment_call.axml">

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

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

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

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

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

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

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\dialog_background.xml">

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

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

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

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

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

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

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

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

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\screenshot.xml">

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\sure_background_def.xml">

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\sure_background_sel.xml">

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\tip_background.xml">

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

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

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

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

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

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

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\unlock.xml">

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\video_background.xml">

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\color\text_color.xml">

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\values\Color.xml">

      <SubType></SubType>

      <Generator></Generator>

    </AndroidResource>

  </ItemGroup>

  <ItemGroup>

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