1.2.2

src/app/working-area/working-area.component.ts

@@ -162,7 +162,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
    * 重大调整-主版本号增加
    * 日期变更-日期版本号增加
    */
-  public VERSION = '1.2.1.20210207_beta';
+  public VERSION = '1.2.2.20210220_beta';
   /**
    * 数据初始化
    */
@@ -992,25 +992,42 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     if (imageUrl === undefined || imageUrl === null || imageUrl === '') {
       this.backgroundImage.texture = this.backgroundTexture;
     } else {
-      this.backgroundImage.texture = await PIXI.Texture.fromURL(imageUrl);
-    }
-
-    this.backgroundImage.angle = imageAngle;
-
+      // this.backgroundImage.texture = await PIXI.Texture.fromURL(imageUrl);
       if (imageWidth !== undefined
         && imageWidth !== null
         && imageWidth !== 0
         && imageHeight !== undefined
         && imageHeight !== null
         && imageHeight !== 0) {
-      console.log(imageWidth, imageHeight);
-      this.backgroundImage.width = imageWidth;
-      this.backgroundImage.height = imageHeight;
+        // console.log(imageWidth, imageHeight);
+        // this.backgroundImage.width = imageWidth;
+        // this.backgroundImage.height = imageHeight;
+        this.backgroundImage.texture =
+          await PIXI.Texture.fromURL(imageUrl + '?x-oss-process=image/resize,m_fixed,h_' + imageHeight + ',w_' + imageWidth); // 图片处理
       } else {
-      this.backgroundImage.width = this.backgroundImage.texture.width;
-      this.backgroundImage.height = this.backgroundImage.texture.height;
+        // this.backgroundImage.width = this.backgroundImage.texture.width;
+        // this.backgroundImage.height = this.backgroundImage.texture.height;
+        this.backgroundImage.texture =
+          await PIXI.Texture.fromURL(imageUrl); // 请求原图
+      }
     }
 
+    this.backgroundImage.angle = imageAngle;
+
+    // if (imageWidth !== undefined
+    //   && imageWidth !== null
+    //   && imageWidth !== 0
+    //   && imageHeight !== undefined
+    //   && imageHeight !== null
+    //   && imageHeight !== 0) {
+    //   console.log(imageWidth, imageHeight);
+    //   this.backgroundImage.width = imageWidth;
+    //   this.backgroundImage.height = imageHeight;
+    // } else {
+    //   this.backgroundImage.width = this.backgroundImage.texture.width;
+    //   this.backgroundImage.height = this.backgroundImage.texture.height;
+    // }
+
     this.backgroundImage.x = this.backgroundImage.width / 2;
     this.backgroundImage.y = this.backgroundImage.height / 2;