Skip to content

Commit

Permalink
[FIX] 업로드 프로세스 에러 수정 (#140)
Browse files Browse the repository at this point in the history
  • Loading branch information
@cirtuare
cirtuare authored Feb 1, 2025
2 parents 3c4f22f + f2a32d6 commit ffbcf6f
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 192 deletions.
36 changes: 2 additions & 34 deletions ACON-iOS/ACON-iOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@
741E689A2D3D43FF00DF99EF /* EmptyResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741E68992D3D43FA00DF99EF /* EmptyResponse.swift */; };
741E68A02D3D5BD400DF99EF /* TargetType+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741E689F2D3D5BCE00DF99EF /* TargetType+.swift */; };
741E68A22D3D5FA200DF99EF /* ACService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741E68A12D3D5F9700DF99EF /* ACService.swift */; };
741E68A62D3D61FA00DF99EF /* TestTargetType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741E68A52D3D61F000DF99EF /* TestTargetType.swift */; };
741E68A82D3D620700DF99EF /* TestService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741E68A72D3D620300DF99EF /* TestService.swift */; };
741E68AA2D3D625E00DF99EF /* TestResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741E68A92D3D625A00DF99EF /* TestResponse.swift */; };
741E68AC2D3D6DA800DF99EF /* HeaderType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741E68AB2D3D6DA400DF99EF /* HeaderType.swift */; };
74205D2F2D40351700D11557 /* SocialType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74205D2E2D40351400D11557 /* SocialType.swift */; };
74220DD42D34363B000684BF /* SpotUploadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74220DD32D343633000684BF /* SpotUploadViewController.swift */; };
Expand Down Expand Up @@ -127,7 +124,6 @@
748D6F8F2D2BD340007690B4 /* UIButton+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 748D6F8E2D2BD33D007690B4 /* UIButton+.swift */; };
748D6F912D2BD450007690B4 /* UILabel+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 748D6F902D2BD44C007690B4 /* UILabel+.swift */; };
748D6F952D2BD4DB007690B4 /* UICollectionViewCell+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 748D6F942D2BD4D6007690B4 /* UICollectionViewCell+.swift */; };
748D6F972D2BD544007690B4 /* DummyType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 748D6F962D2BD53F007690B4 /* DummyType.swift */; };
748D6F992D2BD54E007690B4 /* DummyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 748D6F982D2BD549007690B4 /* DummyProtocol.swift */; };
748D6F9B2D2BD638007690B4 /* Pretendard-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 748D6F9A2D2BD638007690B4 /* Pretendard-Bold.otf */; };
748D6F9D2D2BD641007690B4 /* Pretendard-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 748D6F9C2D2BD641007690B4 /* Pretendard-SemiBold.otf */; };
Expand Down Expand Up @@ -246,9 +242,6 @@
741E68992D3D43FA00DF99EF /* EmptyResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyResponse.swift; sourceTree = "<group>"; };
741E689F2D3D5BCE00DF99EF /* TargetType+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TargetType+.swift"; sourceTree = "<group>"; };
741E68A12D3D5F9700DF99EF /* ACService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ACService.swift; sourceTree = "<group>"; };
741E68A52D3D61F000DF99EF /* TestTargetType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestTargetType.swift; sourceTree = "<group>"; };
741E68A72D3D620300DF99EF /* TestService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestService.swift; sourceTree = "<group>"; };
741E68A92D3D625A00DF99EF /* TestResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestResponse.swift; sourceTree = "<group>"; };
741E68AB2D3D6DA400DF99EF /* HeaderType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderType.swift; sourceTree = "<group>"; };
74205D2E2D40351400D11557 /* SocialType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialType.swift; sourceTree = "<group>"; };
74220DD32D343633000684BF /* SpotUploadViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpotUploadViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -310,7 +303,6 @@
748D6F8E2D2BD33D007690B4 /* UIButton+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+.swift"; sourceTree = "<group>"; };
748D6F902D2BD44C007690B4 /* UILabel+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+.swift"; sourceTree = "<group>"; };
748D6F942D2BD4D6007690B4 /* UICollectionViewCell+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UICollectionViewCell+.swift"; sourceTree = "<group>"; };
748D6F962D2BD53F007690B4 /* DummyType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DummyType.swift; sourceTree = "<group>"; };
748D6F982D2BD549007690B4 /* DummyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DummyProtocol.swift; sourceTree = "<group>"; };
748D6F9A2D2BD638007690B4 /* Pretendard-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Bold.otf"; sourceTree = "<group>"; };
748D6F9C2D2BD641007690B4 /* Pretendard-SemiBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-SemiBold.otf"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -596,24 +588,6 @@
path = Pods;
sourceTree = "<group>";
};
741E68A32D3D616200DF99EF /* Test */ = {
isa = PBXGroup;
children = (
741E68A42D3D617400DF99EF /* DTO */,
741E68A72D3D620300DF99EF /* TestService.swift */,
741E68A52D3D61F000DF99EF /* TestTargetType.swift */,
);
path = Test;
sourceTree = "<group>";
};
741E68A42D3D617400DF99EF /* DTO */ = {
isa = PBXGroup;
children = (
741E68A92D3D625A00DF99EF /* TestResponse.swift */,
);
path = DTO;
sourceTree = "<group>";
};
74220DD12D34361E000684BF /* Upload */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -857,7 +831,6 @@
746F15B42D3E2041003EA031 /* LocalVerification */,
746261602D3E9F6000A4E84F /* Upload */,
D6AF15612D3E8A3700289683 /* Onboarding */,
741E68A32D3D616200DF99EF /* Test */,
743069872D3D2EDA0033178C /* Base */,
15CD25752D3FE2D800320006 /* SpotList */,
);
Expand Down Expand Up @@ -959,7 +932,6 @@
746261702D3EA50700A4E84F /* SpotCategoryType.swift */,
741E68AB2D3D6DA400DF99EF /* HeaderType.swift */,
74CDCE532D310A1100E3A21A /* ACFontStyleType.swift */,
748D6F962D2BD53F007690B4 /* DummyType.swift */,
);
path = Enums;
sourceTree = "<group>";
Expand Down Expand Up @@ -1440,7 +1412,6 @@
1547A8852D3595B600E96616 /* SpotListFilterModel.swift in Sources */,
748D6F8B2D2BD31B007690B4 /* UIStackView+.swift in Sources */,
748D6F912D2BD450007690B4 /* UILabel+.swift in Sources */,
741E68AA2D3D625E00DF99EF /* TestResponse.swift in Sources */,
746261772D3EA88700A4E84F /* GetAcornCountResponse.swift in Sources */,
D61917E92D3E4410001BF0EE /* OnboardingTargetType.swift in Sources */,
742544062D413CCD004F950F /* SpotListCollectionViewFooter.swift in Sources */,
Expand All @@ -1449,7 +1420,6 @@
748ECA6B2D31918D00BBC981 /* LoginView.swift in Sources */,
D6EA38152D42B88F002B68B9 /* SearchEmptyView.swift in Sources */,
1547A6F22D33AD4500E96616 /* SpotModel.swift in Sources */,
748D6F972D2BD544007690B4 /* DummyType.swift in Sources */,
746261732D3EA78700A4E84F /* GetReiviewVerificationRequest.swift in Sources */,
74BF92022D385D8700B923E3 /* MenuCollectionViewCell.swift in Sources */,
74220DD42D34363B000684BF /* SpotUploadViewController.swift in Sources */,
Expand All @@ -1462,7 +1432,6 @@
745C7E042D3599DF0074DBDB /* SpotSearchViewController.swift in Sources */,
74B25C2C2D2FEE8E008BDCB7 /* Config.swift in Sources */,
74054ECA2D32534200D1CDE4 /* MultitaskDelegate.swift in Sources */,
741E68A62D3D61FA00DF99EF /* TestTargetType.swift in Sources */,
748D6F8F2D2BD340007690B4 /* UIButton+.swift in Sources */,
746261792D3EA8DF00A4E84F /* UploadTargetType.swift in Sources */,
741A07572D3558FE00778219 /* ReviewFinishedView.swift in Sources */,
Expand Down Expand Up @@ -1542,7 +1511,6 @@
745C7E152D35AEC10074DBDB /* SpotSearchViewModel.swift in Sources */,
D6E452932D3AA47500CBED02 /* ProfileView.swift in Sources */,
D6E452942D3AA47500CBED02 /* ProfileViewController.swift in Sources */,
741E68A82D3D620700DF99EF /* TestService.swift in Sources */,
748D6F6B2D2BCA1C007690B4 /* ViewController.swift in Sources */,
15A3F6A82D36D5B900577E16 /* FilterTagButtonStackLineType.swift in Sources */,
);
Expand Down Expand Up @@ -1572,7 +1540,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = KX5Q77JSUF;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -1609,7 +1577,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = KX5Q77JSUF;
GENERATE_INFOPLIST_FILE = YES;
Expand Down
2 changes: 1 addition & 1 deletion ACON-iOS/ACON-iOS/Global/Utils/ACLocationManager.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class ACLocationManager: NSObject {
}

