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.

Sign up for GitHub

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

Jump to bottom

[FIX] #275 - 빌드4로 변경 및 명함생성 시 TMI 들어가지 않는 로직 수정 #276

Merged
merged 1 commit into from
Dec 29, 2021
Merged

[FIX] #275 - 빌드4로 변경 및 명함생성 시 TMI 들어가지 않는 로직 수정 #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NADA-iOS-forRelease.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1369,7 +1369,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "NADA-iOS-forRelease/NADA-iOS-forRelease.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = T3VFJ764ZC;
INFOPLIST_FILE = "NADA-iOS-forRelease/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -1391,7 +1391,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "NADA-iOS-forRelease/NADA-iOS-forRelease.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = T3VFJ764ZC;
INFOPLIST_FILE = "NADA-iOS-forRelease/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
Expand Down
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/NetworkModel/Card/CardCreationRequest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ struct FrontCardDataModel: Codable {

struct BackCardDataModel: Codable {
let isMincho, isSoju, isBoomuk, isSauced: Bool
let firstTMI, secondTMI, thirdTMI: String
let oneTMI, twoTMI, threeTMI: String
}
12 changes: 6 additions & 6 deletions NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ extension CardService: TargetType {
multiPartData.append(MultipartFormData(provider: .data(isBoomukData), name: "card.isBoomuk"))
let isSaucedData = Bool(request.backCard.isSauced).description.data(using: .utf8) ?? Data()
multiPartData.append(MultipartFormData(provider: .data(isSaucedData), name: "card.isSauced"))
let firstTMI = request.backCard.firstTMI.data(using: .utf8) ?? Data()
multiPartData.append(MultipartFormData(provider: .data(firstTMI), name: "card.firstTMI"))
let secondTMI = request.backCard.secondTMI.data(using: .utf8) ?? Data()
multiPartData.append(MultipartFormData(provider: .data(secondTMI), name: "card.secondTMI"))
let thirdTMI = request.backCard.thirdTMI.data(using: .utf8) ?? Data()
multiPartData.append(MultipartFormData(provider: .data(thirdTMI), name: "card.thirdTMI"))
let oneTMI = request.backCard.oneTMI.data(using: .utf8) ?? Data()
multiPartData.append(MultipartFormData(provider: .data(oneTMI), name: "card.oneTmi"))
let twoTMI = request.backCard.twoTMI.data(using: .utf8) ?? Data()
multiPartData.append(MultipartFormData(provider: .data(twoTMI), name: "card.twoTmi"))
let threeTMI = request.backCard.threeTMI.data(using: .utf8) ?? Data()
multiPartData.append(MultipartFormData(provider: .data(threeTMI), name: "card.threeTmi"))

let imageData = MultipartFormData(provider: .data(image.pngData() ?? Data()), name: "image", fileName: "image", mimeType: "image/png")
multiPartData.append(imageData)
Expand Down
6 changes: 3 additions & 3 deletions ...S-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ extension CardCreationPreviewViewController {
backCardDataModel.isSoju,
backCardDataModel.isBoomuk,
backCardDataModel.isSauced,
backCardDataModel.firstTMI,
backCardDataModel.secondTMI,
backCardDataModel.thirdTMI,
backCardDataModel.oneTMI,
backCardDataModel.twoTMI,
backCardDataModel.threeTMI,
isShareable: isShareable)

cardView.addSubview(backCard)
Expand Down
6 changes: 3 additions & 3 deletions NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,9 +350,9 @@ extension CardCreationViewController: BackCardCreationDelegate {
isSoju: requiredInfo["isSoju"] ?? false,
isBoomuk: requiredInfo["isBoomuk"] ?? false,
isSauced: requiredInfo["isSauced"] ?? false,
firstTMI: optionalInfo["firstTMI"] ?? "",
secondTMI: optionalInfo["secondTMI"] ?? "",
thirdTMI: optionalInfo["thirdTMI"] ?? "")
oneTMI: optionalInfo["firstTMI"] ?? "",
twoTMI: optionalInfo["secondTMI"] ?? "",
threeTMI: optionalInfo["thirdTMI"] ?? "")
}
}

Expand Down