IME-LONDON
/
LONDON-IOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

issue fixed

v0.17
stepie.ub 1 year ago
parent
29c7957568
commit
d8ec2df617
5 changed files with 52 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      GME Remit.xcodeproj/project.pbxproj
  2. 28
      GME Remit/APIs/RestApiManager.swift
  3. 58
      GME Remit/APIs/Router/APIRouter.swift
  4. 2
      GME Remit/APIs/UrlManager.swift
  5. 5
      GME Remit/Modules/AppUpdate/User Interface/View/AppUpdateViewController.swift

4
GME Remit.xcodeproj/project.pbxproj
View File

@ -8936,7 +8936,7 @@
"$(inherited)",
"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
);
MARKETING_VERSION = 1.6.0;
MARKETING_VERSION = 1.7.0;
ONLY_ACTIVE_ARCH = YES;
"OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der";
OTHER_LDFLAGS = (
@ -8985,7 +8985,7 @@
"$(inherited)",
"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
);
MARKETING_VERSION = 1.6.0;
MARKETING_VERSION = 1.7.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",

28
GME Remit/APIs/RestApiManager.swift
View File

@ -88,22 +88,22 @@ class RestApiMananger {
let lang = Utility.getLanguageHeader(for: currentLanguage)
//live value
// return [
// "Authorization": "Bearer " + accessCode,
// "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp",
// "Content-Type": "application/json",
// "clientId": Utility.getMyKftcClientId(),
// "lang" : lang
// ]
return [
"Authorization": "Bearer " + accessCode,
"GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp",
"Content-Type": "application/json",
"clientId": Utility.getMyKftcClientId(),
"lang" : lang
]
//uat value
return [
"Authorization": "Bearer " + accessCode,
"GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru",
"Content-Type": "application/json",
"clientId": Utility.getMyKftcClientId(),
"lang" : lang
]
// return [
// "Authorization": "Bearer " + accessCode,
// "GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru",
// "Content-Type": "application/json",
// "clientId": Utility.getMyKftcClientId(),
// "lang" : lang
// ]
}
func request<T: Mappable>(

58
GME Remit/APIs/Router/APIRouter.swift
View File

@ -141,61 +141,61 @@ extension APIRouter: ApiServiceType {
let currentLanguage = Localize.currentLanguage()
let lang = Utility.getLanguageHeader(for: currentLanguage)
//live value
// let authValue = "5220221D2E737FD60C28243:fUjXn2r5:\(uuid)".toBase64()
// live value
let authValue = "5220221D2E737FD60C28243:fUjXn2r5:\(uuid)".toBase64()
// uat value
let authValue = "162021E171B825A55C52024823:cQeThWmZ:11i;\(uuid)".toBase64()
//live value
// return [
// "Authorization": "Basic \(authValue)",
// "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp",
// "Content-Type": "application/json",
// "lang" : lang,
// "uuid" : self.uuid
// ]
// uat value
// // uat value
// let authValue = "162021E171B825A55C52024823:cQeThWmZ:11i;\(uuid)".toBase64()
// live value
return [
"Authorization": "Basic \(authValue)",
"GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru",
"GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp",
"Content-Type": "application/json",
"lang" : lang,
"uuid" : self.uuid
]
}
private var afterLoginHeader: [String: String] {
let accessCode = GMEDB.shared.user.string(.accessCode) ?? ""
let currentLanguage = Localize.currentLanguage()
let lang = Utility.getLanguageHeader(for: currentLanguage)
//live token
// uat value
// return [
// "Authorization": "Bearer " + accessCode,
// "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp",
// "Authorization": "Basic \(authValue)",
// "GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru",
// "Content-Type": "application/json",
// "clientId": Utility.getMyKftcClientId(),
// "lang" : lang,
// "uuid" : self.uuid
// ]
}
private var afterLoginHeader: [String: String] {
let accessCode = GMEDB.shared.user.string(.accessCode) ?? ""
let currentLanguage = Localize.currentLanguage()
let lang = Utility.getLanguageHeader(for: currentLanguage)
//live token
//uat token
return [
"Authorization": "Bearer " + accessCode,
"GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru",
"GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp",
"Content-Type": "application/json",
"clientId": Utility.getMyKftcClientId(),
"lang" : lang,
"uuid" : self.uuid
]
//uat token
// return [
// "Authorization": "Bearer " + accessCode,
// "GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru",
// "Content-Type": "application/json",
// "clientId": Utility.getMyKftcClientId(),
// "lang" : lang,
// "uuid" : self.uuid
// ]
}
func json(

2
GME Remit/APIs/UrlManager.swift
View File

@ -17,7 +17,7 @@ class UrlManager {
let baseSocialURL = ""
let liveServerUrl = "https://sandboxapi.japanremit.com:8083/api/" // "https://mobile.japanremit.com:8443/api/"
let liveServerUrl = "https://mobile.japanremit.com:8443/api/" // "https://mobile.japanremit.com:8443/api/"
let testUrl = "https://sandboxapi.japanremit.com:8083/api/" //"http://202.166.220.36:8083/api/"
init() {

5
GME Remit/Modules/AppUpdate/User Interface/View/AppUpdateViewController.swift
View File

@ -37,6 +37,7 @@ class AppUpdateViewController: UIViewController {
// MARK: IBActions
@IBAction func dismiss(_ sender: Any) {
self.dismiss()
}
@ -45,6 +46,9 @@ class AppUpdateViewController: UIViewController {
}
@IBAction func backButtonPressed(_ sender: Any) {
if (Utility.isCriticalUpdate()) {
return
}
self.dismiss(animated: true, completion: nil)
}
// MARK: Other Functions
@ -52,6 +56,7 @@ class AppUpdateViewController: UIViewController {
private func setup() {
let shouldHideDismiss = Utility.isCriticalUpdate()
self.notNowButton.isHidden = shouldHideDismiss
configureUpdateButton()
configureText()
}

Write Preview
Loading…
Cancel
Save