lqq hace 8 años
padre
commit
ba19cb1b84
Se han modificado 2 ficheros con 52 adiciones y 25 borrados
  1. 26 0
      dist/peer/index.html
  2. 26 25
      peer/src/js/controller/peerController.js

+ 26 - 0
dist/peer/index.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>chat view</title>
+    <meta charset="utf-8" />
+    <!-- 新 Bootstrap 核心 CSS 文件 -->
+    <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
+    <link rel="stylesheet" href="../bower_components/animate.css/animate.min.css">
+    <link rel="stylesheet" href="app-15f81cd38d.css">
+</head>
+
+<body ng-app="app" >
+    <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/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>
+    <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
+    <script src="../bower_components/angular-animate/angular-animate.min.js"></script>
+    <script src="app-7bc63a0dc0.js"></script>
+</body>
+
+</html>

+ 26 - 25
peer/src/js/controller/peerController.js

@@ -2,7 +2,7 @@
 
 angular.module('app').controller('PeerController', ['$scope', '$state', function($scope, $state) {
 
-    // lxtalkClient.Invoke('{FB60F992-A0FD-47B3-AAA7-E80DF209C5A4}', '_Register', '', $scope);
+    lxtalkClient.Invoke('{C62F6059-7741-4AC1-8B8F-97EB5F7C116C}', '_Register', '', $scope);
     var onConnected = function(c){
         c.on('data', function(data) {
             //to do
@@ -15,26 +15,26 @@ angular.module('app').controller('PeerController', ['$scope', '$state', function
 
     $scope.init = function(jsonStr){
         var data = JSON.parse(jsonStr);
-        $scope.peer = new Peer(
-            {
-                config:{
-                    'iceServers': [
-                        { 
-                            'url': 'stun:lqq@59.110.63.164', 
-                            "credential":"123456" 
-                        },
-                        {
-                            "url":"turn:lqq@59.110.63.164", 
-                            "credential":"123456"
-                        }
-                    ]},
-                key: data.loginName
-            }        
-        );
-        $scope.connectedPeers = {};
-        $scope.peer.on('open', function(id){console.log(id);});
-        $scope.peer.on('connection', onConnected);
-        $scope.peer.on('error', function(err){console.log(err);});
+        // $scope.peer = new Peer(
+        //     {
+        //         config:{
+        //             'iceServers': [
+        //                 { 
+        //                     'url': 'stun:lqq@59.110.63.164', 
+        //                     "credential":"123456" 
+        //                 },
+        //                 {
+        //                     "url":"turn:lqq@59.110.63.164", 
+        //                     "credential":"123456"
+        //                 }
+        //             ]},
+        //         key: data.loginName
+        //     }        
+        // );
+        // $scope.connectedPeers = {};
+        // $scope.peer.on('open', function(id){console.log(id);});
+        // $scope.peer.on('connection', onConnected);
+        // $scope.peer.on('error', function(err){console.log(err);});
     };
 
     $scope.connect = function(jsonStr){
@@ -49,10 +49,11 @@ angular.module('app').controller('PeerController', ['$scope', '$state', function
 
     $scope.send = function(jsonStr, data){
         var param = JSON.parse(jsonStr);
-        var c = $scope.peer.connections[param.loginName];
-        if (c){
-            c.send(new Blob(data));
-        }
+        console.log(data);
+        // var c = $scope.peer.connections[param.loginName];
+        // if (c){
+        //     c.send(new Blob(data));
+        // }
     };
 
     $scope.close = function(jsonStr){