Skip to content

Commit

Permalink
[Feat] 기록 작성시 홈화면으로 이동 (TeamRecorDream#64)
Browse files Browse the repository at this point in the history
  • Loading branch information
513sojin committed Jul 22, 2022
1 parent 0da0775 commit 62b2580
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ enum CreateRecordConst {
static var dreamColorNum: Int?
static var isTouchedIndex: [Int] = []
static var genreIndex: [Int] = []

static var recordId: String?
}

class RecordViewController: BaseViewController {
Expand Down Expand Up @@ -172,6 +172,16 @@ class RecordViewController: BaseViewController {
var emotionSelectedArray = [false, false, false, false, false, false]
// var reviseRecordInfo = [] // 서버에서 받아올 값. 모델이랑 매칭해주어야 함
var recordDetailData: RecordDetailModel?
var detailRecordId: String? {
didSet {
DispatchQueue.main.async {
self.navigationDetailView(id: self.detailRecordId ?? "")
}
}
}

var recordIdClosure: ((String) -> ())?


// MARK: - life cycle
override func viewDidLoad() {
Expand Down Expand Up @@ -199,6 +209,12 @@ class RecordViewController: BaseViewController {
headerView.setHeaderView(HiddenMoreBtn: true, headerLabelText: "기록하기")
}

private func navigationDetailView(id: String) {
let detailVC = RecordDetailViewController()
navigationController?.pushViewController(detailVC, animated: true)
detailVC.recordID = id
}

private func setEditView() {
print("----------------------")
print(recordDetailData)
Expand Down Expand Up @@ -345,6 +361,9 @@ class RecordViewController: BaseViewController {
// print("isCreateView: \(isCreateView)")
// isCreateView ? postRecord(record: record) : putRecord(record: recordPut, id: id)
postRecord(record: record)
//
let tabVC = TabBarController()
navigationController?.pushViewController(tabVC, animated: true)
} else {
// MARK: - 저장 불가능 상태
UIView.animate(withDuration: 1.25, delay: 0.01, options: .curveEaseIn, animations: {
Expand Down Expand Up @@ -666,10 +685,13 @@ extension RecordViewController {
// }
//
func postRecord(record: CreateRecord) {
createManager.postRequest(record: record, completionHandler: { [weak self] data in
createManager.postRequest(record: record, completionHandler: { [self] data in
guard let data = data as? DreamBaseModel else { return }
print("postRecord")
print(data)
// guard let data = data.data?.id as? DataClass else { return }
guard let recordDataId = data.data?.id as? String else { return }
CreateRecordConst.recordId = data.data?.id
// print("postRecord: \(CreateRecordConst.recordId)")
// recordIdClosure?(CreateRecordConst.recordId ?? "")
})
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class RecordDetailViewController: BaseViewController {
private var recordDate = ""
var recordID: String? //TODO: - 화면 전환 시 기록 고유 번호 할당해주기
var recordDetailData: RecordDetailModel?
// var completionHandler: ((String) -> ())?

override func viewDidLoad() {
super.viewDidLoad()
Expand Down Expand Up @@ -137,6 +138,8 @@ extension RecordDetailViewController {
guard let recordDetail = recordDetail as? RecordDetailModel else { return }
self.recordDetailData = recordDetail

// self.completionHandler?(CreateRecordConst.recordId ?? "")

self.emotion = recordDetail.emotion
self.dreamColor = recordDetail.dream_color
self.genres = recordDetail.genre
Expand Down

0 comments on commit 62b2580

Please sign in to comment.