update new pass

This commit is contained in:
Anthony Minessale
2015-11-12 18:33:32 -06:00
parent f3afab2f72
commit f1b2733c14
10 changed files with 46 additions and 46 deletions

View File

@@ -15,7 +15,7 @@
"grunt-contrib-copy": "^0.7.0",
"grunt-contrib-cssmin": "^0.12.0",
"grunt-contrib-htmlmin": "^0.4.0",
"grunt-contrib-imagemin": "^0.9.2",
"grunt-contrib-imagemin": "^1.0.0",
"grunt-contrib-jshint": "^0.11.0",
"grunt-contrib-uglify": "^0.7.0",
"grunt-contrib-watch": "latest",

View File

@@ -1,5 +1,4 @@
{
"login": "1008",
"password": "1234",
"dedEncWatermark": 3072
"password": "1234"
}

View File

@@ -9,6 +9,5 @@
"autologin": "true",
"autocall": "3500",
"googlelogin": "true",
"wsURL": "wss://gamma.tollfreegateway.com/wss2",
"dedEncWatermark": 3072
"wsURL": "wss://gamma.tollfreegateway.com/wss2"
}

View File

@@ -84,8 +84,8 @@
</div>
<div class="form-group">
<label>Video settings:</label>
<!-- <a class="btn btn-primary" href="" ng-click="testSpeed()">Check Speed</a> -->
<label>Video settings:</label> <br><br>
<a class="btn btn-primary" href="" ng-click="testSpeed()">Check Speed</a>
<span ng-bind="speedMsg"></span>
<input type="hidden" name="use_dedenc" ng-value="mydata.useDedenc" ng-model="mydata.useDedenc">

View File

@@ -82,7 +82,7 @@
'message': 'Check Connection Speed.'
};
if (storage.data.autoBand && verto.instance) {
if (storage.data.autoBand && verto.data.instance) {
verto.testSpeed(cb);
} else {
resolve(result);

View File

@@ -10,19 +10,26 @@
$scope.storage = storage;
$rootScope.$on('testSpeed', function(e, data) {
var dedEncWatermark = storage.data.dedEncWatermark;
var vidQual = storage.data.vidQual;
var bwp = 4;
$scope.bandDown = data.downKPS;
$scope.bandUp = data.upKPS;
$scope.dedEnc = storage.data.useDedenc;
$scope.iconClass = 'mdi-device-signal-wifi-3-bar';
if (data.downKPS < 2000) {
bwp--;
}
if ($scope.bandDown < dedEncWatermark) {
$scope.iconClass = 'mdi-device-signal-wifi-1-bar dedenc';
} else if ($scope.bandDown >= 2*dedEncWatermark) {
$scope.iconClass = 'mdi-device-signal-wifi-4-bar';
if (data.upKPS < 2000) {
bwp--;
}
$scope.iconClass = 'mdi-device-signal-wifi-4-bar';
if (bwp < 4) {
$scope.iconClass = 'mdi-device-signal-wifi-3-bar';
} else if (bwp < 2) {
$scope.iconClass = 'mdi-device-signal-wifi-1-bar dedenc';
}
verto.videoQuality.forEach(function(vid) {

View File

@@ -41,12 +41,6 @@ vertoService.service('config', ['$rootScope', '$http', '$location', 'storage', '
verto.data.googleclientid = data.googleclientid;
}
if (data.dedEncWatermark) {
storage.data.dedEncWatermark = data.dedEncWatermark;
} else {
storage.data.dedEncWatermark = 3072;
}
angular.extend(verto.data, data);
/**

View File

@@ -76,6 +76,12 @@ var bandwidth = [{
}, {
id: '2048',
label: '2mb'
}, {
id: '3196',
label: '3mb'
}, {
id: '4192',
label: '4mb'
}, {
id: '5120',
label: '5mb'
@@ -812,7 +818,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
if (storage.data.autoBand) {
storage.data.incomingBandwidth = downBand;
storage.data.outgoingBandwidth = upBand;
storage.data.useDedenc = downBand <= storage.data.dedEncWatermark;
storage.data.useDedenc = false;
storage.data.vidQual = 'hd';
if (upBand < 512) {