dgf 8 år sedan
förälder
incheckning
0f71c9f94c

+ 0 - 21
common/utilities.js

@@ -1,21 +0,0 @@
-var util = {
-    inherits: function(ctor, superCtor) {
-        ctor.super_ = superCtor;
-        ctor.prototype = Object.create(superCtor.prototype, {
-            constructor: {
-                value: ctor,
-                enumerable: false,
-                writable: true,
-                configurable: true
-            }
-        });
-    },
-    extend: function(dest, source) {
-        for (var key in source) {
-            if (source.hasOwnProperty(key)) {
-                dest[key] = source[key];
-            }
-        }
-        return dest;
-    }
-}

+ 2 - 1
dist/bower.json

@@ -26,6 +26,7 @@
     "angular-sanitize": "^1.5.8",
     "jquery-qrcode": "*",
     "zTree": "^3.5.26",
-    "lodash": "^4.17.4"
+    "lodash": "^4.17.4",
+    "peerjs": "^0.3.14"
   }
 }

+ 1 - 1
peer/Gulpfile.js

@@ -36,7 +36,7 @@ var paths = {
     }
 }
 
-var distpath = '../dist/userview';
+var distpath = '../dist/peer';
 
 gulp.task('app-css', function() {
     del([distpath + '/app-*.css'], { cwd: process.cwd(), force: true });

+ 3 - 1
peer/src/html/index.html

@@ -10,9 +10,11 @@
     <link rel="stylesheet" href="app.css">
 </head>
 
-<body ng-app="app" ng-controller="UserController" class="full-client" onselectstart="return false">
+<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>

+ 52 - 54
peer/src/js/controller/peerController.js

@@ -3,63 +3,61 @@
 angular.module('app').controller('PeerController', ['$scope', '$state', function($scope, $state) {
 
     // lxtalkClient.Invoke('{FB60F992-A0FD-47B3-AAA7-E80DF209C5A4}', '_Register', '', $scope);
+    var onConnected = function(c){
+        c.on('data', function(data) {
+                //to do
+        });
+        c.on('close', function() {
+            delete connectedPeers[c.peer];
+        });
+        connectedPeers[c.peer] = 1;
+    };
 
-    // $scope.user = {
-    //     name: '陆趣趣',
-    //     l: '0578+0-lslqq',
-    //     shotL: 'lslqq',
-    //     comp: '浙江万赛软件科技有限公司',
-    //     branch: '运维部',
-    //     sex: '0',
-    //     mob: '15215756180',
-    //     sMob: '666666',
-    //     tel: '2189026',
-    //     duty: '运维部经理',
-    //     officeID: '运维室001',
-    //     email: 'lqq@wswin.cn',
-    //     shortL: 'lszhangzhangzhang'
-    // };
+    var onOpened = function(id){
+        console.log(id);
+    };
 
-    $scope.getSex = function(sex) {
-        if ($scope.user === undefined)
-            return '保密';
-        if ($scope.user.sex == 0)
-            return '男';
-        else if ($scope.user.sex == 1)
-            return '女';
-        else
-            return '保密';
-    }
+    var onError = function(err){
+        console.log(err);
+    };
 
-    $scope.isActive = $state.$current.name == 'details-new.info' ? true : false;
-    $scope.$on('$stateChangeStart',
-        function(event, toState, toParams, fromState, fromParams, options) {
-            $scope.isActive = toState.name == 'details-new.info' ? true : false;
-        });
+    $scope.init = function(jsonStr){
+        var data = JSON.parse(jsonStr);
+        $scope.peer = new Peer(
+            {
+                config:{
+                    'iceServers': [
+                        { url: 'stun:stun.l.google.com:19302' },
+                        { url: 'turn:homeo@turn.bistri.com:80', credential: 'homeo' }
+                    ]},
+                key: data.loginName
+            }        
+        );
+        $scope.connectedPeers = {};
+        $scope.peer.on('open', onOpened);
+        $scope.peer.on('connection', onConnected);
+        $scope.peer.on('error', onError);
+    };
+
+    $scope.connect = function(jsonStr){
+        var data = JSON.parse(jsonStr);
+        if (!$scope.connectedPeers[data.loginName]) {
+            var c = $scope.peer.connect(data.loginName, data);
+            c.on('open', function(){onConnected(c);});
+            c.on('error', onError);
+            $scope.connectedPeers[data.loginName] = 1;
+        }
+    };
+
+    $scope.send = function(jsonStr, data){
+
+    };
+
+    $scope.close = function(jsonStr){
+
+    };
 
-    $scope.update = function(userJson) {
-        userJson = userJson.replace(/ /g, " ");
-        userJson = userJson.replace(/\t/g, "\\t");
-        var user = JSON.parse(userJson);
-        $scope.user = user;
-        var reg = /-([\W\w]*)/;
-        var group = reg.exec($scope.user.l);
-        $scope.user.shortL = group == null ? $scope.user.l : group[1];
+    $scope.closeAll = function(jsonStr){
 
-        //宁夏企税通企业版使用
-        // if ($state.current.name == 'simple-enterprise' || $state.current.name == 'simple') {
-        //   // alert($state.current.name);
-        //   if ($scope.user.l.length >= 15 && $state.current.name !== 'simple-enterprise')
-        //     $state.go('simple-enterprise');
-        //   else if ($scope.user.l.length < 15 && $state.current.name !== 'simple')
-        //     $state.go('simple');
-        // }
-        // else if ($state.current.name == 'details-enterprise' || $state.current.name == 'details')
-        // {
-        //   if ($scope.user.l.length >= 15 && $state.current.name !== 'details-enterprise')
-        //     $state.go('details-enterprise');
-        //   else if ($scope.user.l.length < 15 && $state.current.name !== 'details')
-        //     $state.go('details');
-        // }
-    }
+    };
 }]);

+ 1 - 16
peer/src/templates/peer.html

@@ -1,18 +1,3 @@
 <div style="margin:5px">
-    <div class="pull-left">
-        <img src="../img/DefaultHeadImage_48.png">
-    </div>
-    <div class="pull-left p-l-sm simple-user">
-        <p class="displayName"><input class="CopyText" type="text" readonly="readonly" value="{{user.name}}"></p>
-        <p style="font-size:12px; padding-bottom:0.5em; border-bottom:solid 1px; margin-bottom:0.5em;">
-            处室:<input class="CopyText" type="text" readonly="readonly" value="{{user.branch}}">
-            <br> 职务:<input class="CopyText" type="text" readonly="readonly" value="{{user.duty}}">
-        </p>
-        <p>
-            电话:<input class="CopyText" type="text" readonly="readonly" value="{{user.tel}}">
-            <br> 手机:<input class="CopyText" type="text" readonly="readonly" value="{{user.mob}}">
-            <br> 邮箱:<input class="CopyText" type="text" readonly="readonly" value="{{user.email}}">
-        </p>
-    </div>
-    <div style="clear:both"></div>
+
 </div>

+ 1 - 1
talkview/src/js/controller/messageController.js

@@ -1,4 +1,4 @@
-angular.module('appMessage').controller('MessageController', ['$scope', '$location', '$anchorScroll', function($scope, $location, $anchorScroll) {
+angular.module('appMessage').controller('MessageController', ['$scope', function($scope) {
         lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', '_Register', '', $scope);
         $scope.glued = true;
         $scope.count = true;

+ 3 - 4
talkview/src/js/controller/transmitterController.js

@@ -29,11 +29,10 @@ angular.module('appMessage').controller('TransmitterController', ['$scope', '$in
 
     $scope.getFileSize = function(item) {
         $scope.fileSize = item.length;
-        if (file.size > 1024 * 1024)
-            $scope.fileSize = (Math.round(file.size * 100 / (1024 * 1024)) / 100).toString() + 'MB';
+        if ($scope.fileSize > 1024 * 1024)
+            return (Math.round($scope.fileSize * 100 / (1024 * 1024)) / 100).toString() + 'MB';
         else
-            $scope.fileSize = (Math.round(file.size * 100 / 1024) / 100).toString() + 'KB';
-        return $scope.fileSize;
+            return (Math.round($scope.fileSize * 100 / 1024) / 100).toString() + 'KB';
     }
 
     $scope.accept = function(item) {

+ 1 - 1
talkview/src/templates/transmitter.html

@@ -1,5 +1,5 @@
 <div ng-repeat="item in transmitters">
-    <p><img style="height:50px" src="../img/unkown.png"><span>{{getFileName(item)}}{{getFileSize(item)}}</span></p>
+    <p><img style="height:50px" src="../img/unkown.png"><span>{{getFileName(item)}} ({{getFileSize(item)}})</span></p>
     <p>{{toJson(item)}}</p>
     <a ng-show="item.direction==1" ng-click="accept(item)">接收</a><a ng-show="item.direction==1" ng-click="saveAs(item)">另存为</a><a ng-show="item.direction==1" ng-click="decline(item)">取消</a>
     <a ng-show="item.direction==0" ng-click="turnToOffline(item)">转为离线</a><a ng-show="item.direction==0" ng-click="cancel(item)">取消</a>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 4 - 4
userview/src/js/templates.js


+ 1 - 1
userview/temp/manifest/app-js-manifest.json

@@ -1,3 +1,3 @@
 {
-  "app.js": "app-2918c7809b.js"
+  "app.js": "app-cf795c06eb.js"
 }