Skip to content

Commit

Permalink
Merge pull request #188 from 0inn/feature/#187
Browse files Browse the repository at this point in the history 
[Chore] #187 - 리뷰 편집 이미지 뜨게 수정
  • Loading branch information
@0inn
0inn authored Jul 21, 2022
2 parents 8b48dd3 + ffa5f33 commit d5e7a50
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 35 deletions.
6 changes: 2 additions & 4 deletions HealthFoodMe/HealthFoodMe/Presentation/Common/HelfmeLoading/View/HelfmeLoadingView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
11 changes: 5 additions & 6 deletions HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewTabScene/VC/ReviewDetailVC.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,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 {
Expand Down Expand Up @@ -188,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
Expand Down Expand Up @@ -219,8 +219,7 @@ extension ReviewDetailVC {
// 데이터를 서버에서 받아와야 함
requestReviewListWithAPI() {
self.requestBlogReviewListWithAPI()
self.processViewModel(self.reviewServerData, self.blogReviewData)
}
self.processViewModel(self.reviewServerData, self.blogReviewData) }
}

private func processViewModel(_ reviewDataList: [ReviewDataModel],
Expand Down Expand Up @@ -418,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)
}
Expand Down
71 changes: 46 additions & 25 deletions HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewWriteScene/VC/ReviewWriteVC.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down Expand Up @@ -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
}()

Expand Down Expand Up @@ -352,6 +353,7 @@ final class ReviewWriteVC: UIViewController, UIScrollViewDelegate {
override func viewDidLoad() {
super.viewDidLoad()
setDelegate()
setEditedUI()
setNavigation()
setLayout()
registerCell()
Expand All @@ -361,7 +363,6 @@ final class ReviewWriteVC: UIViewController, UIScrollViewDelegate {
}

override func viewWillAppear(_ animated: Bool) {
setEditedUI()
setKeyboardObserver()
}

Expand Down Expand Up @@ -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)")

}
}

Expand All @@ -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)
}

Expand Down Expand Up @@ -624,7 +635,6 @@ extension ReviewWriteVC {
}
setButtonUI(button: button)
}
print("🍎\(self.tasteSet)")
}

@objc private func didTapFeelingTag(_ sender: UIButton) {
Expand Down Expand Up @@ -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("로딩 종료")
}
}
}
}
}
Expand Down Expand Up @@ -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] = []
Expand Down Expand Up @@ -874,6 +894,7 @@ extension ReviewWriteVC {
dump(data)
if let data = data as? ReviewWriteEntity {
print(data, "성공")
completion()
}
self.dismiss(animated: true)
default:
Expand All @@ -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] = []
Expand Down Expand Up @@ -916,6 +936,7 @@ extension ReviewWriteVC {
dump(data)
if let data = data as? ReviewEditEntity {
print(data, "성공")
completion()
}
self.navigationController?.popViewController(animated: true)
default:
Expand Down

0 comments on commit d5e7a50

Please sign in to comment.