Project Type Update & Logging Interface

AltBeacon.Library/AltBeacon.Library.csproj

@@ -2,18 +2,16 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{CB062D54-BA72-4AE5-9E1B-6E4A2CA68C30}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AltBeacon</RootNamespace>
     <AssemblyName>AltBeacon.Library</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,7 +31,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -44,8 +49,18 @@
     </Compile>
     <Compile Include="src\AltBeacon\Beacon\Identifier.cs" />
     <Compile Include="src\AltBeacon\Bluetooth\BluetoothDevice.cs" />
+    <Compile Include="src\AltBeacon\Logging\BaseDiagnosticsLogger.cs" />
+    <Compile Include="src\AltBeacon\Logging\EmptyLogger.cs" />
+    <Compile Include="src\AltBeacon\Logging\EmptyLoggerFactory.cs" />
+    <Compile Include="src\AltBeacon\Logging\ILogger.cs" />
+    <Compile Include="src\AltBeacon\Logging\ILoggerFactory.cs" />
+    <Compile Include="src\AltBeacon\Logging\LogManager.cs" />
+    <Compile Include="src\AltBeacon\Logging\VerboseDiagnosticsLogger.cs" />
+    <Compile Include="src\AltBeacon\Logging\VerboseDiagnosticsLoggerFactory.cs" />
+    <Compile Include="src\AltBeacon\Logging\WarningDiagnosticsLogger.cs" />
+    <Compile Include="src\AltBeacon\Logging\WarningDiagnosticsLoggerFactory.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

AltBeacon.Library/src/AltBeacon/Beacon/Beacon.cs

@@ -27,6 +27,7 @@ namespace AltBeacon.Beacon
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
     using System.Text;
+    using AltBeacon.Logging;
 
     /// <summary>
     /// <para>
@@ -56,9 +57,9 @@ namespace AltBeacon.Beacon
     public class Beacon
     {
         /// <summary>
-        /// Logger Tag
+        /// Current Class Logger Reference
         /// </summary>
-        private const string Tag = "Beacon";
+        private static readonly ILogger Logger = LogManager.GetLogger("Beacon");
 
         /// TODO DistanceCalculator
         /*protected static DistanceCalculator sDistanceCalculator = null;*/
@@ -224,11 +225,10 @@ public double Distance
                     {
                         bestRssiAvailable = this.RunningAverageRssi.Value;
                     }
-                    ////TODO LogManager
-                    ////else
-                    ////{
-                    ////    LogManager.d(Tag, "Not using running average RSSI because it is null");
-                    ////}
+                    else
+                    {
+                        Logger.Debug("Not using running average RSSI because it is null");
+                    }
 
                     this.distance = CalculateDistance(this.TxPower, bestRssiAvailable);
                 }
@@ -283,7 +283,6 @@ public double Distance
         /// </summary>
         public int ServiceUuid { get; protected set; }
 
-
         /// <summary>
         /// Gets and sets the DistanceCalculator to use with this beacon.
         /// </summary>
@@ -410,8 +409,7 @@ protected static double CalculateDistance(int txPower, double bestRssiAvailable)
             ////}
             ////else
             ////{
-                ////TODO LogManager
-                ////LogManager.e(Tag, "Distance calculator not set.  Distance will bet set to -1");
+                ////Logger.Error("Distance calculator not set.  Distance will bet set to -1");
                 return -1.0;
             ////}
         }

AltBeacon.Library/src/AltBeacon/Beacon/BeaconParser.cs

@@ -29,6 +29,7 @@ namespace AltBeacon.Beacon
     using System.Text;
     using System.Text.RegularExpressions;
     using AltBeacon.Bluetooth;
+    using AltBeacon.Logging;
 
     /// <summary>
     /// <para>
@@ -52,9 +53,9 @@ public partial class BeaconParser
     {
         #region Static Fields
         /// <summary>
-        /// Logger Tag
+        /// Current Class Logger Reference
         /// </summary>
-        private const string Tag = "BeaconParser";
+        private static readonly ILogger Logger = LogManager.GetLogger("BeaconParser");
 
         /// <summary>
         /// Identifier Pattern
@@ -416,8 +417,11 @@ public BeaconParser SetBeaconLayout(string beaconLayout)
 
                 if (!found)
                 {
-                    ////TODO LogManager
-                    ////LogManager.d(Tag, "cannot parse term " + term);
+                    if (LogManager.DebugLoggingEnabled)
+                    {
+                        Logger.Debug("cannot parse term " + term);
+                    }
+
                     throw new BeaconLayoutException("Cannot parse beacon layout term: " + term);
                 }
             }
