removed scrcpy, added httpreferrer

This commit is contained in:
Shane Harris
2020-11-11 13:54:12 +00:00
parent ec725132c5
commit 0af649d1b8
6 changed files with 45 additions and 169 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
<app-loading-spinner #spinner></app-loading-spinner>
<app-status-bar #status (getHelp)="getHelpModal.openModal(); helpStatus = $event; setExterHelp()"></app-status-bar>
<webview id="mainWebView" #webview src="https://sidequestvr.com" allowpopups [ngStyle]="{'left':webService.isWebviewOpen?'0':'-100%'}" class="bsaber-webview" ></webview>
<webview id="mainWebView" #webview httpreferrer="https://sdiequestvr.com" src="https://sidequestvr.com" allowpopups [ngStyle]="{'left':webService.isWebviewOpen?'0':'-100%'}" class="bsaber-webview" ></webview>
<mz-modal #getHelpModal [fixedFooter]="true">
<mz-modal-header>
+1 -1
View File
@@ -32,7 +32,7 @@ export class AppComponent implements OnInit, AfterViewInit {
ngOnInit() {
this.adbService
.setupAdb()
.then(() => this.appService.downloadScrCpyBinary(this.adbService))
// .then(() => this.appService.downloadScrCpyBinary(this.adbService))
.then(() => this.adbService.connectedStatus())
.then(() => {
if (!localStorage.getItem('first_run')) {
+39 -39
View File
@@ -363,45 +363,45 @@ export class AppService {
}
}
downloadScrCpyBinary(adbClientService) {
if (this.os.platform() === 'win32') {
this.spinnerService.showLoader();
let task = { status: 'Downloading/Extracting ScrCpy...' };
this.spinnerService.setMessage('', task);
let url = 'https://github.com/Genymobile/scrcpy/releases/download/v1.11/scrcpy-win64-v1.11.zip';
let downloadPath = this.path.join(this.appData, 'scrcpy', 'scrcpy.exe');
if (this.doesFileExist(downloadPath)) {
this.scrcpyBinaryPath = downloadPath;
this.spinnerService.hideLoader();
return Promise.resolve();
}
return new Promise<void>((resolve, reject) => {
this.downloadFile(
url,
url,
url,
() => {
return this.path.join(this.appData, 'scrcpy.zip');
},
task
).then((path: any) => {
let callback = error => {
if (error) return reject(error);
this.fs.unlink(path, err => {
// if(err) return reject(err);
this.spinnerService.hideLoader();
resolve(path.split('.')[0]);
});
};
this.extract(path, { dir: this.path.join(this.appData, 'scrcpy') }, callback);
this.scrcpyBinaryPath = downloadPath;
});
});
} else {
this.scrcpyBinaryPath = 'ADB=' + adbClientService.adbPath + ' scrcpy';
}
}
// downloadScrCpyBinary(adbClientService) {
// if (this.os.platform() === 'win32') {
// this.spinnerService.showLoader();
// let task = { status: 'Downloading/Extracting ScrCpy...' };
// this.spinnerService.setMessage('', task);
// let url = 'https://github.com/Genymobile/scrcpy/releases/download/v1.11/scrcpy-win64-v1.11.zip';
// let downloadPath = this.path.join(this.appData, 'scrcpy', 'scrcpy.exe');
// if (this.doesFileExist(downloadPath)) {
// this.scrcpyBinaryPath = downloadPath;
// this.spinnerService.hideLoader();
// return Promise.resolve();
// }
// return new Promise<void>((resolve, reject) => {
// this.downloadFile(
// url,
// url,
// url,
// () => {
// return this.path.join(this.appData, 'scrcpy.zip');
// },
// task
// ).then((path: any) => {
// let callback = error => {
// if (error) return reject(error);
// this.fs.unlink(path, err => {
// // if(err) return reject(err);
// this.spinnerService.hideLoader();
// resolve(path.split('.')[0]);
// });
// };
//
// this.extract(path, { dir: this.path.join(this.appData, 'scrcpy') }, callback);
// this.scrcpyBinaryPath = downloadPath;
// });
// });
// } else {
// this.scrcpyBinaryPath = 'ADB=' + adbClientService.adbPath + ' scrcpy';
// }
// }
deleteFolderRecursive(path) {
if (this.fs.existsSync(path)) {
this.fs.readdirSync(path).forEach(file => {
@@ -484,115 +484,13 @@
<mz-modal #scrcpyModal [fixedFooter]="true">
<mz-modal-header>
<h4>Stream Options</h4>
<h4>Oculus Casting</h4>
</mz-modal-header>
<mz-modal-content>
<div class="row">
<div class="col s6 fixed-height">
Always On Top
<div class="grey-text small">
Make scrcpy window always on top (above other windows).
</div>
</div>
<div class="col s6 fixed-height">
<div class="switch">
<label>
Off
<input type="checkbox" [(ngModel)]="scrcpy_options.always_on_top" />
<span class="lever"></span>
On
</label>
</div>
</div>
<div class="col s6 fixed-height">
Bit Rate
<div class="grey-text small">
Encode the video at the given bit-rate, expressed in bits/s. Unit suffixes are supported: 'K' (x1000) and 'M'
(x1000000).
</div>
</div>
<div class="col s6 input-field fixed-height">
<input id="bit_rate_" [(ngModel)]="scrcpy_options.bit_rate" type="text" />
<label for="bit_rate_" class="active">Bit Rate</label>
</div>
<div class="col s6 fixed-height">
Crop
<div class="grey-text small">
Crop the device screen on the server. The values are expressed in the device natural orientation (typically,
portrait for a phone, landscape for a tablet). Any MaxSize value is computed on the cropped size.
</div>
</div>
<div class="col s6 input-field fixed-height">
<input id="crop_" [(ngModel)]="scrcpy_options.crop" type="text" />
<label for="crop_" class="active">Crop</label>
<div class="btn pink-button small-button waves-light waves-effect margin-right" (click)="scrcpy_options.crop = '1280:720:1500:350'">Quest 1 Crop</div>
<div class="btn pink-button small-button waves-light waves-effect margin-right" (click)="scrcpy_options.crop = '1600:900:2017:510'">Quest 2 Crop</div>
</div>
<div class="col s6 fixed-height">
Fullscreen
<div class="grey-text small">
Start in fullscreen.
</div>
</div>
<div class="col s6 fixed-height">
<div class="switch">
<label>
Off
<input type="checkbox" [(ngModel)]="scrcpy_options.fullscreen" />
<span class="lever"></span>
On
</label>
</div>
</div>
<div class="col s6 fixed-height">
No Input
<div class="grey-text small">
Disable device control (mirror the device in read-only).
</div>
</div>
<div class="col s6 fixed-height">
<div class="switch">
<label>
Off
<input type="checkbox" [(ngModel)]="scrcpy_options.no_control" />
<span class="lever"></span>
On
</label>
</div>
</div>
<div class="col s6 fixed-height">
Max FPS
<div class="grey-text small">
Limit the frame rate of screen capture. 0 is unlimited.
</div>
</div>
<div class="col s6 input-field fixed-height">
<input id="max_fps_" [(ngModel)]="scrcpy_options.max_fps" type="text" />
<label for="max_fps_" class="active">Max FPS</label>
</div>
<div class="col s6 fixed-height">
Max Size
<div class="grey-text small">
Limit both the width and height of the video to value. The other dimension is computed so that the device
aspect-ratio is preserved. 0 is unlimited.
</div>
</div>
<div class="col s6 input-field fixed-height">
<input id="max_size_" [(ngModel)]="scrcpy_options.max_size" type="text" />
<label for="max_size_" class="active">Max Size</label>
</div>
<div class="col s12" *ngIf="osPlatform === 'darwin'">
To use ScrCpy on mac you will need to install Homebrew and then install scrcpy with <span class="chip">brew install scrcpy</span>
<br><br>
</div>
<div class="col s12" *ngIf="osPlatform === 'linux'">
To use ScrCpy on Linux you will need to install snap package manager with <span class="chip">sudo snap install scrcpy</span>
</div>
</div>
In the past we used a tool called ScrCpy or Screen Copy to stream from your headset to your PC. Oculus have since released casting to a browser page that provides a much more stable experience including support for audio. We have since removed the option to stream with ScrCpy in favour of the native option that works better.
</mz-modal-content>
<mz-modal-footer>
<div class="left margin-left"><br>Put your headset on before clicking Start Stream</div>
<button mz-button class="pink-button" mz-modal-close (click)="runscrcpy()">Start Stream</button>
<button mz-button class="pink-button" mz-modal-close (click)="appService.opn('https://www.oculus.com/casting')">Open Casting Webpage</button>
<button mz-button [flat]="true" mz-modal-close>Close</button>
</mz-modal-footer>
</mz-modal>
@@ -61,15 +61,6 @@ export class HeaderComponent implements OnInit {
favoritePathType = 'Path';
favouriteImportExport: boolean;
favouriteMax: number;
scrcpy_options: any = {
always_on_top: false,
bit_rate: '8000000',
crop: '1280:720:1500:350',
no_control: true,
fullscreen: false,
max_size: '0',
max_fps: '0',
};
// BAG = 'FAVS';
subs = new Subscription();
logcatTag: string = '';
@@ -171,13 +162,7 @@ export class HeaderComponent implements OnInit {
}
updateAvailable() {
// if (process.platform == 'win32') {
// this.spinnerService.setMessage('Downloading update...');
// this.spinnerService.showLoader();
// this.appService.electron.ipcRenderer.send('automatic-update', {});
// } else {
this.appService.opn('https://sidequestvr.com/download');
// }
}
startLogcat() {
@@ -251,13 +236,6 @@ export class HeaderComponent implements OnInit {
this.adbService.adbCommand('endLogcat');
}
runscrcpy() {
this.appService
.runScrCpy(this.scrcpy_options)
.then(() => this.statusService.showStatus('Stream closed.'))
.catch(e => this.statusService.showStatus('ScrCpy Error: ' + JSON.stringify(e), true));
}
gogo(e) {
if (e.keyCode === 13) {
this.webService.loadUrl(this.webService.currentAddress);
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "SideQuest",
"productName": "SideQuest",
"version": "0.10.18",
"version": "0.10.19",
"description": "A open app store for mobile android based VR devices such as the Levovo Mirage, Oculus Go, Oculus Quest, Vive Focus.",
"repository": "https://github.com/SideQuestVR/SideQuest.git",
"license": "UNLICENCED",