fix: 素材上传

wake/View/Owner/UserInfo/UserInfo.swift

@@ -283,6 +283,10 @@ struct UserInfo: View {
 
 // MARK: - 首个盲盒自动创建
 extension UserInfo {
+    private struct MaterialSubmitResponse: Codable {
+        let code: Int
+        let data: [String]?
+    }
     private struct GenerateFileInfo: Codable {
         let id: String
         let fileName: String?
@@ -315,9 +319,27 @@ extension UserInfo {
     }
 
     private func generateFirstBlindBox(with fileId: String) {
+        // 1) 先将文件注册为素材
+        let materialPayload: [[String: String]] = [[
+            "file_id": fileId,
+            "preview_file_id": fileId
+        ]]
+        NetworkService.shared.postWithToken(
+            path: "/material",
+            parameters: materialPayload
+        ) { (matResult: Result<MaterialSubmitResponse, NetworkError>) in
+            DispatchQueue.main.async {
+                switch matResult {
+                case .success(let matResp):
+                    guard matResp.code == 0, let materialIds = matResp.data, let materialId = materialIds.first else {
+                        self.errorMessage = "Submit material failed"
+                        self.showError = true
+                        return
+                    }
+                    // 2) 用 material_id 创建首个盲盒
                     let params: [String: Any] = [
                         "box_type": "First",
-            "material_ids": [fileId]
+                        "material_ids": [materialId]
                     ]
                     NetworkService.shared.postWithToken(
                         path: "/blind_box/generate",
@@ -357,6 +379,12 @@ extension UserInfo {
                             }
                         }
                     }
+                case .failure(let error):
+                    self.errorMessage = "Submit material failed: \(error.localizedDescription)"
+                    self.showError = true
+                }
+            }
+        }
     }
 }
 

wake/View/Upload/MediaUploadView.swift

@@ -49,13 +49,20 @@ private struct QueryResponse: Codable {
     let data: GenerateData?
 }
 
+private struct MaterialSubmitResponse: Codable {
+    let code: Int
+    let data: [String]?
+}
+
 extension MediaUploadView {
     private func startPollingSecondBox(id: Int64) {
         pollingTimer?.invalidate()
         // 每2秒轮询一次查询接口
         pollingTimer = Timer.scheduledTimer(withTimeInterval: 2.0, repeats: true) { _ in
+            DispatchQueue.main.async {
                 querySecondBox(id: id)
             }
+        }
         // 立即查询一次
         querySecondBox(id: id)
     }
@@ -422,14 +429,31 @@ struct MediaUploadView: View {
             print("⚠️ 没有可用的文件ID")
             return
         }
-        // 收集素材 file_id 列表
+        // 1) 先将文件ID提交为素材，获取 material_ids
-        let materialIds: [String] = uploadResults.map { $0.value.fileId }
+        let materialPayload: [[String: String]] = uploadResults.map { (_, result) in
-        // 调用创建第二个盲盒接口
+            [
+                "file_id": result.fileId,
+                "preview_file_id": result.thumbnailId ?? result.fileId
+            ]
+        }
+        isGeneratingSecond = true
+        NetworkService.shared.postWithToken(
+            path: "/material",
+            parameters: materialPayload
+        ) { (matResult: Result<MaterialSubmitResponse, NetworkError>) in
+            DispatchQueue.main.async {
+                switch matResult {
+                case .success(let matResp):
+                    guard matResp.code == 0, let materialIds = matResp.data, !materialIds.isEmpty else {
+                        print("❌ 素材提交失败：响应无效或为空")
+                        isGeneratingSecond = false
+                        return
+                    }
+                    // 2) 用 material_ids 创建第二个盲盒
                     let params: [String: Any] = [
                         "box_type": "Second",
                         "material_ids": materialIds
                     ]
-        isGeneratingSecond = true
                     NetworkService.shared.postWithToken(
                         path: "/blind_box/generate",
                         parameters: params
@@ -451,6 +475,12 @@ struct MediaUploadView: View {
                             }
                         }
                     }
+                case .failure(let error):
+                    print("❌ 素材提交失败: \(error.localizedDescription)")
+                    isGeneratingSecond = false
+                }
+            }
+        }
     }
 }