Commit 1356c21e authored by Chen Jiping's avatar Chen Jiping

feat:增加音频清除按钮;调整开始音频播放逻辑

parent 00107cee
...@@ -15,6 +15,11 @@ ...@@ -15,6 +15,11 @@
(audioUploaded)="onAudioUploadSuccess($event, item, 'guideAudioUrl1')"> (audioUploaded)="onAudioUploadSuccess($event, item, 'guideAudioUrl1')">
</app-audio-recorder> </app-audio-recorder>
</nz-form-control> </nz-form-control>
<nz-form-control [nzSpan]="2">
<button nz-button nzType="danger" (click)="deleteAudio(item, 'guideAudioUrl1')">
<i nz-icon nzType="delete" nzTheme="outline"></i>清除
</button>
</nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="2" nzFor="guideAudioUrl2">待机音频</nz-form-label> <nz-form-label [nzSpan]="2" nzFor="guideAudioUrl2">待机音频</nz-form-label>
...@@ -23,6 +28,11 @@ ...@@ -23,6 +28,11 @@
(audioUploaded)="onAudioUploadSuccess($event, item, 'guideAudioUrl2')"> (audioUploaded)="onAudioUploadSuccess($event, item, 'guideAudioUrl2')">
</app-audio-recorder> </app-audio-recorder>
</nz-form-control> </nz-form-control>
<nz-form-control [nzSpan]="2">
<button nz-button nzType="danger" (click)="deleteAudio(item, 'guideAudioUrl2')">
<i nz-icon nzType="delete" nzTheme="outline"></i>清除
</button>
</nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="2" nzFor="guideAudioUrl3">结束音频</nz-form-label> <nz-form-label [nzSpan]="2" nzFor="guideAudioUrl3">结束音频</nz-form-label>
...@@ -31,6 +41,11 @@ ...@@ -31,6 +41,11 @@
(audioUploaded)="onAudioUploadSuccess($event, item, 'guideAudioUrl3')"> (audioUploaded)="onAudioUploadSuccess($event, item, 'guideAudioUrl3')">
</app-audio-recorder> </app-audio-recorder>
</nz-form-control> </nz-form-control>
<nz-form-control [nzSpan]="2">
<button nz-button nzType="danger" (click)="deleteAudio(item, 'guideAudioUrl3')">
<i nz-icon nzType="delete" nzTheme="outline"></i>清除
</button>
</nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="2">图片</nz-form-label> <nz-form-label [nzSpan]="2">图片</nz-form-label>
......
...@@ -99,6 +99,10 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -99,6 +99,10 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
this.save(); this.save();
} }
deleteAudio(item, key){
item[key] = null;
this.save();
}
/** /**
* 储存数据 * 储存数据
......
...@@ -237,9 +237,7 @@ cc.Class({ ...@@ -237,9 +237,7 @@ cc.Class({
}); });
} }
else { else {
this.playAni('begin', 1, () => {
begin(); begin();
})
} }
...@@ -532,6 +530,7 @@ cc.Class({ ...@@ -532,6 +530,7 @@ cc.Class({
const state = dragonDisplay.playAnimation(name, times); const state = dragonDisplay.playAnimation(name, times);
dragonDisplay.on(dragonBones.EventObject.COMPLETE, () => { dragonDisplay.on(dragonBones.EventObject.COMPLETE, () => {
const tip = cc.find('Canvas/tipFrame/tip');
tip.active = false; tip.active = false;
if (cb) { if (cb) {
cb(); cb();
...@@ -699,6 +698,9 @@ cc.Class({ ...@@ -699,6 +698,9 @@ cc.Class({
this.playAni('normal', 0); this.playAni('normal', 0);
}) })
} }
else{
this._cantouch = true;
}
}, },
_stop: null, _stop: null,
......
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