浏览代码

updated identification message

Luke Pulverenti 12 年之前
父节点
当前提交
2b28320764

+ 3 - 3
MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs

@@ -37,12 +37,12 @@ namespace MediaBrowser.Server.Implementations.Session
         /// <returns>Task.</returns>
         public Task ProcessMessage(WebSocketMessageInfo message)
         {
-            if (string.Equals(message.MessageType, "Identify", StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(message.MessageType, "Identity", StringComparison.OrdinalIgnoreCase))
             {
                 var vals = message.Data.Split('|');
 
-                var deviceId = vals[0];
-                var client = vals[1];
+                var client = vals[0];
+                var deviceId = vals[1];
 
                 var session = _sessionManager.AllConnections.FirstOrDefault(i => string.Equals(i.DeviceId, deviceId) && string.Equals(i.Client, client));
 

+ 1 - 1
MediaBrowser.WebDashboard/ApiClient.js

@@ -160,7 +160,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
             webSocket.onopen = function () {
                 setTimeout(function () {
 
-                    self.sendWebSocketMessage("Identify", deviceId + "|" + clientName);
+                    self.sendWebSocketMessage("Identity", clientName + "|" + deviceId);
 
                     $(self).trigger("websocketopen");
                 }, 500);

+ 1 - 1
MediaBrowser.WebDashboard/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.100" targetFramework="net45" />
+  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.101" targetFramework="net45" />
   <package id="ServiceStack.Common" version="3.9.44" targetFramework="net45" />
   <package id="ServiceStack.Text" version="3.9.44" targetFramework="net45" />
 </packages>

+ 3 - 3
Nuget/MediaBrowser.Common.Internal.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.93</version>
+        <version>3.0.94</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,9 +12,9 @@
         <description>Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.93" />
+            <dependency id="MediaBrowser.Common" version="3.0.94" />
             <dependency id="NLog" version="2.0.1.2" />
-            <dependency id="ServiceStack.Text" version="3.9.93" />
+            <dependency id="ServiceStack.Text" version="3.9.94" />
             <dependency id="SimpleInjector" version="2.2.1" />
         </dependencies>
     </metadata>

+ 1 - 1
Nuget/MediaBrowser.Common.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.93</version>
+        <version>3.0.94</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>

+ 2 - 2
Nuget/MediaBrowser.Server.Core.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.93</version>
+        <version>3.0.94</version>
         <title>Media Browser.Server.Core</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Media Browser Server.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.93" />
+            <dependency id="MediaBrowser.Common" version="3.0.94" />
         </dependencies>
     </metadata>
     <files>