func checkUserDeviceLocationServiceAuthorization() {
// Execute on background thread to prevent UI blocking
// NOTE: - Execute on background thread to prevent UI blocking ??
DispatchQueue.global().async { [weak self] in
guard CLLocationManager.locationServicesEnabled() else {
DispatchQueue.main.async {
Expand Down
7 changes: 0 additions & 7 deletions ACON-iOS/ACON-iOS/Global/Utils/Enums/DummyType.swift
View file

This file was deleted.

2 changes: 0 additions & 2 deletions ACON-iOS/ACON-iOS/Network/Base/ACService.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ final class ACService {

private init() {}

lazy var testService: TestService = TestService()

lazy var authService: AuthService = AuthService()

lazy var spotDetailService: SpotDetailService = SpotDetailService()
Expand Down
27 changes: 0 additions & 27 deletions ACON-iOS/ACON-iOS/Network/Test/DTO/TestResponse.swift
View file

This file was deleted.

34 changes: 0 additions & 34 deletions ACON-iOS/ACON-iOS/Network/Test/TestService.swift
View file

This file was deleted.

63 changes: 0 additions & 63 deletions ACON-iOS/ACON-iOS/Network/Test/TestTargetType.swift
View file

This file was deleted.

1 change: 1 addition & 0 deletions ACON-iOS/ACON-iOS/Presentation/SpotDetail/View/SpotDetailView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ final class SpotDetailView: BaseView {
addressLabel.snp.makeConstraints {
$0.top.equalToSuperview().inset(ScreenUtils.heightRatio*342 + navViewHeight)
$0.leading.equalToSuperview().inset(ScreenUtils.widthRatio*38)
$0.trailing.equalToSuperview().inset(ScreenUtils.widthRatio*20)
$0.height.equalTo(18)
}

Expand Down
45 changes: 21 additions & 24 deletions ACON-iOS/ACON-iOS/Presentation/Upload/View/SpotSearchViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class SpotSearchViewController: BaseViewController {
override func setHierarchy() {
super.setHierarchy()

self.view.addSubviews(spotSearchView,emptyStateView)
self.view.addSubviews(spotSearchView, emptyStateView)
}

override func setLayout() {
Expand All @@ -107,7 +107,6 @@ class SpotSearchViewController: BaseViewController {
emptyStateView.do {
$0.isHidden = true
}

}

func addTarget() {
Expand All @@ -133,11 +132,13 @@ private extension SpotSearchViewController {
spotSearchViewModel.getSearchSuggestion()
spotSearchView.searchSuggestionStackView.isHidden = false
spotSearchView.searchKeywordCollectionView.isHidden = true
emptyStateView.isHidden = true
}

@objc
func searchTextFieldDidChange(_ textField: UITextField) {
if let text = textField.text {
emptyStateView.isHidden = text == ""
spotSearchView.searchSuggestionStackView.isHidden = text != ""
spotSearchView.searchKeywordCollectionView.isHidden = text == ""
}
Expand Down Expand Up @@ -166,16 +167,31 @@ private extension SpotSearchViewController {

DispatchQueue.main.async {
if data.count == 0 {
// TODO: - 엠티뷰 처리
self?.emptyStateView.isHidden = self?.spotSearchView.searchTextField.text == ""
self?.spotSearchView.searchKeywordCollectionView.isHidden = true
self?.emptyStateView.isHidden = false
self?.spotSearchView.searchKeywordCollectionView.reloadData()
} else {
self?.emptyStateView.isHidden = true
self?.spotSearchView.searchKeywordCollectionView.isHidden = false
self?.spotSearchView.searchKeywordCollectionView.reloadData()
}
}
}

self.spotSearchViewModel.onSuccessGetReviewVerification.bind { [weak self] onSuccess in
guard let onSuccess, let data = self?.spotSearchViewModel.reviewVerification.value else { return }
if onSuccess {
if data {
self?.hasCompletedSelection = true
self?.dismiss(animated: true)
} else {
let alertHandler = AlertHandler()
alertHandler.showLocationAccessFailImageAlert(from: self!)
}
self?.spotSearchViewModel.reviewVerification.value = nil
}
}

}

}
Expand All @@ -200,10 +216,7 @@ private extension SpotSearchViewController {
guard let spotName = sender.currentAttributedTitle?.string else { return }
selectedSpotId = sender.spotID
selectedSpotName = spotName
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
self?.hasCompletedSelection = true
self?.dismiss(animated: true)
}
spotSearchViewModel.getReviewVerification(spotId: selectedSpotId)
}

}
Expand Down Expand Up @@ -244,22 +257,6 @@ extension SpotSearchViewController: UICollectionViewDelegateFlowLayout {
spotSearchView.searchTextField.text = selectedSpotName
self.dismissKeyboard()
spotSearchViewModel.getReviewVerification(spotId: selectedSpotId)
self.spotSearchViewModel.onSuccessGetReviewVerification.bind { [weak self] onSuccess in
guard let onSuccess, let data = self?.spotSearchViewModel.reviewVerification.value else { return }
if onSuccess {
if data {
self?.hasCompletedSelection = true
self?.dismiss(animated: true)
} else {
let alertHandler = AlertHandler()
alertHandler.showLocationAccessFailImageAlert(from: self!)
}
self?.spotSearchViewModel.reviewVerification.value = nil
}
}
// self.dismissKeyboard()
// hasCompletedSelection = true
// dismiss(animated: true)
}

}
Expand Down

0 comments on commit ffbcf6f

Please sign in to comment.