Browse Source

changed the resend api

pull/1/head
ccr 6 years ago
parent
commit
4a0d9a8b33
  1. 11
      GMERemittance/Module/PennyTest/Application Logic/Service/PennyTestServiceType.swift
  2. 2
      GMERemittance/Module/PennyTest/User Interface/View/PennyTestViewController.swift
  3. 9
      GMERemittance/Module/PennyTestSubmit/User Interface/View/PennyTestSubmitViewController.swift

11
GMERemittance/Module/PennyTest/Application Logic/Service/PennyTestServiceType.swift

@ -14,13 +14,18 @@ protocol PennyTestServiceType: class {
}
protocol InitiatePennyTestService: ApiServiceType {
func initiate(userId: String, success: @escaping (SuccessMessage) -> (), failure: @escaping (Error) -> ())
func initiate(userId: String, isResendRequest: String?, success: @escaping (SuccessMessage) -> (), failure: @escaping (Error) -> ())
}
extension InitiatePennyTestService {
func initiate(userId: String, success: @escaping (SuccessMessage) -> (), failure: @escaping (Error) -> ()) {
func initiate(userId: String, isResendRequest: String?, success: @escaping (SuccessMessage) -> (), failure: @escaping (Error) -> ()) {
let url = baseUrl + "mobile/pennytest/start" + "/\(userId)"
auth.request(method: .post, url: url, params: nil, encoding: URLEncoding.default, success: { (response: SuccessMessageContainer) in
let params =
[
"reSendCode": isResendRequest ?? "N"
]
auth.request(method: .post, url: url, params: params, encoding: JSONEncoding.default, success: { (response: SuccessMessageContainer) in
if (response.errorCode ?? "") == "1" {
let error = NSError.init(domain: "Network", code: 0, userInfo: [NSLocalizedDescriptionKey : response.message ?? ""])

2
GMERemittance/Module/PennyTest/User Interface/View/PennyTestViewController.swift

@ -81,7 +81,7 @@ class PennyTestViewController: UIViewController {
let userId = Utility.getMyUserName()
self.showLoading()
self.initiate(userId: userId, success: { result in
self.initiate(userId: userId, isResendRequest: "N", success: { result in
self.hideLoading()
UserDefaults.standard.set(result.message, forKey: AppConstants.pennyTestServerMessage)
self.updatePennyTestRequestStatus()

9
GMERemittance/Module/PennyTestSubmit/User Interface/View/PennyTestSubmitViewController.swift

@ -44,8 +44,7 @@ class PennyTestSubmitViewController: UIViewController {
private func setup() {
// all setup should be done here
requestPennytestInfoDuringViewLoad()
let message = UserDefaults.standard.string(forKey: AppConstants.pennyTestServerMessage)
self.titleLabel.text = message
@ -87,7 +86,7 @@ class PennyTestSubmitViewController: UIViewController {
let userId = Utility.getMyUserName()
self.showLoading()
self.initiate(userId: userId, success: { result in
self.initiate(userId: userId, isResendRequest: "Y", success: { result in
self.hideLoading()
self.alertWithOk(message: result.message, title: "Success", okTitle: "Ok", style: UIAlertControllerStyle.alert, OkStyle: UIAlertActionStyle.default, okAction: nil)
self.updatePennyTestRequestStatus()
@ -100,11 +99,11 @@ class PennyTestSubmitViewController: UIViewController {
private func requestPennytestInfoDuringViewLoad() {
let message = UserDefaults.standard.string(forKey: AppConstants.pennyTestServerMessage)
if message != nil {return}
// if message != nil {return}
let userId = Utility.getMyUserName()
self.showLoading()
self.initiate(userId: userId, success: { result in
self.initiate(userId: userId, isResendRequest: "N", success: { result in
self.hideLoading()
self.titleLabel.text = result.message
UserDefaults.standard.set(result.message, forKey: AppConstants.pennyTestServerMessage)

Loading…
Cancel
Save