Skip to content

Commit 79e496f

Browse files
author
ehowlsla
committed
object c support
1 parent 6ff8f1f commit 79e496f

File tree

5 files changed

+50
-47
lines changed

5 files changed

+50
-47
lines changed

Example/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ use_frameworks!
22

33

44
target 'SwiftyBootpay_Example' do
5-
pod 'SwiftyBootpay', :path => '../'
5+
pod 'SwiftyBootpay', :path => '../'
66

77
end

SwiftyBootpay.podspec

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,15 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'SwiftyBootpay'
11-
s.version = '2.1.1'
11+
s.version = '2.1.12'
1212
s.summary = 'PG Plugin For Swift'
1313

1414
# This description is used to generate tags and improve search results.
1515
# * Think: What does it do? Why did you write it? What is the focus?
1616
# * Try to keep it short, snappy and to the point.
1717
# * Write the description between the DESC delimiters below.
1818
# * Finally, don't worry about the indent, CocoaPods strips it!
19-
20-
s.description = <<-DESC
21-
TODO: Add long description of the pod here.
22-
DESC
19+
2320

2421
s.homepage = 'https://github.com/bootpay/SwiftyBootpay'
2522
# s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'

SwiftyBootpay/Classes/BootpayAnalytics.swift

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ class BootpayDefault {
5959
}
6060

