From eb9b88123af7b07d509d4f39497876b218da9485 Mon Sep 17 00:00:00 2001 From: Shane Harris Date: Tue, 21 Apr 2020 20:33:07 +0100 Subject: [PATCH] added support for scrcpy to linux and mac builds --- build-electron/app.jsc | Bin 62344 -> 62344 bytes desktop-app/src/app/app.service.ts | 22 +++++++++++++++++- .../src/app/header/header.component.html | 2 +- .../src/app/header/header.component.ts | 5 ---- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/build-electron/app.jsc b/build-electron/app.jsc index b1a7174ddb48e47e2804aed0acc23b44e9157edd..f4f9e7aea6e1e81d2d8f6fa06928c182a4bd15fc 100644 GIT binary patch delta 4142 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 diff --git a/desktop-app/src/app/app.service.ts b/desktop-app/src/app/app.service.ts index 21e85ef..fc85adf 100644 --- a/desktop-app/src/app/app.service.ts +++ b/desktop-app/src/app/app.service.ts @@ -300,7 +300,7 @@ export class AppService { return `${packageString} ${nodeString} ${computerString}`; } - runScrCpy(options: any) { + startScrCpy(options: any) { return new Promise((resolve, reject) => { let command = '"' + @@ -329,6 +329,24 @@ export class AppService { }); } + runScrCpy(options: any) { + let platform = this.os.platform(); + if (platform === 'linux' || platform === 'darwin') { + return new Promise((resolve, reject) => { + this.exec('scrcpy -v', (err, stdout, stderr) => { + if (err) { + return reject(err); + } + this.startScrCpy(options) + .then(resolve) + .catch(reject); + }); + }); + } else { + return this.startScrCpy(options); + } + } + downloadScrCpyBinary() { if (this.os.platform() === 'win32') { this.spinnerService.showLoader(); @@ -364,6 +382,8 @@ export class AppService { this.scrcpyBinaryPath = downloadPath; }); }); + } else { + this.scrcpyBinaryPath = 'scrcpy'; } } deleteFolderRecursive(path) { diff --git a/desktop-app/src/app/header/header.component.html b/desktop-app/src/app/header/header.component.html index 02cda53..74f90b3 100644 --- a/desktop-app/src/app/header/header.component.html +++ b/desktop-app/src/app/header/header.component.html @@ -154,7 +154,7 @@ class="material-icons white-text no-outline" position="bottom" tooltip="Forward"> arrow_forward - live_tv diff --git a/desktop-app/src/app/header/header.component.ts b/desktop-app/src/app/header/header.component.ts index ff8f2c4..7f387ba 100644 --- a/desktop-app/src/app/header/header.component.ts +++ b/desktop-app/src/app/header/header.component.ts @@ -42,14 +42,9 @@ export class HeaderComponent implements OnInit { safeResolve: any = val => val; folder = FolderType; addrepoUrl: string = ''; - colorA: string; - colorB: string; - beatOnLoading: boolean; isAlive: boolean = true; isAliveChecking: boolean = false; replaceText: ReplaceText[] = []; - addkey: string; - addvalue: string; adbCommandToRun: string; osPlatform: string; favourites: {