@@ -699,19 +703,16 @@ protected static string ByteArrayToFormattedString(byte[] byteBuffer, int startI
             {
                 long number = 0L;
 
-                //// TODO LogManager
-                //// LogManager.d(Tag, "Byte array is size " + bytes.Length);
+                Logger.Debug("Byte array is size " + bytes.Length);
                 for (int i = 0; i < bytes.Length; i++)
                 {
-                    //// TODO LogManager
-                    //// LogManager.d(Tag, "index is " + i);
+                    Logger.Debug("index is " + i);
                     long byteValue = (long)(bytes[bytes.Length - i - 1] & 0xff);
                     long positionValue = (long)Math.Pow(256.0, i * 1.0);
                     long calculatedValue = (long)(byteValue * positionValue);
-                    //// TODO LogManager
-                    //// LogManager.d(Tag, "calculatedValue for position " + i + 
-                    ////     " with positionValue " + positionValue + " and byteValue " + 
-                    ////     byteValue + " is " + calculatedValue);
+                    Logger.Debug("calculatedValue for position " + i + 
+                         " with positionValue " + positionValue + " and byteValue " + 
+                         byteValue + " is " + calculatedValue);
                     number += calculatedValue;
                 }
 
@@ -795,18 +796,41 @@ protected static bool AreByteArraysMatch(byte[] array1, int offset1, byte[] arra
         /// </returns>
         protected Beacon FromScanData(byte[] scanData, int rssi, BluetoothDevice device, Beacon.Builder beaconBuilder)
         {
-            int startByte = 2;
-            bool patternFound = false;
-            int matchingBeaconSize = this.matchingBeaconTypeCodeEndOffset.Value - 
+            int maxByteForMatch = 5; // for manufacturer data-based beacons
+            byte[] serviceUuidBytes = null;
+
+            int matchingBeaconSize = this.matchingBeaconTypeCodeEndOffset.Value -
                 this.matchingBeaconTypeCodeStartOffset.Value + 1;
             byte[] typeCodeBytes = LongToByteArray(this.MatchingBeaconTypeCode, matchingBeaconSize);
 
-            while (startByte <= 5)
+            if (this.ServiceUuid != null)
+            {
+                maxByteForMatch = 11; // for uuid-based beacons
+                int serviceUuidSize = this.ServiceUuidEndOffset - this.ServiceUuidStartOffset + 1;
+                serviceUuidBytes = LongToByteArray(this.ServiceUuid.Value, serviceUuidSize);
+            }
+
+            int startByte = 2;
+            bool patternFound = false;
+
+            while (startByte <= maxByteForMatch)
             {
-                if (AreByteArraysMatch(scanData, startByte + this.matchingBeaconTypeCodeStartOffset.Value, typeCodeBytes, 0))
+                if (this.ServiceUuid == null)
                 {
-                    patternFound = true;
-                    break;
+                    if (AreByteArraysMatch(scanData, startByte + this.MatchingBeaconTypeCodeStartOffset, typeCodeBytes, 0))
+                    {
+                        patternFound = true;
+                        break;
+                    }
+                }
+                else
+                {
+                    if (AreByteArraysMatch(scanData, startByte + this.ServiceUuidStartOffset, serviceUuidBytes, 0) &&
+                            AreByteArraysMatch(scanData, startByte + this.MatchingBeaconTypeCodeStartOffset, typeCodeBytes, 0))
+                    {
+                        patternFound = true;
+                        break;
+                    }
                 }
 
                 startByte++;
@@ -815,41 +839,40 @@ protected Beacon FromScanData(byte[] scanData, int rssi, BluetoothDevice device,
             if (patternFound == false)
             {
                 // This is not a beacon
-                // TODO LogManager
-                /*if (this.ServiceUuid == null)
+                if (this.ServiceUuid == null)
                 {
-                    TODO LogManager
-                    if (LogManager.isVerboseLoggingEnabled())
+                    if (LogManager.DebugLoggingEnabled)
                     {
-                        LogManager.d(TAG, "This is not a matching Beacon advertisement. " + 
-                            "(Was expecting %s. The bytes I see are: %s",
-                            byteArrayToString(typeCodeBytes), bytesToHex(scanData));
+                        Logger.Debug(
+                            "This is not a matching Beacon advertisement. " + 
+                            "(Was expecting {0}. The bytes I see are: {1}",
+                            ByteArrayToString(typeCodeBytes),
+                            BytesToHex(scanData));
                     }
                 }   
                 else
                 {
-                    if (LogManager.isVerboseLoggingEnabled())
+                    if (LogManager.DebugLoggingEnabled)
                     {
-                        LogManager.d(TAG, "This is not a matching Beacon advertisement. " + 
-                            "(Was expecting %s and %s. The bytes I see are: %s", 
-                            byteArrayToString(serviceUuidBytes), 
-                            byteArrayToString(typeCodeBytes), bytesToHex(scanData));
+                        Logger.Debug(
+                            "This is not a matching Beacon advertisement. " + 
+                            "(Was expecting {0} and {1}. The bytes I see are: {2}", 
+                            ByteArrayToString(serviceUuidBytes), 
+                            ByteArrayToString(typeCodeBytes),
+                            BytesToHex(scanData));
                     }
-                }*/
+                }
+
                 return null;
             }
             else
             {
-                //// TODO LogManager
-                //// if (LogManager.isVerboseLoggingEnabled())
-                //// {
-                ////     LogManager.d(TAG, "This is a recognized beacon advertisement -- %s seen",
-                ////             byteArrayToString(typeCodeBytes));
-                //// }
-                ////
-                //// TODO LogManager
-                //// LogManager.d(Tag, "This is a recognized beacon advertisement -- " + 
-                ////     getMatchingBeaconTypeCode().ToString("x4") + " seen");
+                if (LogManager.DebugLoggingEnabled)
+                {
+                    Logger.Debug(
+                        "This is a recognized beacon advertisement -- {0} seen",
+                        ByteArrayToString(typeCodeBytes));
+                }
             }
 
             List<Identifier> identifiers = new List<Identifier>();
@@ -874,8 +897,8 @@ TODO LogManager
                     this.dataLittleEndianFlags[i]);
 
                 dataFields.Add(long.Parse(dataString));
-                //// TODO LogManager
-                //// LogManager.d(Tag, "parsing found data field " + i);
+
+                Logger.Debug("parsing found data field " + i);
                 //// TODO: error handling needed here on the parse
             }