Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feat] #97 - 스파크 보내기 뷰 구현 및 사진인증 서버 연결 #105

Merged
merged 11 commits into from
Jan 18, 2022

Conversation

L-j-h-c
Copy link
Member

@L-j-h-c L-j-h-c commented Jan 18, 2022

🌴 PR 요약

🌱 작업한 브랜치

🌱 작업한 내용

  • 스파크 보내기 뷰 구현
  • 사진인증 서버 연결

📌 참고 사항

  • 사진인증의 경우 이전 뷰에서 roomID와 vcType을 정해주셔야 합니다!

📮 관련 이슈

사진 인증 서버연결 초기 세팅
# Conflicts:
#	Spark-iOS/Spark-iOS.xcodeproj/project.pbxproj
#	Spark-iOS/Spark-iOS/Source/NetworkServices/Room/RoomService.swift
인증사진 서버 연결 완료
스파크 보내기 뷰 UI및 레이아웃
스파크 보내기 뷰 버튼 선택기능 구현
코드로 대기방 확인 화면전환 방식 변경 및 사진인증 코드 수정
@L-j-h-c L-j-h-c added Feat 새로운 기능 구현 🧚‍♀️Devil『쥬노』 뀨의 의지 공식후계자입니다 아몰랑 labels Jan 18, 2022
@L-j-h-c L-j-h-c self-assigned this Jan 18, 2022
Copy link
Member

@yangsubinn yangsubinn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

우왕 최고네요! 룩굳투미!~!

Comment on lines 48 to 50
case .enterRoom, .authUpload:
return .post
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

따로 빼주세용~

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

임무완료.

@@ -21,6 +21,7 @@ class AuthUploadVC: UIViewController {
// MARK: - Properties

var vcType: VCCase = .albumTimer
var roomID: Int = -1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

옵셔널로 설정해주세용~

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

옵셔널 선배 소환 완료.

Comment on lines 338 to 347
case .requestErr(let message):
print(message)
print("requestErr")
case .pathErr:
print("pathErr")
case .serverErr:
print("serverErr")
case .networkFail:
print("networkFail")
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

print 문 없애주시공 각 에러 메시지 앞에 authUploadWithAPI 붙여주세여~ 헷갈립니당

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요것도 안헷갈리게 붙이기 완료.

sender.titleLabel?.backgroundColor = .sparkMostLightPinkred
sender.layer.borderColor = UIColor.sparkDarkPinkred.cgColor
selectedMessage = sender.titleLabel?.text ?? ""
print(selectedMessage)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

지워주세용

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이레이즈 완료.

Comment on lines 119 to 121
class MyButton: UIButton {
public var statusCV: Int?
public var statusCV: Int = -1
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

네이밍 다시 해주고 클래스로 따로 빼주세욥!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

네이밍 변경 선배 완료.

class SendSparkVC: UIViewController {

// MARK: Properties
var selectedIndex: Int = -1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요거 필요가 없어서 수정부탁들여여!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

지옥으로 보내버리기 완료.

switch status {
case 1:
[firstButton, secondButton, thirdButton, fourthButton].forEach {
if $0.statusCV != 1 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

satusCV 속성도 변경해주세요~

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

status로 변경 완료.

# Conflicts:
#	Spark-iOS/Spark-iOS.xcodeproj/project.pbxproj
#	Spark-iOS/Spark-iOS/Source/SceneDelegate.swift
Copy link
Member

@hyun99999 hyun99999 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍고생해써여 코리반영하고 어푸루브해주세여

switch response {
case .success(let data):
if let authUpload = data as? AuthUpload {
print(authUpload)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

지워주세요!

self.uploadButton.isEnabled = true
}
case .requestErr(let message):
print(message)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요거 requestErr 다음에 출력하게 하면 더 잘보일거에여

사진 데이터 png형식으로 변경
# Conflicts:
#	Spark-iOS/Spark-iOS.xcodeproj/project.pbxproj
#	Spark-iOS/Spark-iOS/Source/NetworkServices/Room/RoomService.swift
@L-j-h-c L-j-h-c merged commit 2494c28 into TeamSparker:develop Jan 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🧚‍♀️Devil『쥬노』 뀨의 의지 공식후계자입니다 아몰랑 Feat 새로운 기능 구현
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feat] 스파크 보내기 팝업 구현
3 participants