From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 345 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 339 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 631fa08..73064be 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -38,8 +38,12 @@
<AndroidTlsProvider>btls</AndroidTlsProvider>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
- <AndroidSupportedAbis />
+ <AndroidSupportedAbis>armeabi-v7a</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' ">
@@ -54,6 +58,10 @@
<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>
@@ -63,6 +71,15 @@
</Reference>
<Reference Include="FastAndroidCamera, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.dll</HintPath>
+ </Reference>
+ <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>
@@ -81,6 +98,9 @@
</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="RestSharp, Version=106.11.7.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+ <HintPath>..\packages\RestSharp.106.11.7\lib\netstandard2.0\RestSharp.dll</HintPath>
</Reference>
<Reference Include="Shared.Droid">
<HintPath>..\Shared\DLL\Android\Shared.Droid.dll</HintPath>
@@ -135,6 +155,9 @@
</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>
@@ -193,13 +216,20 @@
</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" />
+ <AndroidAsset Include="Assets\HttpMessage.ini" />
<None Include="packages.config" />
<None Include="Resources\AboutResources.txt" />
<None Include="Properties\AndroidManifest.xml">
@@ -210,6 +240,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" />
@@ -248,7 +410,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" />
@@ -1472,7 +1634,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" />
@@ -2180,13 +2342,13 @@
<AndroidAsset Include="Assets\Phone\DeviceItem\MiniNightLightDevice.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\MiniNightLight.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ColorLightTemperature.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\MiniNightLightSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ColorLightTemperatureSelected.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\MiniNightLightSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ColorLightTemperatureSelected2.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Device\ButtonPanelCurtainSelected2.png" />
@@ -2230,6 +2392,177 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelSimpleMultifunction.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SmartSound\Nickname.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SmartSound\PullDown.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SmartSound\SoundIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SmartSound\Tianmao.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SmartSound\Xiaoai.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SmartSound\Xiaodu.png" />
+ </ItemGroup>
+ <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>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\AdjustFailIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\AdjustSuccessIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\TransferOfResidenceIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon16.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SmartSound\Sibici.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\ReplaceIconSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon10.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon12.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon13.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon15.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')" />
--
Gitblit v1.8.0