添加提交任务流程并抽取资料编辑页

suixinkan/UI/Profile/ProfileViewController.swift

@@ -3,7 +3,6 @@
 //  suixinkan
 //
 
-import PhotosUI
 import SnapKit
 import UIKit
 
@@ -12,7 +11,6 @@ final class ProfileViewController: BaseViewController {
 
     private let viewModel = ProfileViewModel()
     private let profileAPI = NetworkServices.shared.profileAPI
-    private let ossUploadService = NetworkServices.shared.ossUploadService
 
     private let scrollView = UIScrollView()
     private let contentStack = UIStackView()
@@ -35,7 +33,7 @@ final class ProfileViewController: BaseViewController {
     private let logoutButton = UIButton(type: .system)
 
     override func setupNavigationBar() {
-        title = "个人信息"
+        title = "我的"
     }
 
     override func setupUI() {
@@ -87,18 +85,18 @@ final class ProfileViewController: BaseViewController {
         withdrawalRow.addTarget(self, action: #selector(withdrawalTapped), for: .touchUpInside)
         realNameRow.addTarget(self, action: #selector(realNameTapped), for: .touchUpInside)
 
-        nicknameField.addTarget(self, action: #selector(nicknameChanged), for: .editingChanged)
-
-        let avatarTap = UITapGestureRecognizer(target: self, action: #selector(pickAvatar))
-        avatarImageView.isUserInteractionEnabled = true
-        avatarImageView.addGestureRecognizer(avatarTap)
-
         NotificationCenter.default.addObserver(
             self,
             selector: #selector(handleAccountDidSwitch),
             name: NotificationName.accountDidSwitch,
             object: nil
         )
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(handleProfileDidUpdate),
+            name: NotificationName.userProfileDidUpdate,
+            object: nil
+        )
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -191,19 +189,9 @@ final class ProfileViewController: BaseViewController {
     }
 
     private func applyViewModel() {
-        nicknameField.text = viewModel.isEditingProfile ? viewModel.editingNickname : viewModel.displayNickname
-        nicknameField.isEnabled = viewModel.isEditingProfile
+        nicknameField.text = viewModel.displayNickname
         uidLabel.text = "UID:\(viewModel.displayUID)"
-
-        if let pendingData = viewModel.pendingAvatarData, let image = UIImage(data: pendingData) {
-            avatarImageView.image = image
-        } else {
-            avatarImageView.loadRemoteImage(urlString: viewModel.displayAvatarURL)
-        }
-
-        editButton.setTitle(viewModel.isEditingProfile ? "完成" : "编辑", for: .normal)
-        editButton.isEnabled = !viewModel.isSaving
-        avatarImageView.alpha = viewModel.isEditingProfile ? 1 : 1
+        avatarImageView.loadRemoteImage(urlString: viewModel.displayAvatarURL)
 
         nameRow.configure(value: viewModel.displayRealName)
         accountRow.configure(
@@ -289,26 +277,17 @@ final class ProfileViewController: BaseViewController {
         Task { await reloadProfile(showGlobalLoading: true) }
     }
 
-    @objc private func nicknameChanged() {
-        viewModel.updateEditingNickname(nicknameField.text ?? "")
+    @objc private func handleProfileDidUpdate() {
+        viewModel.applyLocalProfileUpdate()
+        applyViewModel()
     }
 
     @objc private func editTapped() {
-        if viewModel.isEditingProfile {
-            Task { await saveProfile() }
-        } else {
-            viewModel.beginEditing()
-        }
-    }
-
-    @objc private func pickAvatar() {
-        guard viewModel.isEditingProfile else { return }
-        var configuration = PHPickerConfiguration(photoLibrary: .shared())
-        configuration.filter = .images
-        configuration.selectionLimit = 1
-        let picker = PHPickerViewController(configuration: configuration)
-        picker.delegate = self
-        present(picker, animated: true)
+        let editVC = ProfileEditViewController(
+            nickname: viewModel.displayNickname,
+            avatarURL: viewModel.displayAvatarURL
+        )
+        navigationController?.pushViewController(editVC, animated: true)
     }
 
     @objc private func accountSwitchTapped() {
@@ -382,26 +361,6 @@ final class ProfileViewController: BaseViewController {
         }
     }
 
-    private func saveProfile() async {
-        let scenicId = AppStore.shared.currentScenicId
-        guard scenicId > 0 else {
-            showToast("当前景区信息缺失")
-            return
-        }
-        showLoading()
-        defer { hideLoading() }
-        do {
-            try await viewModel.saveProfile(
-                api: profileAPI,
-                uploader: ossUploadService,
-                scenicId: scenicId
-            )
-            showToast("保存成功")
-        } catch {
-            showToast(error.localizedDescription)
-        }
-    }
-
     private func updatePassword(_ password: String) async {
         showLoading()
         defer { hideLoading() }
@@ -413,20 +372,3 @@ final class ProfileViewController: BaseViewController {
         }
     }
 }
-
-extension ProfileViewController: PHPickerViewControllerDelegate {
-    func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
-        picker.dismiss(animated: true)
-        guard let provider = results.first?.itemProvider, provider.canLoadObject(ofClass: UIImage.self) else { return }
-        provider.loadObject(ofClass: UIImage.self) { [weak self] object, _ in
-            guard let self, let image = object as? UIImage, let data = image.jpegData(compressionQuality: 0.9) else { return }
-            Task { @MainActor in
-                do {
-                    try self.viewModel.prepareAvatarImage(data: data)
-                } catch {
-                    self.showToast(error.localizedDescription)
-                }
-            }
-        }
-    }
-}