2020-09-02-4

陈嘉乐

2020-09-02 652243206427f35a256400a149a1734085824cb9

 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>

@@ -137,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>

@@ -194,13 +196,19 @@
  </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>

  <ItemGroup>

    <None Include="app.config" />

    <AndroidAsset Include="Assets\DeviceName.ini" />

    <None Include="packages.config" />

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

    <None Include="Properties\AndroidManifest.xml">

@@ -211,6 +219,138 @@
    <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" />

@@ -249,7 +389,7 @@
    <AndroidAsset Include="Assets\Phone\Account\Code.png" />

    <AndroidAsset Include="Assets\Phone\Account\HidePwd.png" />

    <AndroidAsset Include="Assets\Phone\Account\Logo_loginBG.png" />

    <AndroidAsset Include="Assets\Phone\Account\Logo_White.png" />

    <AndroidAsset Include="Assets\Phone\Account\Logo_Evoyo.png" />

    <AndroidAsset Include="Assets\Phone\Account\Password.png" />

    <AndroidAsset Include="Assets\Phone\Account\PhoneEmail_White.png" />

    <AndroidAsset Include="Assets\Phone\Account\UnhidePwd.png" />

@@ -535,19 +675,6 @@
    <AndroidAsset Include="Assets\Phone\Safeguard\ProtectionRemoveHomeSelected.png" />

    <AndroidAsset Include="Assets\Phone\Safeguard\WithdrawGarrison.png" />

    <AndroidAsset Include="Assets\Phone\Safeguard\WithdrawGarrisonSelected.png" />

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

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

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

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

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

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

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

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

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

    <AndroidAsset Include="Assets\Phone\Item\videoIntercom.png" />

    <AndroidAsset Include="Assets\Phone\Item\videoIntercomNext.png" />

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

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\InputAccountIcon.png" />

@@ -1486,7 +1613,7 @@
    <AndroidAsset Include="Assets\Phone\RealDevice\Repeater.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RealDevice\SensorTemperatrueHumidity.png" />

    <AndroidAsset Include="Assets\Phone\RealDevice\SensorTemperatureHumidity.png" />

  </ItemGroup>

  <ItemGroup>

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

@@ -2271,6 +2398,123 @@
  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\ColorTemperatureBar.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorSphericalMotion.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorSphericalMotionSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorSphericalMotionSelected2.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Instruct\SensorSphericalMotion.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RealDevice\SensorSphericalMotion.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\Battery.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\BatterySelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\videoIntercom.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\videoIntercomNext.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\SynchronizationSelected.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

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

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Account\Logo_WhiteHome.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorMotionSelected2.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorEmergencyButton.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorEmergencyButtonSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorEmergencyButtonSelected2.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorMotion.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorMotionSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\ScanQrCodeGroud.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\TransferOfResidence.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')" />