starred/stf-DeviceFarmer
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-19 16:43:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed device redirect when not usable.

Browse Source
This commit is contained in:
Gunther Brunner
2014-05-29 02:27:08 +09:00
parent aa8f8fd999
commit 12fc884f78
10 changed files with 62 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
res/app/control-panes/control-panes-controller.js
View File

@@ -1,15 +1,4 @@
module.exports = function ControlPanesController(
$scope
, $http
, gettext
, $routeParams
, $location
, DeviceService
, GroupService
, ControlService
, StorageService
, FatalMessageService
) {
module.exports = function ControlPanesController($scope, $http, gettext, $routeParams, $timeout, $location, DeviceService, GroupService, ControlService, StorageService, FatalMessageService) {
var sharedTabs = [
{
title: gettext('Screenshots'),
@@ -83,53 +72,46 @@ module.exports = function ControlPanesController(
$scope.installFileForced = function ($files) {
$scope.$apply(function () {
$scope.upload = {
progress: 0
, lastData: 'uploading'
progress: 0, lastData: 'uploading'
}
})
return StorageService.storeFile('apk', $files, {
filter: function(file) {
return /\.apk$/i.test(file.name)
}
})
.progressed(function(e) {
filter: function (file) {
return /\.apk$/i.test(file.name)
}
})
.progressed(function (e) {
if (e.lengthComputable) {
$scope.$apply(function () {
$scope.upload = {
progress: e.loaded / e.total * 100
, lastData: 'uploading'
progress: e.loaded / e.total * 100, lastData: 'uploading'
}
})
}
})
.then(function(res) {
.then(function (res) {
$scope.$apply(function () {
$scope.upload = {
progress: 100
, lastData: 'processing'
progress: 100, lastData: 'processing'
}
})
var href = res.data.resources.file0.href
return $http.get(href + '/manifest')
.then(function(res) {
.then(function (res) {
$scope.upload = {
progress: 100
, lastData: 'success'
, settled: true
progress: 100, lastData: 'success', settled: true
}
if (res.data.success) {
return $scope.installForced({
href: href
, launch: true
, manifest: res.data.manifest
href: href, launch: true, manifest: res.data.manifest
})
}
})
})
.catch(function(err) {
.catch(function (err) {
$scope.$apply(function () {
if (err.code === 'no_input_files') {
$scope.upload = null
@@ -137,10 +119,7 @@ module.exports = function ControlPanesController(
else {
console.log('Upload error', err)
$scope.upload = {
progress: 100
, lastData: 'fail'
, settled: true
, error: err.message
progress: 100, lastData: 'fail', settled: true, error: err.message
}
}
})
@@ -175,17 +154,22 @@ module.exports = function ControlPanesController(
return device
})
.catch(function () {
$location.path('/')
$timeout(function () {
$location.path('/')
})
})
$scope.$watch('device')
$scope.$watch('device.state', function (newValue, oldValue) {
if (newValue !== oldValue) {
if (oldValue === 'using') {
FatalMessageService.open(angular.copy($scope.device))
} else {
}
} else if (typeof newValue === 'undefined' && typeof oldValue === 'undefined') {
//FatalMessageService.open(angular.copy($scope.device))
}
}, true)
}