캔 내역, 캔 충전 페이지 추가
This commit is contained in:
40
SodaLive/Sources/MyPage/Can/Charge/CanChargeRequest.swift
Normal file
40
SodaLive/Sources/MyPage/Can/Charge/CanChargeRequest.swift
Normal file
@@ -0,0 +1,40 @@
|
||||
//
|
||||
// CanChargeRequest.swift
|
||||
// SodaLive
|
||||
//
|
||||
// Created by klaus on 2023/08/11.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
struct CanChargeRequest: Encodable {
|
||||
let title: String
|
||||
let chargeCan: Int
|
||||
let paymentGateway: PaymentGateway
|
||||
let price: Double
|
||||
let locale: String
|
||||
}
|
||||
|
||||
struct PgChargeRequest: Encodable {
|
||||
let canId: Int
|
||||
let paymentGateway: PaymentGateway
|
||||
}
|
||||
|
||||
struct CanChargeResponse: Decodable {
|
||||
let chargeId: Int
|
||||
}
|
||||
|
||||
struct CanVerifyRequest: Encodable {
|
||||
let receiptString: String
|
||||
let chargeId: Int
|
||||
}
|
||||
|
||||
struct PgVerifyRequest: Encodable {
|
||||
let receiptId: String
|
||||
let orderId: String
|
||||
|
||||
enum CodingKeys : String, CodingKey {
|
||||
case receiptId = "receipt_id"
|
||||
case orderId = "order_id"
|
||||
}
|
||||
}
|
221
SodaLive/Sources/MyPage/Can/Charge/CanChargeView.swift
Normal file
221
SodaLive/Sources/MyPage/Can/Charge/CanChargeView.swift
Normal file
@@ -0,0 +1,221 @@
|
||||
//
|
||||
// CanChargeView.swift
|
||||
// SodaLive
|
||||
//
|
||||
// Created by klaus on 2023/08/11.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
import StoreKit
|
||||
|
||||
enum CanChargeCurrentTab: String {
|
||||
case iap, pg
|
||||
}
|
||||
|
||||
struct CanChargeView: View {
|
||||
|
||||
@StateObject var storeManager = StoreManager()
|
||||
@StateObject var viewModel = CanChargeViewModel()
|
||||
|
||||
@State var currentTab: CanChargeCurrentTab = .iap
|
||||
|
||||
let refresh: () -> Void
|
||||
let afterCompletionToGoBack: Bool
|
||||
|
||||
var body: some View {
|
||||
BaseView(isLoading: $storeManager.isLoading) {
|
||||
VStack(spacing: 13.3) {
|
||||
DetailNavigationBar(title: "충전하기")
|
||||
|
||||
if UserDefaults.bool(forKey: .auth) {
|
||||
CanChargeTabView(currentTab: $currentTab)
|
||||
}
|
||||
|
||||
if UserDefaults.bool(forKey: .auth) && currentTab == .pg {
|
||||
ScrollView(.vertical, showsIndicators: false) {
|
||||
VStack(spacing: 13.3) {
|
||||
ForEach(viewModel.cans, id: \.self) { item in
|
||||
CanPgItemView(item: item)
|
||||
.onTapGesture {
|
||||
AppState.shared.setAppStep(
|
||||
step: .canPgPayment(canResponse: item, refresh: refresh, afterCompletionToGoBack: afterCompletionToGoBack)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
.onAppear {
|
||||
viewModel.getCans()
|
||||
}
|
||||
}
|
||||
} else {
|
||||
ScrollView(.vertical, showsIndicators: false) {
|
||||
VStack(spacing: 13.3) {
|
||||
ForEach(storeManager.products, id: \.self) { item in
|
||||
CanItemView(item: item)
|
||||
.onTapGesture {
|
||||
AppState.shared.setAppStep(
|
||||
step: .canPayment(canProduct: item, refresh: refresh, afterCompletionToGoBack: afterCompletionToGoBack)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
.onAppear {
|
||||
storeManager.getProducts()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.popup(isPresented: $storeManager.isShowPopup, type: .toast, position: .top, autohideIn: 1) {
|
||||
GeometryReader { geo in
|
||||
HStack {
|
||||
Spacer()
|
||||
Text(storeManager.errorMessage)
|
||||
.padding(.vertical, 13.3)
|
||||
.padding(.horizontal, 6.7)
|
||||
.frame(width: geo.size.width - 66.7, alignment: .center)
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.background(Color(hex: "9970ff"))
|
||||
.foregroundColor(Color.white)
|
||||
.multilineTextAlignment(.leading)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
.cornerRadius(20)
|
||||
.padding(.top, 66.7)
|
||||
Spacer()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct CanItemView: View {
|
||||
|
||||
let item: SKProduct
|
||||
|
||||
var body: some View {
|
||||
HStack(spacing: 0) {
|
||||
Text(item.localizedTitle)
|
||||
.font(.custom(Font.bold.rawValue, size: 15.3))
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Spacer()
|
||||
|
||||
Text("\(NumberFormatter.localizedString(from: item.price, number: .currency))")
|
||||
.font(.custom(Font.bold.rawValue, size: 15.3))
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
}
|
||||
.padding(.horizontal, 13.3)
|
||||
.padding(.vertical, 23.3)
|
||||
.background(Color(hex: "111111"))
|
||||
.cornerRadius(16.7)
|
||||
.padding(.horizontal, 13.3)
|
||||
.frame(width: screenSize().width)
|
||||
}
|
||||
}
|
||||
|
||||
struct CanPgItemView: View {
|
||||
let item: GetCanResponse
|
||||
|
||||
var body: some View {
|
||||
HStack(spacing: 0) {
|
||||
Text(item.title)
|
||||
.font(.custom(Font.bold.rawValue, size: 15.3))
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Spacer()
|
||||
|
||||
Text("\(item.price) 원")
|
||||
.font(.custom(Font.bold.rawValue, size: 15.3))
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
}
|
||||
.padding(.horizontal, 13.3)
|
||||
.padding(.vertical, 23.3)
|
||||
.background(Color(hex: "111111"))
|
||||
.cornerRadius(16.7)
|
||||
.padding(.horizontal, 13.3)
|
||||
.frame(width: screenSize().width)
|
||||
}
|
||||
}
|
||||
|
||||
struct CanChargeTabView: View {
|
||||
|
||||
@Binding var currentTab: CanChargeCurrentTab
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
HStack(spacing: 0) {
|
||||
let tabWidth = screenSize().width / 2
|
||||
|
||||
CanChargeTab(
|
||||
title: "인 앱 결제",
|
||||
action: {
|
||||
if currentTab != .iap {
|
||||
currentTab = .iap
|
||||
}
|
||||
},
|
||||
color: {
|
||||
currentTab == .iap ?
|
||||
Color(hex: "eeeeee") :
|
||||
Color(hex: "777777")
|
||||
},
|
||||
width: tabWidth,
|
||||
isShowDivider: { currentTab == .iap }
|
||||
)
|
||||
|
||||
CanChargeTab(
|
||||
title: "PG",
|
||||
action: {
|
||||
if currentTab != .pg {
|
||||
currentTab = .pg
|
||||
}
|
||||
},
|
||||
color: {
|
||||
currentTab == .pg ?
|
||||
Color(hex: "eeeeee") :
|
||||
Color(hex: "777777")
|
||||
},
|
||||
width: tabWidth,
|
||||
isShowDivider: { currentTab == .pg }
|
||||
)
|
||||
}
|
||||
|
||||
Rectangle()
|
||||
.frame(width: screenSize().width, height: 1)
|
||||
.foregroundColor(Color(hex: "909090").opacity(0.5))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct CanChargeTab: View {
|
||||
let title: String
|
||||
let action: () -> Void
|
||||
let color: () -> Color
|
||||
let width: CGFloat
|
||||
let isShowDivider: () -> Bool
|
||||
|
||||
var body: some View {
|
||||
Button(action: action) {
|
||||
VStack(spacing: 0) {
|
||||
Spacer()
|
||||
|
||||
Text(title)
|
||||
.font(.custom(Font.medium.rawValue, size: 16.7))
|
||||
.foregroundColor(color())
|
||||
.frame(width: width)
|
||||
|
||||
Spacer()
|
||||
|
||||
Rectangle()
|
||||
.frame(width: width, height: 3)
|
||||
.foregroundColor(Color(hex: "9970ff").opacity(isShowDivider() ? 1 : 0))
|
||||
}
|
||||
.frame(height: 50)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct CanChargeView_Previews: PreviewProvider {
|
||||
static var previews: some View {
|
||||
CanChargeView(refresh: {}, afterCompletionToGoBack: false)
|
||||
}
|
||||
}
|
58
SodaLive/Sources/MyPage/Can/Charge/CanChargeViewModel.swift
Normal file
58
SodaLive/Sources/MyPage/Can/Charge/CanChargeViewModel.swift
Normal file
@@ -0,0 +1,58 @@
|
||||
//
|
||||
// CanChargeViewModel.swift
|
||||
// SodaLive
|
||||
//
|
||||
// Created by klaus on 2023/08/11.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Combine
|
||||
|
||||
final class CanChargeViewModel: ObservableObject {
|
||||
|
||||
private let repository = CanRepository()
|
||||
private var subscription = Set<AnyCancellable>()
|
||||
|
||||
@Published var cans = [GetCanResponse]()
|
||||
@Published var errorMessage = ""
|
||||
@Published var isShowPopup = false
|
||||
@Published var isLoading = false
|
||||
|
||||
func getCans() {
|
||||
isLoading = true
|
||||
repository.getCans()
|
||||
.sink { result in
|
||||
switch result {
|
||||
case .finished:
|
||||
DEBUG_LOG("finish")
|
||||
case .failure(let error):
|
||||
ERROR_LOG(error.localizedDescription)
|
||||
}
|
||||
} receiveValue: { [unowned self] response in
|
||||
self.isLoading = false
|
||||
let responseData = response.data
|
||||
|
||||
do {
|
||||
let jsonDecoder = JSONDecoder()
|
||||
let decoded = try jsonDecoder.decode(ApiResponse<[GetCanResponse]>.self, from: responseData)
|
||||
|
||||
if let data = decoded.data, decoded.success {
|
||||
self.cans.removeAll()
|
||||
self.cans.append(contentsOf: data)
|
||||
} else {
|
||||
if let message = decoded.message {
|
||||
self.errorMessage = message
|
||||
} else {
|
||||
self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
|
||||
}
|
||||
|
||||
self.isShowPopup = true
|
||||
}
|
||||
} catch {
|
||||
self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
|
||||
self.isShowPopup = true
|
||||
}
|
||||
}
|
||||
.store(in: &subscription)
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user