6161
//MARK: Bootpay Models
62-
public class BootpayUser: Params {
63-
public init() {}
62+
public class BootpayUser: NSObject, Params {
63+
public override init() {}
6464
var user_id = ""
6565

6666
public var id = ""
@@ -72,16 +72,18 @@ public class BootpayUser: Params {
7272
public var area = ""
7373
}
7474

75-
public class BootpayAnalytics {
76-
public init() {
75+
76+
public class BootpayAnalytics: NSObject {
77+
public override init() {
78+
super.init()
7779
self.key = getRandomKey(32)
7880
self.iv = getRandomKey(16)
7981
}
8082

8183
public static let sharedInstance = BootpayAnalytics()
8284
var application_id = ""
8385
public var uuid = ""
84-
let ver = "2.1.1"
86+
let ver = "2.1.12"
8587
var sk = ""
8688
var sk_time = 0 // session 유지시간 기본 30분
8789
var last_time = 0 // 접속 종료 시간
@@ -92,8 +94,8 @@ public class BootpayAnalytics {
9294
var iv = ""
9395
}
9496

95-
public class BootpayStatItem: Codable, Params {
96-
public init() {}
97+
public class BootpayStatItem: NSObject, Codable, Params {
98+
public override init() {}
9799

98100
public var item_name = ""
99101
public var item_img = ""
@@ -208,12 +210,14 @@ extension BootpayAnalytics {
208210

209211
//MARK: Bootpay LifeCycle Fpr Analytics
210212
extension BootpayAnalytics {
213+
@objc(appLaunch:)
211214
open func appLaunch(application_id: String) {
212215
HTTPCookieStorage.shared.cookieAcceptPolicy = HTTPCookie.AcceptPolicy.always
213216
self.application_id = application_id
214217
BootpayDefault.setValue("application_id", value: self.application_id)
215218
}
216219

220+
@objc(sessionActive:)
217221
open func sessionActive(active: Bool) {
218222
if active == true {
219223
loadSessionValues()
@@ -261,7 +265,7 @@ extension BootpayAnalytics {
261265
} catch {}
262266
}
263267

264-
open func postLogin() {
268+
@objc public func postLogin() {
265269
if(BootpayAnalytics.sharedInstance.user.id == "") {
266270
NSLog("Bootpay Analytics Warning: postLogin() not Work!! Please check id is not empty")
267271
return
@@ -274,11 +278,11 @@ extension BootpayAnalytics {
274278
area: BootpayAnalytics.sharedInstance.user.area)
275279
}
276280

277-
open func start(_ url: String, _ page_type: String) {
281+
@objc public func start(_ url: String, _ page_type: String) {
278282
start(url, page_type, items: [])
279283
}
280284

281-
open func start(_ url: String, _ page_type: String, items: [BootpayStatItem]) {
285+
@objc public func start(_ url: String, _ page_type: String, items: [BootpayStatItem]) {
282286
let uri = "https://analytics.bootpay.co.kr/call"
283287
var params: [String: Any]
284288

@@ -316,7 +320,7 @@ extension BootpayAnalytics {
316320
}
317321
}
318322

319-
open func post(url: String, params: [String: Any], isLogin: Bool) {
323+
@objc public func post(url: String, params: [String: Any], isLogin: Bool) {
320324
let session = URLSession.shared
321325
let request = NSMutableURLRequest(url: NSURL(string: url)! as URL)
322326
request.httpMethod = "POST"

SwiftyBootpay/Classes/BootpayController.swift

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ extension Params where Self: AnyObject {
6060
}
6161

6262
//MARK: Bootpay Models
63-
public class BootpayItem: Params {
64-
public init() {}
65-
public var item_name = ""
66-
public var qty: Int = 0
67-
public var unique = ""
68-
public var price = Double(0)
69-
public var cat1 = ""
70-
public var cat2 = ""
71-
public var cat3 = ""
63+
public class BootpayItem: NSObject, Params {
64+
public override init() {}
65+
@objc public var item_name = ""
66+
@objc public var qty: Int = 0
67+
@objc public var unique = ""
68+
@objc public var price = Double(0)
69+
@objc public var cat1 = ""
70+
@objc public var cat2 = ""
71+
@objc public var cat3 = ""
7272

7373
func toString() -> String {
7474
if item_name.isEmpty { return "" }
@@ -91,48 +91,50 @@ public class BootpayItem: Params {
9191
}
9292

9393
public class BootpayController: UIViewController {
94-
public var price = Double(0)
95-
public var application_id = BootpayAnalytics.sharedInstance.getApplicationId()
96-
public var name = ""
97-
public var pg = ""
98-
public var phone = ""
99-
public var show_agree_window = 0
100-
public var items = [BootpayItem]()
101-
public var method = ""
102-
public var user_info: [String: String] = [:]
103-
public var params: [String: String] = [:]
104-
public var order_id = ""
105-
public var use_order_id = 0
106-
public var expire_month = 12 // 정기결제 실행 기간
107-
public var vbank_result = 1 // 가상계좌 결과창 안보이게 하기
108-
public var account_expire_at = "" // 가상계좌 입금 만료 기한
109-
public var quotas = [0,2,3,4,5,6,7,8,9,10,11,12] // 할부 개월 수
94+
@objc public var price = Double(0)
95+
@objc public var application_id = BootpayAnalytics.sharedInstance.getApplicationId()
96+
@objc public var name = ""
97+
@objc public var pg = ""
98+
@objc public var phone = ""
99+
@objc public var show_agree_window = 0
100+
@objc public var items = [BootpayItem]()
101+
@objc public var method = ""
102+
@objc public var user_info: [String: String] = [:]
103+
@objc public var params: [String: String] = [:]
104+
@objc public var order_id = ""
105+
@objc public var use_order_id = 0
106+
@objc public var expire_month = 12 // 정기결제 실행 기간
107+
@objc public var vbank_result = 1 // 가상계좌 결과창 안보이게 하기
108+
@objc public var account_expire_at = "" // 가상계좌 입금 만료 기한
109+
@objc public var quotas = [0,2,3,4,5,6,7,8,9,10,11,12] // 할부 개월 수
110110
var isPaying = false
111-
public var sendable: BootpayRequestProtocol?
111+
@objc public var sendable: BootpayRequestProtocol?
112112

113113
internal var wv: BootpayWebView!
114114
}
115115

116116

117117
extension BootpayController: Params {
118+
@objc(addItem:)
118119
public func addItem(item: BootpayItem) {
119120
self.items.append(item)
120121
}
121122

123+
@objc(setBootpayItems:)
122124
public func setItems(items: [BootpayItem]) {
123125
self.items = items
124126
}
125127

126-
public func transactionConfirm(data: [String: Any]) {
128+
@objc public func transactionConfirm(data: [String: Any]) {
127129
let json = dicToJsonString(data).replace(target: "'", withString: "\\'")
128130
wv.doJavascript("window.BootPay.transactionConfirm(\(json));")
129131
}
130132

131-
public func removePaymentWindow() {
133+
@objc public func removePaymentWindow() {
132134
wv.doJavascript("window.BootPay.removePaymentWindow();")
133135
}
134136

135-
public func dismiss() {
137+
@objc public func dismiss() {
136138
self.dismiss(animated: true, completion: nil)
137139
}
138140

SwiftyBootpay/Classes/BootpayWebView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import UIKit
1010
import WebKit
1111
//import CryptoSwift
1212

13-
public protocol BootpayRequestProtocol {
13+
@objc public protocol BootpayRequestProtocol {
1414
func onError(data: [String: Any])
1515
func onReady(data: [String: Any])
1616
func onClose()

0 commit comments

Comments
 (0)