From 408f7e3a02e436d346b44c319f42b13cf803dfdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BA=91?= <dongyun.li@luxcreo.ai>
Date: Wed, 7 Sep 2022 17:35:35 +0800
Subject: [PATCH] =?UTF-8?q?feat(studio):=20=E6=B8=85=E7=90=86=E4=BA=86?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Studio/Resource/Workspace/Workspace.php | 24 ++++++++++-----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/Studio/Resource/Workspace/Workspace.php b/src/Studio/Resource/Workspace/Workspace.php
index 704460f..c697e08 100644
--- a/src/Studio/Resource/Workspace/Workspace.php
+++ b/src/Studio/Resource/Workspace/Workspace.php
@@ -10,7 +10,7 @@
 namespace Singularity\HDK\Studio\Resource\Workspace;
 
 use Hyperf\Resource\Json\JsonResource;
-use Singularity\HDK\Studio\Resource\FileCollection;
+use Singularity\HDK\Studio\Resource\File;
 use Singularity\HDK\Studio\Resource\Workspace\Tasks\Item\Frame;
 use Singularity\HDK\Studio\Resource\Workspace\Tasks\Item\GradientLattice;
 use Singularity\HDK\Studio\Resource\Workspace\Tasks\Item\Lattice;
@@ -41,7 +41,7 @@ class Workspace extends JsonResource
         return [
             'id' => $this->wsId,
             'status' => $this->status,
-            $this->mergeWhen(
+            /*$this->mergeWhen(
                 !empty($this->frameTask),
                 [
                     'frameTask' => empty($this->frameTask)
@@ -50,37 +50,35 @@ class Workspace extends JsonResource
                             $this->frameTask
                         )->toArray(),
                 ]
-            ),
-            $this->mergeWhen(
+            ),*/
+            /*$this->mergeWhen(
                 !empty($this->latticeTask),
                 [
                     'latticeTask' => empty($this->latticeTask) ? $this->latticeTask : Lattice::make(
                         $this->latticeTask
                     )->toArray(),
                 ]
-            ),
-            $this->mergeWhen(
+            ),*/
+            /*$this->mergeWhen(
                 !empty($this->gradientTask),
                 [
                     'gradientTask' => empty($this->gradientTask) ? $this->latticeTask : GradientLattice::make(
                         $this->gradientTask
                     )->toArray(),
                 ]
-            ),
+            ),*/
             $this->mergeWhen(
                 isset($this->gradientTask?->viewShotFirst) || isset($this->latticeTask?->viewShotFirst) || isset($this->frameTask?->viewShotFirst),
                 [
-                    'viewShot' => FileCollection::make(
-                        [
-                                $this->gradientTask?->viewShotFirst ?? $this->latticeTask?->viewShotFirst ?? $this?->frameTask->viewShotFirst,
-                        ]
-                    ),
+                    'viewShot' => File::make(
+                        $this->gradientTask?->viewShotFirst ?? $this->latticeTask?->viewShotFirst ?? $this?->frameTask->viewShotFirst,
+                    )?->fullPath,
                 ]
             ),
             $this->mergeWhen(
                 isset($this->gradientTask?->modelName) || isset($this->latticeTask?->modelName) || isset($this->frameTask?->modelName),
                 [
-                    'modelName' => $this->gradientTask?->modelName ?? $this->latticeTask?->modelName ?? $this->frameTask->modelName,
+                    'modelName' => $this->gradientTask?->modelName ?? $this->latticeTask?->modelName ?? $this->frameTask?->modelName,
                 ]
             ),
         ];