diff --git a/build-electron/app.jsc b/build-electron/app.jsc index b1a7174..f4f9e7a 100644 Binary files a/build-electron/app.jsc and b/build-electron/app.jsc differ 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: {