Skip to content

Commit

Permalink
[Update] 노란색 경고 14개로 줄이기
Browse files Browse the repository at this point in the history 
40여개 있던 노란색 경고를 14개로 줄였습니다.
print문에서 옵셔널 처리하지 않은 것들이 대부분이고, 사용하지 않는 변수를 언더바(_) 처리하는 등의 소소한 작업을 진행했습니다.

나머지 경고들은 스토리보드와 프로젝트 파일 자체에 대한 경고여서 일단, 냄겨둡니다.
  • Loading branch information
@blackturtle2
blackturtle2 committed Oct 6, 2017
1 parent 45e4930 commit 7f6d123
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 25 deletions.
6 changes: 3 additions & 3 deletions Project_SOS/Project_SOS/BY_CharacterChoiceViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ class BY_CharacterChoiceViewController: UIViewController {
//데이터베이스에서 해당 uid가 있는지 검색함
Database.database().reference().child(Constants.user).queryOrdered(byChild: Constants.user_userId).queryEqual(toValue: realUserUid).observeSingleEvent(of: .value, with: { (snapshot) in

guard let userData:[[String:String]] = snapshot.value as? [[String:String]] else {
print("유저가 없음 \(snapshot.value)")
guard let _:[[String:String]] = snapshot.value as? [[String:String]] else {
print("유저가 없음: ", snapshot.value ?? "(no data)")

//이건 Database에 child이름을 유저숫자에 맞게 짓고싶어서 카운트 받아오려고 만든부분
Database.database().reference().child(Constants.user).observe(.value, with: { (snapshot) in
Expand All @@ -144,7 +144,7 @@ class BY_CharacterChoiceViewController: UIViewController {
return
}

print("유저가 있음 \(snapshot.value)")
print("유저가 있음: ", snapshot.value ?? "(no data)")

}) { (error) in
print(error.localizedDescription)
Expand Down
31 changes: 17 additions & 14 deletions Project_SOS/Project_SOS/BY_DetailViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ class BY_DetailViewController: UIViewController {

override func viewWillLayoutSubviews() {
super.viewWillLayoutSubviews()
print("뷰윌레이아웃/ 퀘스천아이디 \(self.questionID)")
print("뷰윌레이아웃/ 퀘스천아이디: ", self.questionID ?? "(no data)")
if self.byAnswer.count == 0 || self.smAnswer.count == 0 || self.jsAnswer.count == 0 {
guard let realQuestionID:Int = self.questionID else {return print("QuestionID가 없습니다.")}
loadAnswer(from: realQuestionID)
Expand Down Expand Up @@ -181,9 +181,10 @@ class BY_DetailViewController: UIViewController {

@IBAction func characterSelectSegmentControlAction(_ sender: UISegmentedControl) {

self.characterSelectSegmentedControl.titleForSegment(at: 0) == "보영"
self.characterSelectSegmentedControl.titleForSegment(at: 1) == "선미"
self.characterSelectSegmentedControl.titleForSegment(at: 2) == "재성"
// 재성 - unused 되는 코드여서 주석 처리합니다.
// self.characterSelectSegmentedControl.titleForSegment(at: 0) == "보영"
// self.characterSelectSegmentedControl.titleForSegment(at: 1) == "선미"
// self.characterSelectSegmentedControl.titleForSegment(at: 2) == "재성"

switch self.characterSelectSegmentedControl.selectedSegmentIndex {
case 0:
Expand Down Expand Up @@ -302,7 +303,7 @@ class BY_DetailViewController: UIViewController {

//노티피케이션 구현 함수
func callNotiForCharacter(_ sender:Notification) {
guard let realSelectedCharacterName:String = sender.object as? String else {return print("선택한 캐릭터가 없습니다. \(sender.object)")}
guard let realSelectedCharacterName:String = sender.object as? String else {return print("선택한 캐릭터가 없습니다.", sender.object ?? "(no data)")}
self.selectSeugeForCharacter(nameOf: realSelectedCharacterName)
}

Expand All @@ -313,7 +314,7 @@ class BY_DetailViewController: UIViewController {
Database.database().reference().child(Constants.like).queryOrdered(byChild: Constants.like_User_Id).queryEqual(toValue: Auth.auth().currentUser?.uid).observeSingleEvent(of: .value, with: { (snapshot) in
guard let tempLikeDatas = snapshot.value as? [String:[String:Any]] else {
self.favoriteButtonOutlet.setImage(#imageLiteral(resourceName: "Like_off"), for: .normal)
return print("못불러옴 \(snapshot.value)")
return print("못불러옴: ", snapshot.value ?? "(no data)")
}

let filteredLikeData = tempLikeDatas.filter({ (dic:(key: String, value: [String : Any])) -> Bool in
Expand Down Expand Up @@ -342,7 +343,8 @@ class BY_DetailViewController: UIViewController {
Database.database().reference().child(Constants.like).queryOrdered(byChild: Constants.like_User_Id).queryEqual(toValue: Auth.auth().currentUser?.uid).observeSingleEvent(of: .value, with: { (snapshot) in

if snapshot.childrenCount != 0 {
guard let tempLikeDatas = snapshot.value as? [String:[String:Any]] else {return print("못불러옴 \(snapshot.value)")}
guard let tempLikeDatas = snapshot.value as? [String:[String:Any]] else {return print("못불러옴: ", snapshot.value ?? "(no data)")}
guard let realUid = Auth.auth().currentUser?.uid else { return }

let filteredLikeData = tempLikeDatas.filter({ (dic:(key: String, value: [String : Any])) -> Bool in
let questionNumber:Int = dic.value[Constants.like_QuestionId] as! Int
Expand All @@ -353,8 +355,7 @@ class BY_DetailViewController: UIViewController {
case 0:
self.favoriteButtonOutlet.setImage(#imageLiteral(resourceName: "Star_on"), for: .normal)
self.navigationViewFavoriteButtonOutlet.setImage(#imageLiteral(resourceName: "Star_on"), for: .normal)
Database.database().reference().child(Constants.like).childByAutoId().setValue([Constants.like_QuestionId:realQuestionID,
Constants.like_User_Id:Auth.auth().currentUser?.uid])
Database.database().reference().child(Constants.like).childByAutoId().setValue([Constants.like_QuestionId:realQuestionID,Constants.like_User_Id:realUid])
case 1:
self.favoriteButtonOutlet.setImage(#imageLiteral(resourceName: "Like_off"), for: .normal)
self.navigationViewFavoriteButtonOutlet.setImage(#imageLiteral(resourceName: "Like_off"), for: .normal)
Expand All @@ -365,8 +366,9 @@ class BY_DetailViewController: UIViewController {
}else{
self.favoriteButtonOutlet.setImage(#imageLiteral(resourceName: "Star_on"), for: .normal)
self.navigationViewFavoriteButtonOutlet.setImage(#imageLiteral(resourceName: "Star_on"), for: .normal)
Database.database().reference().child(Constants.like).childByAutoId().setValue([Constants.like_QuestionId:realQuestionID,
Constants.like_User_Id:Auth.auth().currentUser?.uid])

guard let realUid = Auth.auth().currentUser?.uid else { return }
Database.database().reference().child(Constants.like).childByAutoId().setValue([Constants.like_QuestionId:realQuestionID,Constants.like_User_Id:realUid])
}
}) { (error) in
print("좋아요 액션 에러", error.localizedDescription)
Expand Down Expand Up @@ -447,9 +449,10 @@ extension BY_DetailViewController: UITableViewDataSource {
cell.selectionStyle = .none

//선택된 세그에 따라 이미지 변경
self.characterSelectSegmentedControl.titleForSegment(at: 0) == "보영"
self.characterSelectSegmentedControl.titleForSegment(at: 1) == "선미"
self.characterSelectSegmentedControl.titleForSegment(at: 2) == "재성"
// 재성 - unused 되는 코드여서 주석 처리합니다.
// self.characterSelectSegmentedControl.titleForSegment(at: 0) == "보영"
// self.characterSelectSegmentedControl.titleForSegment(at: 1) == "선미"
// self.characterSelectSegmentedControl.titleForSegment(at: 2) == "재성"

switch self.characterSelectSegmentedControl.selectedSegmentIndex {

Expand Down
4 changes: 2 additions & 2 deletions Project_SOS/Project_SOS/BY_MainTableViewCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ class BY_MainTableViewCell: UITableViewCell {

func getQuestionIDForQuestion(title:String, completion:@escaping (_ info:Int) -> Void) {
Database.database().reference().child(Constants.question).observeSingleEvent(of: .value, with: { (snapshot) in
guard let tempQuestionDatas = snapshot.value as? [[String:Any]] else {return print("질문데이터가 없습니다. \(snapshot.value)")}
guard let tempQuestionDatas = snapshot.value as? [[String:Any]] else {return print("질문데이터가 없습니다.: ", snapshot.value ?? "(no data)")}

let tempSelectedQuestionData = tempQuestionDatas.filter({ (dic) -> Bool in
guard let selectedQuestionTitle = dic[Constants.question_QuestionTitle] as? String else {
print("질문타이틀이 없습니다. \(dic[Constants.question_QuestionTitle])")
print("질문타이틀이 없습니다.: ", dic[Constants.question_QuestionTitle] ?? "(no data)")
return false}

return selectedQuestionTitle == title
Expand Down
14 changes: 8 additions & 6 deletions Project_SOS/Project_SOS/SM_BubbleTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class SM_BubbleTableViewController: UIViewController, UITableViewDataSource, UIT
@IBOutlet weak var likeBtn: UIButton!

@IBAction func clickedLikeBtn(_ sender: UIButton) {
likeBtnAction()
likeBtnAction()
}

/*******************************************/
Expand All @@ -29,8 +29,8 @@ class SM_BubbleTableViewController: UIViewController, UITableViewDataSource, UIT

override func viewDidLoad() {
super.viewDidLoad()
//
// self.tableview.register(UINib(nibName: "BubbleTableViewCell", bundle: nil), forCellReuseIdentifier: "BubbleTableViewCell")
//
// self.tableview.register(UINib(nibName: "BubbleTableViewCell", bundle: nil), forCellReuseIdentifier: "BubbleTableViewCell")
tableview.delegate = self
tableview.dataSource = self

Expand Down Expand Up @@ -65,17 +65,19 @@ class SM_BubbleTableViewController: UIViewController, UITableViewDataSource, UIT
guard let realQuestionID:Int = self.questionID else { return }

Database.database().reference().child(Constants.like).queryOrdered(byChild: Constants.like_User_Id).queryEqual(toValue: Auth.auth().currentUser?.uid).observeSingleEvent(of: .value, with: { (snapshot) in

guard let likeData = snapshot.value as? [String:[String:Any]] else { return }
print("데이터가있슴니돠아아아아ㅏ==================:", likeData)
let filteredData = likeData.filter({ (dic:(key:String, value:[String:Any])) -> Bool in
var filteredQuestionID = dic.value[Constants.like_QuestionId]
let filteredQuestionID = dic.value[Constants.like_QuestionId]
return realQuestionID == filteredQuestionID as! Int
})

print("필터된데이터!!!!!!!!!!!!!!:", filteredData)
switch filteredData.count {
case 0 : Database.database().reference().child(Constants.like).childByAutoId().setValue([Constants.like_QuestionId:realQuestionID,Constants.like_User_Id:Auth.auth().currentUser?.uid])
case 0 :
guard let realUid = Auth.auth().currentUser?.uid else { return }
Database.database().reference().child(Constants.like).childByAutoId().setValue([Constants.like_QuestionId:realQuestionID,Constants.like_User_Id:realUid])
self.getLikeCount(question:realQuestionID)
DataCenter.standard.favoriteQuestions.append(realQuestionID)
print("좋아요리스트!!!!!!!!!!!!!!!!",DataCenter.standard.favoriteQuestions)
Expand Down

0 comments on commit 7f6d123

Please sign in to comment.