p2p

peer/src/html/index.html

@@ -14,7 +14,7 @@
     <ui-view></ui-view>
     <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
     <script src="../bower_components/lodash/dist/lodash.js"></script>
-    <script src="../bower_components/peerjs/peer.min.js"></script>
+    <script src="../bower_components/peerjs/peer.js"></script>
     <script src="../bower_components/jquery/dist/jquery.min.js"></script>
     <script src="../bower_components/jquery-qrcode/jquery.qrcode.min.js"></script>
     <script src="../bower_components/angular/angular.min.js"></script>

peer/src/js/controller/peerController.js

@@ -12,7 +12,7 @@ angular.module('app').controller('PeerController', ['$scope', '$state', '$timeou
             delete $scope.connectedPeers[c.peer];
         });
         $scope.connectedPeers[c.peer] = 1;
-        lxtalkClient.Invoke('{C62F6059-7741-4AC1-8B8F-97EB5F7C116C}', 'OnConnected', '{"loginName":"'+c.peer+'"}', $scope);
+        lxtalkClient.Invoke('{C62F6059-7741-4AC1-8B8F-97EB5F7C116C}', 'OnConnected', '{"loginName":"' + c.peer + '"}', $scope);
     };
     $scope.options = {
         host: '120.26.136.253',
@@ -29,7 +29,7 @@ angular.module('app').controller('PeerController', ['$scope', '$state', '$timeou
                 }
             ]
         },
-        key: 'peerjs',
+        // key: 'peerjs',
         logFunction: function () {
             var copy = Array.prototype.slice.call(arguments).join(' ');
             console.info(copy);
@@ -48,7 +48,7 @@ angular.module('app').controller('PeerController', ['$scope', '$state', '$timeou
         $scope.peer.on('open', function (id) {
             console.log(id);
         });
-        $scope.peer.on('connection', function(c){
+        $scope.peer.on('connection', function (c) {
             c.on('open', function () {
                 onConnected(c);
             });
@@ -62,9 +62,9 @@ angular.module('app').controller('PeerController', ['$scope', '$state', '$timeou
 
     $scope.connect = function (jsonStr) {
         var data = JSON.parse(jsonStr);
-        data =  _.assign(data, {
+        data = _.assign(data, {
             label: 'file',
-            serialization:'binary'
+            serialization: 'binary'
         });
         console.info(data);
         if (!$scope.connectedPeers[data.loginName]) {
@@ -74,7 +74,7 @@ angular.module('app').controller('PeerController', ['$scope', '$state', '$timeou
             });
             c.on('error', function (err) {
                 console.log(err);
-                lxtalkClient.Invoke('{C62F6059-7741-4AC1-8B8F-97EB5F7C116C}', 'OnDisconnected', '{"loginName":"'+c.peer+'"}', $scope);
+                lxtalkClient.Invoke('{C62F6059-7741-4AC1-8B8F-97EB5F7C116C}', 'OnDisconnected', '{"loginName":"' + c.peer + '"}', $scope);
             });
             $scope.connectedPeers[data.loginName] = 1;
         }
@@ -87,9 +87,8 @@ angular.module('app').controller('PeerController', ['$scope', '$state', '$timeou
         var c = $scope.peer.connections[param.loginName];
         if (c && c[0]) {
             c[0].send(data);
-        }
-        else{
-            lxtalkClient.Invoke('{C62F6059-7741-4AC1-8B8F-97EB5F7C116C}', 'OnDisconnected', '{"loginName":"'+param.loginName+'"}', $scope);
+        } else {
+            lxtalkClient.Invoke('{C62F6059-7741-4AC1-8B8F-97EB5F7C116C}', 'OnDisconnected', '{"loginName":"' + param.loginName + '"}', $scope);
         }
     };