Skip to content

Commit 201dc63

Browse files
committed
[Fix] #63 - 2차 수정사항 반영 완료
1 parent b1821d6 commit 201dc63

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

Motivoo-iOS/Motivoo-iOS/Feature/Home/ViewControllers/HomeViewController.swift

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ final class HomeViewController: BaseViewController {
5454
didSet {
5555
if oldValue < tempUserStep {
5656
if !isStepCountCompleted {
57-
requestPatchHome()
57+
// requestPatchHome()
5858
}
5959

6060
DispatchQueue.main.async {
@@ -76,6 +76,7 @@ final class HomeViewController: BaseViewController {
7676
self.isMateStepCountCompleted = true
7777
}
7878

79+
// requestPatchHome()
7980
DispatchQueue.main.async {
8081
self.homeView.homeCircularProgressView.setParentProgress(currentStep: self.tempMateStep,
8182
finalStep: self.mateGoalStep,
@@ -105,6 +106,7 @@ final class HomeViewController: BaseViewController {
105106
StepCountManager.shared.startCheckStepCount()
106107
}
107108
configureStepCount()
109+
// requestPatchHome()
108110
}
109111

110112
override func viewWillAppear(_ animated: Bool) {
@@ -113,7 +115,7 @@ final class HomeViewController: BaseViewController {
113115
// TODO: - 권한 허용 안되어있으면 Alert 띄우기
114116

115117
// 네트워크 통신
116-
requestPatchHome()
118+
// requestPatchHome()
117119
requestPostMission()
118120
configureMissionTapGesture()
119121

@@ -163,6 +165,7 @@ final class HomeViewController: BaseViewController {
163165
homeView.configureMissionSelectedView(isSelected: !homeView.isMissionSelected)
164166
homeView.pickMissionLabel.text = firstMissionData.missionContent
165167
homeView.dateLabel.text = "오늘의 운동"
168+
requestPostMission()
166169
}
167170
}
168171

@@ -173,6 +176,7 @@ final class HomeViewController: BaseViewController {
173176
requestPostMissionChoice(param: HomeChoiceMissionRequest(missionID: secondMissionData.missionID))
174177
homeView.pickMissionLabel.text = secondMissionData.missionContent
175178
homeView.dateLabel.text = "오늘의 운동"
179+
requestPostMission()
176180
}
177181
}
178182

@@ -238,6 +242,7 @@ final class HomeViewController: BaseViewController {
238242
print("\(newData.user)\n")
239243
self?.tempUserStep = newData.user
240244
self?.tempMateStep = newData.mate
245+
self?.requestPatchHome()
241246
}
242247
}
243248

@@ -328,6 +333,15 @@ extension HomeViewController {
328333
self.homeView.configureCheckButtonStyle(state: .checkCompleted)
329334
}
330335

336+
DispatchQueue.main.async {
337+
self.homeView.homeCircularProgressView.setMyProgress(currentStep: self.tempUserStep,
338+
finalStep: self.goalStep ,
339+
withAnimation: true)
340+
341+
// self.homeView.homeCircularProgressView.setParentProgress(currentStep: self.tempMateStep,
342+
// finalStep: self.mateGoalStep,
343+
// withAnimation: true)
344+
}
331345
/// 목표 걸음 수 너무 높아서 따로 넣어서 사용 중
332346
// self.goalStep = 700
333347
// self.mateGoalStep = 1000
@@ -367,7 +381,7 @@ extension HomeViewController {
367381
HomeAPI.shared.postMissionChoice(param: param) { result in
368382
guard let result = self.validateResult(result) as? BlankDataResponse else { return }
369383

370-
self.requestPatchHome()
384+
// self.requestPatchHome()
371385
}
372386
}
373387
}

Motivoo-iOS/Motivoo-iOS/Feature/Home/Views/Main/HomeStepCountView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ final class HomeStepCountView: BaseView {
5050

5151
myWalkLabel.do {
5252
$0.font = .caption1
53-
$0.textColor = .gray600
53+
$0.textColor = .gray700
5454
$0.text = TextLiterals.Home.Main.myWalk
5555
}
5656

0 commit comments

Comments
 (0)