From 385b07cdd35694344fe13e148f4dc46065e108d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=98=81=EC=9D=B8?= <0inn1220@gmail.com> Date: Thu, 21 Jul 2022 18:54:37 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[Chore]=20#157=20-=20=EB=A1=9C=EB=94=A9?= =?UTF-8?q?=EB=B7=B0=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/HelfmeLoading/View/HelfmeLoadingView.swift | 6 ++---- .../Detail/ReviewTabScene/VC/ReviewDetailVC.swift | 8 ++++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Common/HelfmeLoading/View/HelfmeLoadingView.swift b/HealthFoodMe/HealthFoodMe/Presentation/Common/HelfmeLoading/View/HelfmeLoadingView.swift index 436c6c9a..6293ca56 100644 --- a/HealthFoodMe/HealthFoodMe/Presentation/Common/HelfmeLoading/View/HelfmeLoadingView.swift +++ b/HealthFoodMe/HealthFoodMe/Presentation/Common/HelfmeLoading/View/HelfmeLoadingView.swift @@ -62,10 +62,8 @@ extension HelfmeLoadingView { self.backgroundColor = UIColor(red: 0.0, green: 0.0, blue: 0.0, alpha: 0.4) } - func show() { - guard let window = UIApplication.shared.windows.last else { return } - print("윈도우", window) - window.addSubview(self) + func show(_ view: UIView) { + view.addSubview(self) self.snp.makeConstraints { $0.edges.equalToSuperview() diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewTabScene/VC/ReviewDetailVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewTabScene/VC/ReviewDetailVC.swift index a521f96c..a15f4ca3 100644 --- a/HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewTabScene/VC/ReviewDetailVC.swift +++ b/HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewTabScene/VC/ReviewDetailVC.swift @@ -30,8 +30,8 @@ class ReviewDetailVC: UIViewController { private var expendStateList: [Bool] = [] var moreContentsButtonRect: CGRect = CGRect(x: 0, y: 0, width: 0, height: 0) - var restaurantId = "" - var restaurantName = "" + var restaurantId: String = "62d26c9bd11146a81ef18ea6" + var restaurantName: String = "샐러디태릉입구" var selectedCustomSegment = 0 { didSet { @@ -66,6 +66,7 @@ class ReviewDetailVC: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) + HelfmeLoadingView.shared.show(self.view) fetchData() } } @@ -187,6 +188,9 @@ extension ReviewDetailVC { requestReviewListWithAPI() { self.requestBlogReviewListWithAPI() self.processViewModel(self.reviewServerData, self.blogReviewData) + HelfmeLoadingView.shared.hide(){ + print("로딩 종료") + } } } From 7e5963ea2d437a1f36a352421a77e716363d8ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=98=81=EC=9D=B8?= <0inn1220@gmail.com> Date: Fri, 22 Jul 2022 01:06:19 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[Chore]=20#157=20-=20=EB=A1=9C=EB=94=A9?= =?UTF-8?q?=EB=B7=B0=20=EA=B4=80=EB=A0=A8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Detail/ReviewTabScene/VC/ReviewDetailVC.swift | 11 +++-------- .../Presentation/Map/MainMapScene/VC/MainMapVC.swift | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewTabScene/VC/ReviewDetailVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewTabScene/VC/ReviewDetailVC.swift index 0716cd5d..0e52c743 100644 --- a/HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewTabScene/VC/ReviewDetailVC.swift +++ b/HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewTabScene/VC/ReviewDetailVC.swift @@ -69,7 +69,6 @@ class ReviewDetailVC: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - HelfmeLoadingView.shared.show(self.view) fetchData() } } @@ -189,7 +188,7 @@ extension ReviewDetailVC { controller.navigationController?.navigationBar.barTintColor = .black controller.navigationController?.navigationBar.tintColor = .black controller.navigationController?.navigationBar.setBackgroundImage(UIImage(), for: .default) - + controller.dismissOnPanGesture = true controller.slides = images controller.enableZoom = true @@ -220,11 +219,7 @@ extension ReviewDetailVC { // 데이터를 서버에서 받아와야 함 requestReviewListWithAPI() { self.requestBlogReviewListWithAPI() - self.processViewModel(self.reviewServerData, self.blogReviewData) - HelfmeLoadingView.shared.hide(){ - print("로딩 종료") - } - } + self.processViewModel(self.reviewServerData, self.blogReviewData) } } private func processViewModel(_ reviewDataList: [ReviewDataModel], @@ -422,7 +417,7 @@ extension ReviewDetailVC: UICollectionViewDataSource { func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { if selectedCustomSegment == 0 { - + } else if selectedCustomSegment == 1 { URLSchemeManager.shared.loadSafariApp(blogLink: blogReviewData[indexPath.row].blogURL) } diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift index 7c0f8351..d46ae237 100644 --- a/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift +++ b/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift @@ -159,7 +159,6 @@ class MainMapVC: UIViewController, NMFLocationManagerDelegate { registerCell() setPanGesture() setMapView() - bindMapView() sampleViewInputEvent() addObserver() self.bindViewModels() @@ -171,6 +170,7 @@ class MainMapVC: UIViewController, NMFLocationManagerDelegate { } override func viewDidAppear(_ animated: Bool) { + bindMapView() setIntitialMapPoint() } From ffa5f33e888faf4a882e6425b8c5ddbbc4715a2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=98=81=EC=9D=B8?= <0inn1220@gmail.com> Date: Fri, 22 Jul 2022 01:59:58 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[Chore]=20#187=20-=20=EB=A6=AC=EB=B7=B0=20?= =?UTF-8?q?=ED=8E=B8=EC=A7=91=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B0=8F=20?= =?UTF-8?q?=EB=A1=9C=EB=94=A9=20=EB=B7=B0=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReviewWriteScene/VC/ReviewWriteVC.swift | 71 ++++++++++++------- 1 file changed, 46 insertions(+), 25 deletions(-) diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewWriteScene/VC/ReviewWriteVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewWriteScene/VC/ReviewWriteVC.swift index e62fe01d..0bfb44a2 100644 --- a/HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewWriteScene/VC/ReviewWriteVC.swift +++ b/HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewWriteScene/VC/ReviewWriteVC.swift @@ -24,6 +24,7 @@ final class ReviewWriteVC: UIViewController, UIScrollViewDelegate { photoCollectionView.reloadData() } } + private var editPhotoModel: PhotoDataModel = PhotoDataModel() var userId = UserManager.shared.getUser?.id ?? "" var restaurantName : String = "" @@ -214,7 +215,7 @@ final class ReviewWriteVC: UIViewController, UIScrollViewDelegate { btn.layer.cornerRadius = 14 btn.tag = 2 btn.addTarget(self, action: #selector(didTapFeelingTag), for: .touchUpInside) - + return btn }() @@ -352,6 +353,7 @@ final class ReviewWriteVC: UIViewController, UIScrollViewDelegate { override func viewDidLoad() { super.viewDidLoad() setDelegate() + setEditedUI() setNavigation() setLayout() registerCell() @@ -361,7 +363,6 @@ final class ReviewWriteVC: UIViewController, UIScrollViewDelegate { } override func viewWillAppear(_ animated: Bool) { - setEditedUI() setKeyboardObserver() } @@ -415,10 +416,20 @@ extension ReviewWriteVC { tagStrong.isSelected = true setButtonUI(button: tagStrong) default: - print("🍎") + return + } + } + + for image in imageURLList { + let url = URL(string: image) + DispatchQueue.global().async { + let data = try? Data(contentsOf: url!) + DispatchQueue.main.async { + self.photoModel.userSelectedImages.append(UIImage(data: data!) ?? UIImage()) + } } } - print("🍎\(self.imageURLList)") + } } @@ -437,22 +448,22 @@ extension ReviewWriteVC { backButton.setImage(ImageLiterals.MainDetail.beforeIcon, for: .normal) backButton.tintColor = .helfmeBlack if isEdited { - backButton.addAction(UIAction(handler: { _ in - self.makeAlert(alertType: .logoutAlert, - title: "리뷰 편집을 취소하시겠습니까?", - subtitle: "편집 취소 시,\n 작성된 글은 저장되지 않습니다.") { - self.navigationController?.popViewController(animated: true) - } - }), for: .touchUpInside) - } else { - backButton.addAction(UIAction(handler: { _ in - self.makeAlert(alertType: .logoutAlert, - title: "리뷰작성을 취소하시겠습니까?", - subtitle: "작성취소 시,\n 수정된 글은 저장되지 않습니다.") { - self.navigationController?.dismiss(animated: true) - } - }), for: .touchUpInside) + backButton.addAction(UIAction(handler: { _ in + self.makeAlert(alertType: .logoutAlert, + title: "리뷰 편집을 취소하시겠습니까?", + subtitle: "편집 취소 시,\n 작성된 글은 저장되지 않습니다.") { + self.navigationController?.popViewController(animated: true) + } + }), for: .touchUpInside) + } else { + backButton.addAction(UIAction(handler: { _ in + self.makeAlert(alertType: .logoutAlert, + title: "리뷰작성을 취소하시겠습니까?", + subtitle: "작성취소 시,\n 수정된 글은 저장되지 않습니다.") { + self.navigationController?.dismiss(animated: true) } + }), for: .touchUpInside) + } self.navigationItem.leftBarButtonItem = UIBarButtonItem(customView: backButton) } @@ -624,7 +635,6 @@ extension ReviewWriteVC { } setButtonUI(button: button) } - print("🍎\(self.tasteSet)") } @objc private func didTapFeelingTag(_ sender: UIButton) { @@ -745,9 +755,19 @@ extension ReviewWriteVC { showReviewToast() } else { if isEdited { - requestReviewEdit() + HelfmeLoadingView.shared.show(self.view) + requestReviewEdit() { + HelfmeLoadingView.shared.hide(){ + print("로딩 종료") + } + } } else { - requestReviewWrite() + HelfmeLoadingView.shared.show(self.view) + requestReviewWrite() { + HelfmeLoadingView.shared.hide(){ + print("로딩 종료") + } + } } } } @@ -842,7 +862,7 @@ extension ReviewWriteVC { // MARK: - Network extension ReviewWriteVC { - func requestReviewWrite() { + func requestReviewWrite(completion: @escaping(() -> Void)) { let starScore = self.currentRate let taste = tasteSet var good : [String] = [] @@ -874,6 +894,7 @@ extension ReviewWriteVC { dump(data) if let data = data as? ReviewWriteEntity { print(data, "성공") + completion() } self.dismiss(animated: true) default: @@ -882,9 +903,8 @@ extension ReviewWriteVC { } } - func requestReviewEdit() { + func requestReviewEdit(completion: @escaping(() -> Void)) { let reviewId = self.reviewId - print("🍎\(reviewId)") let starScore = self.currentRate let taste = tasteSet var good : [String] = [] @@ -916,6 +936,7 @@ extension ReviewWriteVC { dump(data) if let data = data as? ReviewEditEntity { print(data, "성공") + completion() } self.navigationController?.popViewController(animated: true) default: