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

new changes

v0.17
stepie.ub 1 year ago
parent
1c9356bf43
commit
c54239db32
7 changed files with 60 additions and 61 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. 1
      GME Remit.xcodeproj/project.pbxproj
  2. 42
      GME Remit/APIs/RestApiManager.swift
  3. 52
      GME Remit/APIs/Router/APIRouter.swift
  4. 2
      GME Remit/AppDelegate.swift
  5. 6
      GME Remit/Modules/Home/User Interface/View/Home.storyboard
  6. 4
      GME Remit/Modules/ShowAPI/User Interface/View/ShowAPIViewController.swift
  7. 2
      GME Remit/Utilities/ExchangeRateCustomView.swift

1
GME Remit.xcodeproj/project.pbxproj
View File

@ -8966,7 +8966,6 @@
DEVELOPMENT_TEAM = 68KRG7GPAV;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = "";
"EXCLUDED_ARCHS[sdk=*]" = arm64;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",

42
GME Remit/APIs/RestApiManager.swift
View File

@ -65,20 +65,20 @@ class RestApiMananger {
let lang = Utility.getLanguageHeader(for: currentLanguage)
//live value
return ["Authorization": "Basic " + ("5220221D2E737FD60C28243:fUjXn2r5" +
":" + getUUID()).toBase64(),
"GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp",
"Content-Type": "application/json",
"lang" : lang
]
//uat value
// return ["Authorization": "Basic " + ("162021E171B825A55C52024823:cQeThWmZ:11i:" +
// getUUID()).toBase64(),
// "GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru",
// return ["Authorization": "Basic " + ("5220221D2E737FD60C28243:fUjXn2r5" +
// ":" + getUUID()).toBase64(),
// "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp",
// "Content-Type": "application/json",
// "lang" : lang
// ]
//uat value
return ["Authorization": "Basic " + ("162021E171B825A55C52024823:cQeThWmZ:11i:" +
getUUID()).toBase64(),
"GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru",
"Content-Type": "application/json",
"lang" : lang
]
}
func getContentHeaderAfterLogin() -> [String: String] {
@ -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
]
//uat value
// 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
// ]
//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
]
}
func request<T: Mappable>(

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

@ -142,60 +142,60 @@ extension APIRouter: ApiServiceType {
let lang = Utility.getLanguageHeader(for: currentLanguage)
// live value
let authValue = "5220221D2E737FD60C28243:fUjXn2r5:\(uuid)".toBase64()
// let authValue = "5220221D2E737FD60C28243:fUjXn2r5:\(uuid)".toBase64()
// // uat value
// let authValue = "162021E171B825A55C52024823:cQeThWmZ:11i;\(uuid)".toBase64()
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
// 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/AppDelegate.swift
View File

@ -22,7 +22,7 @@ import FirebaseCore
#if DEBUG
var server: Server = .live
#else
var server: Server = .live
var server: Server = .testLive
#endif
var destination: PushNotificationDestination?

6
GME Remit/Modules/Home/User Interface/View/Home.storyboard
View File

@ -44,8 +44,8 @@
<constraint firstAttribute="width" constant="32" id="jTI-YW-UaI"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="HI Rabin" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uZf-8n-nLc">
<rect key="frame" x="40" y="6" width="264" height="20"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uZf-8n-nLc">
<rect key="frame" x="40" y="16" width="264" height="0.0"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="20"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@ -288,7 +288,7 @@
<tabBarItem key="tabBarItem" title="Home" image="branch" id="If6-UM-LN6"/>
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="NbY-y6-481">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<nil name="viewControllers"/>

4
GME Remit/Modules/ShowAPI/User Interface/View/ShowAPIViewController.swift
View File

@ -62,10 +62,10 @@ extension ShowAPIViewController {
let utility = Utility.getMyKftcClientId()
//live value
let dic:Dictionary<String,String> = ["Authorization" : "Bearer + \(accessCode)" ,"GME-TOKEN": "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", "Content-Type": "application/json", "clientId": utility, "lang": lang]
// let dic:Dictionary<String,String> = ["Authorization" : "Bearer + \(accessCode)" ,"GME-TOKEN": "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", "Content-Type": "application/json", "clientId": utility, "lang": lang]
//uat value
// let dic:Dictionary<String,String> = ["Authorization" : "Bearer + \(accessCode)" ,"GME-TOKEN": "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru", "Content-Type": "application/json", "clientId": utility, "lang": lang]
let dic:Dictionary<String,String> = ["Authorization" : "Bearer + \(accessCode)" ,"GME-TOKEN": "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru", "Content-Type": "application/json", "clientId": utility, "lang": lang]
let observer = Observable.just(dic)

2
GME Remit/Utilities/ExchangeRateCustomView.swift
View File

@ -138,7 +138,7 @@ class ExchangeRateCustomView: UIView {
// nameIconHolder.spacing = 2
nameIconHolder.alignment = .center
rightStackView = UIStackView(arrangedSubviews: [flagImageView, nameIconHolder])
rightStackView.backgroundColor = .red
rightStackView.backgroundColor = .theme2E89FF
}
else {

Write Preview
Loading…
Cancel
Save