Commit 9d964e5c authored by wudizhanche1000's avatar wudizhanche1000

Merge branch 'v3' of https://github.com/mycard/mycard into v3

# Conflicts:
#	app/app-detail.component.html
#	app/apps.service.ts
#	apps.json
parents 45621de1 602ce234
...@@ -15,12 +15,13 @@ ...@@ -15,12 +15,13 @@
</progress> </progress>
</div> </div>
</div> </div>
<div *ngIf="isInstalled"> <div *ngIf="isInstalled && (routingService.app != 'ygopro')">
<button (click)="startApp(routingService.app)" type="button" class="btn btn-primary">运行</button> <button (click)="startApp(routingService.app)" type="button" class="btn btn-primary">运行</button>
<button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#settings-modal">设置</button> <button type="button" class="btn btn-secondary">设置</button>
<button (click)="openDir(routingService.app)" type="button" class="btn btn-secondary">游览本地文件</button> <button (click)="appsService.browse(routingService.app)" type="button" class="btn btn-secondary">游览本地文件</button>
<button type="button" class="btn btn-secondary">联机</button> <button type="button" class="btn btn-secondary">联机</button>
</div> </div>
<ygopro *ngIf="isInstalled && (routingService.app == 'ygopro')"></ygopro>
<br> <br>
......
...@@ -136,10 +136,6 @@ export class AppDetailComponent { ...@@ -136,10 +136,6 @@ export class AppDetailComponent {
return dir[0]; return dir[0];
} }
openDir(id) {
this.electron.remote.shell.showItemInFolder(this.appsService.searchApp(id).local.path);
}
startApp(id) { startApp(id) {
let execute = this.path.join(this.appsService.searchApp(id).local.path, this.appsService.searchApp(id).actions[process.platform]["main"].execute); let execute = this.path.join(this.appsService.searchApp(id).local.path, this.appsService.searchApp(id).actions[process.platform]["main"].execute);
let args = this.appsService.searchApp(id).actions[process.platform]["main"].args; let args = this.appsService.searchApp(id).actions[process.platform]["main"].args;
......
...@@ -322,7 +322,9 @@ export class AppsService { ...@@ -322,7 +322,9 @@ export class AppsService {
default: default:
throw 'unsupported platform'; throw 'unsupported platform';
} }
let opt = {}; let opt = {
maxBuffer: 20*1024*1024
};
let tarObj; let tarObj;
if (this.tarQueue.length > 0) { if (this.tarQueue.length > 0) {
...@@ -438,4 +440,8 @@ export class AppsService { ...@@ -438,4 +440,8 @@ export class AppsService {
return !1; return !1;
return !0 return !0
} }
browse(id) {
this.electron.remote.shell.showItemInFolder(this.searchApp(id).local.path);
}
} }
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment