From 8b9ce384b26c414db32f98e94e088f5334869c2d Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期三, 13 十一月 2019 15:36:28 +0800 Subject: [PATCH] 全部合并了代码，安卓和 IOS 都测试通过了 --- ZigbeeApp/GateWay.Droid/packages.config | 117 +++++++++++++++++++++++++++++++--------------------------- 1 files changed, 63 insertions(+), 54 deletions(-) diff --git a/ZigbeeApp/GateWay.Droid/packages.config b/ZigbeeApp/GateWay.Droid/packages.config index c0b7b93..5a9457a 100755 --- a/ZigbeeApp/GateWay.Droid/packages.config +++ b/ZigbeeApp/GateWay.Droid/packages.config @@ -1,54 +1,63 @@ -锘�<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="BouncyCastle.Crypto.dll" version="1.8.1" targetFramework="monoandroid60" /> - <package id="Microsoft.AppCenter" version="1.14.0" targetFramework="monoandroid60" /> - <package id="Microsoft.AppCenter.Analytics" version="1.14.0" targetFramework="monoandroid60" /> - <package id="Microsoft.AppCenter.Crashes" version="1.14.0" targetFramework="monoandroid60" /> - <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="monoandroid60" /> - <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid60" /> - <package id="MQTTnet" version="2.4.0" targetFramework="monoandroid60" /> - <package id="NETStandard.Library" version="1.6.1" targetFramework="monoandroid60" /> - <package id="System.AppContext" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Collections" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Console" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Globalization" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.IO" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.IO.Compression" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.IO.FileSystem" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Linq" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Linq.Expressions" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Net.Http" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Net.Primitives" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Net.Security" version="4.3.2" targetFramework="monoandroid60" /> - <package id="System.Net.Sockets" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.ObjectModel" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Reflection" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Runtime" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Runtime.Handles" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Text.Encoding" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Threading" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Threading.Tasks" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Threading.Timer" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="monoandroid60" /> - <package id="System.Xml.XDocument" version="4.3.0" targetFramework="monoandroid60" /> - </packages> \ No newline at end of file +锘�<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="BouncyCastle.Crypto.dll" version="1.8.1" targetFramework="monoandroid60" /> + <package id="FastAndroidCamera" version="2.0.0" targetFramework="monoandroid80" /> + <package id="Microsoft.AppCenter" version="1.14.0" targetFramework="monoandroid60" /> + <package id="Microsoft.AppCenter.Analytics" version="1.14.0" targetFramework="monoandroid60" /> + <package id="Microsoft.AppCenter.Crashes" version="1.14.0" targetFramework="monoandroid60" /> + <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="monoandroid60" /> + <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid60" /> + <package id="MQTTnet" version="2.4.0" targetFramework="monoandroid60" /> + <package id="NETStandard.Library" version="1.6.1" targetFramework="monoandroid60" /> + <package id="System.AppContext" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Collections" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Console" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Globalization" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.IO" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.IO.Compression" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.IO.FileSystem" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Linq" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Linq.Expressions" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Net.Http" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Net.Primitives" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Net.Security" version="4.3.2" targetFramework="monoandroid60" /> + <package id="System.Net.Sockets" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.ObjectModel" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Reflection" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Runtime" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Runtime.Handles" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Text.Encoding" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Threading" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Threading.Tasks" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Threading.Timer" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="monoandroid60" /> + <package id="System.Xml.XDocument" version="4.3.0" targetFramework="monoandroid60" /> + <package id="Xamarin.Android.Support.Annotations" version="25.4.0.1" targetFramework="monoandroid80" /> + <package id="Xamarin.Android.Support.Compat" version="25.4.0.1" targetFramework="monoandroid80" /> + <package id="Xamarin.Android.Support.Core.UI" version="25.4.0.1" targetFramework="monoandroid80" /> + <package id="Xamarin.Android.Support.Core.Utils" version="25.4.0.1" targetFramework="monoandroid80" /> + <package id="Xamarin.Android.Support.Fragment" version="25.4.0.1" targetFramework="monoandroid80" /> + <package id="Xamarin.Android.Support.Media.Compat" version="25.4.0.1" targetFramework="monoandroid80" /> + <package id="Xamarin.Android.Support.v4" version="25.4.0.1" targetFramework="monoandroid80" /> + <package id="ZXing.Net.Mobile" version="2.4.1" targetFramework="monoandroid80" /> +</packages> \ No newline at end of file -- Gitblit v1.8.0