合并了新代码

黄学彪

2020-08-11 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

old mode 100755
new mode 100644
@@ -40,10 +40,6 @@
    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>

    <AndroidSupportedAbis />

    <AndroidDexTool>d8</AndroidDexTool>

    <AotAssemblies>false</AotAssemblies>

    <EnableLLVM>false</EnableLLVM>

    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>

    <BundleAssemblies>false</BundleAssemblies>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

  </PropertyGroup>

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

@@ -58,10 +54,6 @@
    <MandroidI18n>cjk</MandroidI18n>

    <DefineConstants>Android,Release</DefineConstants>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AotAssemblies>false</AotAssemblies>

    <EnableLLVM>false</EnableLLVM>

    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>

    <BundleAssemblies>false</BundleAssemblies>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidUseAapt2>false</AndroidUseAapt2>

  </PropertyGroup>

@@ -144,6 +136,9 @@
    <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>

@@ -201,8 +196,13 @@
  </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" />

  </ItemGroup>

@@ -219,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" />

@@ -2344,6 +2432,18 @@
  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

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

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

  <Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />