Browse Source

added message to defauts and retrieved

pull/1/head
ccr 6 years ago
parent
commit
1ebad1902d
  1. 9
      GMERemittance/Module/PennyTest/Application Logic/Service/PennyTestServiceType.swift
  2. 10
      GMERemittance/Module/PennyTest/User Interface/View/PennyTestViewController.swift
  3. 4
      GMERemittance/Module/PennyTestSubmit/User Interface/View/PennyTestSubmit.storyboard
  4. 5
      GMERemittance/Module/PennyTestSubmit/User Interface/View/PennyTestSubmitViewController.swift
  5. 1
      GMERemittance/Module/PennyTestSubmit/User Interface/Wireframe/PennyTestSubmitWireframe.swift
  6. 1
      GMERemittance/Utility/AppConstants.swift
  7. 2
      Pods/Pods.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

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

@ -14,14 +14,13 @@ protocol PennyTestServiceType: class {
}
protocol InitiatePennyTestService: ApiServiceType {
func initiate(params: [String: String], success: @escaping (SuccessMessage) -> (), failure: @escaping (Error) -> ())
func initiate(userId: String, success: @escaping (SuccessMessage) -> (), failure: @escaping (Error) -> ())
}
extension InitiatePennyTestService {
func initiate(params: [String: String], success: @escaping (SuccessMessage) -> (), failure: @escaping (Error) -> ()) {
let url = baseUrl + "mobile/pennytest/start"
auth.request(method: .post, url: url, params: params, encoding: JSONEncoding.default, success: { (response: SuccessMessageContainer) in
func initiate(userId: 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
if let model = response.data {
success(model)
}else {

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

@ -57,16 +57,12 @@ class PennyTestViewController: UIViewController {
}
private func proceed() {
let params =
[
"UserId" : Utility.getMyUserName(),
"IdNumber" : Utility.getMyIdNumber(),
]
let userId = Utility.getMyUserName()
self.showLoading()
self.initiate(params: params, success: { result in
print("success yeaaaah")
self.initiate(userId: userId, success: { result in
self.hideLoading()
UserDefaults.standard.set(result.message, forKey: AppConstants.pennyTestServerMessage)
let wireframe = PennyTestSubmitWireframe()
if let navigation = self.navigationController {
wireframe.pushMainView(in: navigation)

4
GMERemittance/Module/PennyTestSubmit/User Interface/View/PennyTestSubmit.storyboard

@ -30,7 +30,7 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="521.33333333333337"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your bank account verification is required in order to complete the registration. Do you want to verify it now?" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8QR-Wc-Fpw">
<rect key="frame" x="10" y="40" width="394" height="61"/>
<rect key="frame" x="20" y="40" width="384" height="61"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/>
<color key="textColor" red="0.29019607843137252" green="0.29019607843137252" blue="0.29019607843137252" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@ -99,7 +99,7 @@
<constraint firstItem="8QR-Wc-Fpw" firstAttribute="top" secondItem="YR1-Vv-hRj" secondAttribute="top" constant="40" id="T5l-Xt-BdH"/>
<constraint firstItem="qgg-86-qk0" firstAttribute="top" secondItem="8QR-Wc-Fpw" secondAttribute="bottom" constant="35" id="VCv-VI-QYK"/>
<constraint firstItem="XMM-cS-g9L" firstAttribute="centerX" secondItem="YR1-Vv-hRj" secondAttribute="centerX" id="WB9-Qt-FB9"/>
<constraint firstItem="8QR-Wc-Fpw" firstAttribute="leading" secondItem="YR1-Vv-hRj" secondAttribute="leading" constant="10" id="cSd-st-5Ok"/>
<constraint firstItem="8QR-Wc-Fpw" firstAttribute="leading" secondItem="YR1-Vv-hRj" secondAttribute="leading" constant="20" id="cSd-st-5Ok"/>
<constraint firstItem="qgg-86-qk0" firstAttribute="leading" secondItem="YR1-Vv-hRj" secondAttribute="leading" constant="8" id="cxG-wd-DZm"/>
<constraint firstAttribute="bottom" secondItem="XMM-cS-g9L" secondAttribute="bottom" constant="60" id="w8e-u4-Mf7"/>
</constraints>

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

@ -37,9 +37,8 @@ class PennyTestSubmitViewController: UIViewController {
private func setup() {
// all setup should be done here
let accountNumber = "123456"
let bankName = "Kwankhuchu Bank (BJ)"
self.titleLabel.text = "We have sent 1 KRW to your Bank Account \(accountNumber) with \(bankName), please check the amount and enter the deposit reference below."
let message = UserDefaults.standard.string(forKey: AppConstants.pennyTestServerMessage)
self.titleLabel.text = message
}
@IBAction func viewSample(_ sender: Any) {

1
GMERemittance/Module/PennyTestSubmit/User Interface/Wireframe/PennyTestSubmitWireframe.swift

@ -21,7 +21,6 @@ extension PennyTestSubmitWireframe: PennyTestSubmitWireframeInput {
let interactor = PennyTestSubmitInteractor(service: service)
let presenter = PennyTestSubmitPresenter()
let viewController = viewControllerFromStoryboard(of: PennyTestSubmitViewController.self)
viewController.presenter = presenter
interactor.output = presenter
presenter.interactor = interactor

1
GMERemittance/Utility/AppConstants.swift

@ -21,6 +21,7 @@ class AppConstants {
static let emergencyLogoutErrorCode = -1111
static let maxKoreanMobileNoLength = 11
static let MainWireFrameNotificationName = "MainViewControllerSelect"
static let pennyTestServerMessage = "pennyTestServerMessage"
}
enum Devices {

2
Pods/Pods.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -17,7 +17,7 @@
<key>AlamofireNetworkActivityLogger.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>8</integer>
<integer>9</integer>
</dict>
<key>BRYXBanner.xcscheme</key>
<dict>

Loading…
Cancel
Save