Commit d7b61dd6 authored by limingzhe's avatar limingzhe

fix: 图片展示异常 upload url异常

parent 94ba8007
...@@ -10,13 +10,6 @@ ...@@ -10,13 +10,6 @@
</div> </div>
<div #iframeContent style="position: absolute; top: 0; overflow: hidden; ">
<div *ngFor="let t of templateArr; let i = index" >
<iframe *ngIf="!t.isHide" [style.width]="t?.leftOff || '0vw'" [src]="t?.playUrl || safeDefaultUrl" style="position: fixed; width: 100vw; height: 100vh; border: 0px solid #ccc; " frameborder="0">
</iframe>
</div>
</div>
<!-- <div style="position: absolute; top: 0"> <!-- <div style="position: absolute; top: 0">
<label style="font-family: Aileron-Black;"></label> <label style="font-family: Aileron-Black;"></label>
<label style="font-family: DroidSansFallback;"></label> <label style="font-family: DroidSansFallback;"></label>
......
...@@ -330,7 +330,9 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -330,7 +330,9 @@ export class PlayComponent implements OnInit, OnDestroy {
this.uploadUrl = (<any> window).courseware.uploadUrl(); this.uploadUrl = (<any> window).courseware.uploadUrl();
window['air'].getUploadCallback = (url, data) => {
this.uploadUrl = url;
};
...@@ -492,6 +494,15 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -492,6 +494,15 @@ export class PlayComponent implements OnInit, OnDestroy {
} }
}; };
let arr = contentObj.hotZoneItemArr;
if (arr) {
for (let i = 0; i < arr.length; i++) {
console.log('arr[i].pic_url: ', arr[i].pic_url);
addPicUrl(arr[i].pic_url);
}
}
addPicUrl(contentObj.bgItem?.url || ''); addPicUrl(contentObj.bgItem?.url || '');
addPicUrl(contentObj.bg_url || ''); addPicUrl(contentObj.bg_url || '');
...@@ -3070,7 +3081,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -3070,7 +3081,7 @@ export class PlayComponent implements OnInit, OnDestroy {
const p = this.preload(value) const p = this.preload(value)
.then(img => { .then(img => {
img['setAttribute']("crossOrigin",'Anonymous') // img['setAttribute']("crossOrigin",'Anonymous')
this.images.set(key, img); this.images.set(key, img);
}) })
...@@ -3095,6 +3106,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -3095,6 +3106,7 @@ export class PlayComponent implements OnInit, OnDestroy {
preload(url) { preload(url) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const img = new Image(); const img = new Image();
img['crossOrigin'] = "Anonymous";
// img.crossOrigin = "anonymous"; // img.crossOrigin = "anonymous";
img.onload = () => resolve(img); img.onload = () => resolve(img);
img.onerror = reject; img.onerror = reject;
...@@ -3242,6 +3254,11 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -3242,6 +3254,11 @@ export class PlayComponent implements OnInit, OnDestroy {
convertCanvasToImage() { convertCanvasToImage() {
console.log('1'); console.log('1');
if (!this.uploadUrl) {
this.userResultPic = true
this.sendResult();
return
}
console.log('2 uploadUrl: ', this.uploadUrl.toString()); console.log('2 uploadUrl: ', this.uploadUrl.toString());
const src = this.canvas.nativeElement.toDataURL("image/png"); const src = this.canvas.nativeElement.toDataURL("image/png");
......
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