Browse Source

add channelIO Error cases

pull/1/head
InKwon James Kim 5 years ago
parent
commit
74e7088a76
  1. 0
      GMERemittance/Assets.xcassets/james/Contents.json
  2. 0
      GMERemittance/Assets.xcassets/james/addAccount.imageset/Contents.json
  3. 0
      GMERemittance/Assets.xcassets/james/addAccount.imageset/addAccount.png
  4. 0
      GMERemittance/Assets.xcassets/james/addAccount10.imageset/Contents.json
  5. 0
      GMERemittance/Assets.xcassets/james/addAccount10.imageset/addAccount10.png
  6. 0
      GMERemittance/Assets.xcassets/james/addAccount2.imageset/Contents.json
  7. 0
      GMERemittance/Assets.xcassets/james/addAccount2.imageset/addAccount2.png
  8. 0
      GMERemittance/Assets.xcassets/james/addAccount3.imageset/Contents.json
  9. 0
      GMERemittance/Assets.xcassets/james/addAccount3.imageset/addAccount3.png
  10. 0
      GMERemittance/Assets.xcassets/james/addAccount4.imageset/Contents.json
  11. 0
      GMERemittance/Assets.xcassets/james/addAccount4.imageset/addAccount4.png
  12. 0
      GMERemittance/Assets.xcassets/james/addAccount5.imageset/Contents.json
  13. 0
      GMERemittance/Assets.xcassets/james/addAccount5.imageset/addAccount5.png
  14. 0
      GMERemittance/Assets.xcassets/james/addAccount6.imageset/Contents.json
  15. 0
      GMERemittance/Assets.xcassets/james/addAccount6.imageset/addAccount6.png
  16. 0
      GMERemittance/Assets.xcassets/james/addAccount7.imageset/Contents.json
  17. 0
      GMERemittance/Assets.xcassets/james/addAccount7.imageset/addAccount7.png
  18. 0
      GMERemittance/Assets.xcassets/james/addAccount8.imageset/Contents.json
  19. 0
      GMERemittance/Assets.xcassets/james/addAccount8.imageset/addAccount8.png
  20. 0
      GMERemittance/Assets.xcassets/james/addAccount9.imageset/Contents.json
  21. 0
      GMERemittance/Assets.xcassets/james/addAccount9.imageset/addAccount9.png
  22. BIN
      GMERemittance/Assets.xcassets/james/chat.imageset/206461-48.png
  23. BIN
      GMERemittance/Assets.xcassets/james/chat.imageset/206461-64.png
  24. 23
      GMERemittance/Assets.xcassets/james/chat.imageset/Contents.json
  25. BIN
      GMERemittance/Assets.xcassets/james/chat.imageset/chat.png
  26. 21
      GMERemittance/Assets.xcassets/james/chatIcon.imageset/Contents.json
  27. BIN
      GMERemittance/Assets.xcassets/james/chatIcon.imageset/chatIcon.png
  28. 0
      GMERemittance/Assets.xcassets/james/ic_auto_debit_renew.imageset/Contents.json
  29. 0
      GMERemittance/Assets.xcassets/james/ic_auto_debit_renew.imageset/ic_auto_debit_renew.png
  30. 0
      GMERemittance/Assets.xcassets/james/renewal.imageset/Contents.json
  31. 0
      GMERemittance/Assets.xcassets/james/renewal.imageset/renewal.png
  32. 0
      GMERemittance/Assets.xcassets/james/warning_voice_fishing.imageset/Contents.json
  33. 0
      GMERemittance/Assets.xcassets/james/warning_voice_fishing.imageset/warning_voice_fishing.jpg
  34. 37
      GMERemittance/Module/Home/User Interface/View/HomeViewController.swift
  35. 3
      bn.lproj/Localizable.strings
  36. 4
      en.lproj/Localizable.strings
  37. 3
      id.lproj/Localizable.strings
  38. 3
      km.lproj/Localizable.strings
  39. 3
      ko.lproj/Localizable.strings
  40. 3
      mn.lproj/Localizable.strings
  41. 3
      my-MM.lproj/Localizable.strings
  42. 3
      my.lproj/Localizable.strings
  43. 2
      ne.lproj/Localizable.strings
  44. 3
      ru-RU.lproj/Localizable.strings
  45. 3
      si.lproj/Localizable.strings
  46. 3
      th.lproj/Localizable.strings
  47. 3
      uz.lproj/Localizable.strings
  48. 3
      vi-VN.lproj/Localizable.strings

0
GMERemittance/Assets.xcassets/addAccount/Contents.json → GMERemittance/Assets.xcassets/james/Contents.json

0
GMERemittance/Assets.xcassets/addAccount/addAccount.imageset/Contents.json → GMERemittance/Assets.xcassets/james/addAccount.imageset/Contents.json

0
GMERemittance/Assets.xcassets/addAccount/addAccount.imageset/addAccount.png → GMERemittance/Assets.xcassets/james/addAccount.imageset/addAccount.png

Before

Width: 48  |  Height: 48  |  Size: 1.2 KiB

After

Width: 48  |  Height: 48  |  Size: 1.2 KiB

0
GMERemittance/Assets.xcassets/addAccount/addAccount10.imageset/Contents.json → GMERemittance/Assets.xcassets/james/addAccount10.imageset/Contents.json

0
GMERemittance/Assets.xcassets/addAccount/addAccount10.imageset/addAccount10.png → GMERemittance/Assets.xcassets/james/addAccount10.imageset/addAccount10.png

Before

Width: 48  |  Height: 48  |  Size: 1.4 KiB

After

Width: 48  |  Height: 48  |  Size: 1.4 KiB

0
GMERemittance/Assets.xcassets/addAccount/addAccount2.imageset/Contents.json → GMERemittance/Assets.xcassets/james/addAccount2.imageset/Contents.json

0
GMERemittance/Assets.xcassets/addAccount/addAccount2.imageset/addAccount2.png → GMERemittance/Assets.xcassets/james/addAccount2.imageset/addAccount2.png

Before

Width: 48  |  Height: 48  |  Size: 343 B

After

Width: 48  |  Height: 48  |  Size: 343 B

0
GMERemittance/Assets.xcassets/addAccount/addAccount3.imageset/Contents.json → GMERemittance/Assets.xcassets/james/addAccount3.imageset/Contents.json

0
GMERemittance/Assets.xcassets/addAccount/addAccount3.imageset/addAccount3.png → GMERemittance/Assets.xcassets/james/addAccount3.imageset/addAccount3.png

Before

Width: 48  |  Height: 48  |  Size: 1.0 KiB

After

Width: 48  |  Height: 48  |  Size: 1.0 KiB

0
GMERemittance/Assets.xcassets/addAccount/addAccount4.imageset/Contents.json → GMERemittance/Assets.xcassets/james/addAccount4.imageset/Contents.json

0
GMERemittance/Assets.xcassets/addAccount/addAccount4.imageset/addAccount4.png → GMERemittance/Assets.xcassets/james/addAccount4.imageset/addAccount4.png

Before

Width: 48  |  Height: 48  |  Size: 252 B

After

Width: 48  |  Height: 48  |  Size: 252 B

0
GMERemittance/Assets.xcassets/addAccount/addAccount5.imageset/Contents.json → GMERemittance/Assets.xcassets/james/addAccount5.imageset/Contents.json

0
GMERemittance/Assets.xcassets/addAccount/addAccount5.imageset/addAccount5.png → GMERemittance/Assets.xcassets/james/addAccount5.imageset/addAccount5.png

Before

Width: 48  |  Height: 48  |  Size: 332 B

After

Width: 48  |  Height: 48  |  Size: 332 B

0
GMERemittance/Assets.xcassets/addAccount/addAccount6.imageset/Contents.json → GMERemittance/Assets.xcassets/james/addAccount6.imageset/Contents.json

0
GMERemittance/Assets.xcassets/addAccount/addAccount6.imageset/addAccount6.png → GMERemittance/Assets.xcassets/james/addAccount6.imageset/addAccount6.png

Before

Width: 48  |  Height: 48  |  Size: 1.4 KiB

After

Width: 48  |  Height: 48  |  Size: 1.4 KiB

0
GMERemittance/Assets.xcassets/addAccount/addAccount7.imageset/Contents.json → GMERemittance/Assets.xcassets/james/addAccount7.imageset/Contents.json

0
GMERemittance/Assets.xcassets/addAccount/addAccount7.imageset/addAccount7.png → GMERemittance/Assets.xcassets/james/addAccount7.imageset/addAccount7.png

Before

Width: 48  |  Height: 48  |  Size: 1.4 KiB

After

Width: 48  |  Height: 48  |  Size: 1.4 KiB

0
GMERemittance/Assets.xcassets/addAccount/addAccount8.imageset/Contents.json → GMERemittance/Assets.xcassets/james/addAccount8.imageset/Contents.json

0
GMERemittance/Assets.xcassets/addAccount/addAccount8.imageset/addAccount8.png → GMERemittance/Assets.xcassets/james/addAccount8.imageset/addAccount8.png

Before

Width: 48  |  Height: 48  |  Size: 1.4 KiB

After

Width: 48  |  Height: 48  |  Size: 1.4 KiB

0
GMERemittance/Assets.xcassets/addAccount/addAccount9.imageset/Contents.json → GMERemittance/Assets.xcassets/james/addAccount9.imageset/Contents.json

0
GMERemittance/Assets.xcassets/addAccount/addAccount9.imageset/addAccount9.png → GMERemittance/Assets.xcassets/james/addAccount9.imageset/addAccount9.png

Before

Width: 48  |  Height: 48  |  Size: 1.4 KiB

After

Width: 48  |  Height: 48  |  Size: 1.4 KiB

BIN
GMERemittance/Assets.xcassets/james/chat.imageset/206461-48.png

After

Width: 48  |  Height: 48  |  Size: 1.4 KiB

BIN
GMERemittance/Assets.xcassets/james/chat.imageset/206461-64.png

After

Width: 64  |  Height: 64  |  Size: 1.9 KiB

23
GMERemittance/Assets.xcassets/james/chat.imageset/Contents.json

@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "chat.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "206461-48.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "206461-64.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
GMERemittance/Assets.xcassets/james/chat.imageset/chat.png

After

Width: 20  |  Height: 20  |  Size: 614 B

21
GMERemittance/Assets.xcassets/james/chatIcon.imageset/Contents.json

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "chatIcon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
GMERemittance/Assets.xcassets/james/chatIcon.imageset/chatIcon.png

After

Width: 20  |  Height: 20  |  Size: 609 B

0
GMERemittance/Assets.xcassets/addAccount/ic_auto_debit_renew.imageset/Contents.json → GMERemittance/Assets.xcassets/james/ic_auto_debit_renew.imageset/Contents.json

0
GMERemittance/Assets.xcassets/addAccount/ic_auto_debit_renew.imageset/ic_auto_debit_renew.png → GMERemittance/Assets.xcassets/james/ic_auto_debit_renew.imageset/ic_auto_debit_renew.png

Before

Width: 256  |  Height: 256  |  Size: 16 KiB

After

Width: 256  |  Height: 256  |  Size: 16 KiB

0
GMERemittance/Assets.xcassets/addAccount/renewal.imageset/Contents.json → GMERemittance/Assets.xcassets/james/renewal.imageset/Contents.json

0
GMERemittance/Assets.xcassets/addAccount/renewal.imageset/renewal.png → GMERemittance/Assets.xcassets/james/renewal.imageset/renewal.png

Before

Width: 64  |  Height: 64  |  Size: 2.6 KiB

After

Width: 64  |  Height: 64  |  Size: 2.6 KiB

0
GMERemittance/Assets.xcassets/addAccount/warning_voice_fishing.imageset/Contents.json → GMERemittance/Assets.xcassets/james/warning_voice_fishing.imageset/Contents.json

0
GMERemittance/Assets.xcassets/addAccount/warning_voice_fishing.imageset/warning_voice_fishing.jpg → GMERemittance/Assets.xcassets/james/warning_voice_fishing.imageset/warning_voice_fishing.jpg

Before

Width: 625  |  Height: 576  |  Size: 63 KiB

After

Width: 625  |  Height: 576  |  Size: 63 KiB

37
GMERemittance/Module/Home/User Interface/View/HomeViewController.swift

@ -181,7 +181,7 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout {
self.startCall(contactNumber: self.userHotLine?.remitPhoneNumber ?? "1588 6864")
}
liveChat.setValue(UIImage(named:"ic_live_chat")?.withRenderingMode(.alwaysOriginal),forKey:"image")
liveChat.setValue(UIImage(named:"chat")?.withRenderingMode(.alwaysOriginal),forKey:"image")
contactNumber.setValue(UIImage(named:"ic_call")?.withRenderingMode(.alwaysOriginal),forKey:"image")
alert.addAction(liveChat)
@ -646,7 +646,7 @@ extension HomeViewController: HomeViewInterface {
}
}
// MARK: - UITableViewDelegate
extension HomeViewController: UITableViewDelegate {
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
@ -664,7 +664,7 @@ extension HomeViewController: UITableViewDelegate {
}
}
// MARK: - UITableViewDataSource
extension HomeViewController: UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 1
@ -709,9 +709,7 @@ extension HomeViewController: UITableViewDataSource {
}
}
// notification Name
// MARK: - Notification Name
extension HomeViewController {
func getSendMoneyNotificationName() -> Notification.Name {
return Notification.Name.init(rawValue: MenuNotificationName.sendMoney)
@ -756,13 +754,14 @@ extension HomeViewController {
}
// MARK: - UIGestureRecognizerDelegate
extension HomeViewController: UIGestureRecognizerDelegate {
func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
return !Utility.didSubmitKyc() || Utility.shouldShowPennyTestError() || Utility.didPennyTestCancelled() || Utility.didPennyTestRequested() || Utility.didPennyTestNotInitiated()
}
}
// MARK: - Check KFTC Token, PopUpNotification
extension HomeViewController {
func save(user: User?) {
Utility.save(user: user)
@ -827,10 +826,26 @@ extension HomeViewController {
profile.set(name: username)
ChannelIO.delegate = self
ChannelIO.boot(with:settings, profile: profile) {(_, _) in
ChannelIO.open(animated: true)
// For push notification of ChannelIO
// ChannelIO.track(eventName:"HomeVisit")
ChannelIO.boot(with:settings, profile: profile) {(completion, _) in
var message = "channelIO_error_message_text".localized()
switch completion {
case .success:
ChannelIO.open(animated: true)
return
case .notInitialized: message += "(1)"
case .networkTimeout: message += "(2)"
case .notAvailableVersion: message += "(3)"
case .serviceUnderConstruction: message += "(4)"
case .requirePayment: message += "(5)"
case .accessDenied: message += "(6)"
case .unknown: message += "(7)"
@unknown default: message += "(8)"
}
self.alert(message: message)
}
}
}

3
bn.lproj/Localizable.strings

@ -501,3 +501,6 @@
"token_renewal_text" = " টোকেন নবায়ন";
"token_renewal_confirm_text" = " রেজিস্টার্ড অটো ডেবিট এর টোকেন নবায়ন করতে চেষ্টা করছেন? ";
"token_renewal_placeholder_text" = "   টোকেন নবায়ন করতে ভাষা নির্বাচন করুণ ";
// ChannelIO
"channelIO_error_message_text" = "Service not available.";

4
en.lproj/Localizable.strings

@ -509,3 +509,7 @@
"token_renewal_text" = "Token Renewal";
"token_renewal_confirm_text" = "Do you try to renew token of registered Auto Debit Accounts?\n(It must be renewed every one year.)";
"token_renewal_placeholder_text" = "Select Language for Renewal Token";
// ChannelIO
"channelIO_error_message_text" = "Service not available.";

3
id.lproj/Localizable.strings

@ -496,3 +496,6 @@
"token_renewal_text" = "Token Renewal";
"token_renewal_confirm_text" = "Do you try to renew token of registered Auto Debit Accounts?\n(It must be renewed every one year.)";
"token_renewal_placeholder_text" = "Select Language for Renewal Token";
// ChannelIO
"channelIO_error_message_text" = "Service not available.";

3
km.lproj/Localizable.strings

@ -509,3 +509,6 @@
"token_renewal_text" = "បន្តសុពលភាព";
"token_renewal_confirm_text" = "តើអ្នកចង់់បន្តសុពលភាពគណនីកាត់លុយអូតូដែលអ្នកបានចុះឈ្មោះពីមុនឬទេ?\n(អ្នកត្រូវបន្តរៀងរាល់ឆ្នាំ)";
"token_renewal_placeholder_text" = "ជ្រើសរើសភាសាដើម្បីធ្វើការបន្តសុពលភាព";
// ChannelIO
"channelIO_error_message_text" = "Service not available.";

3
ko.lproj/Localizable.strings

@ -512,3 +512,6 @@
"token_renewal_text" = "토큰 갱신";
"token_renewal_confirm_text" = "등록된 자동이체 계좌들의 토큰을 갱신하시겠습니까? \n(1년에 한번은 갱신되어야 합니다.)";
"token_renewal_placeholder_text" = "토큰 갱신을 위해 언어를 선택하세요";
// ChannelIO
"channelIO_error_message_text" = "사용불가";

3
mn.lproj/Localizable.strings

@ -508,3 +508,6 @@
"token_renewal_text" = "Эрхийг сэргээх";
"token_renewal_confirm_text" = "Баталгаат дансны эрхийг сэргээх үү? ";
"token_renewal_placeholder_text" = "Эрхийг сэргээхэд ашиглах хэлийг сонгоно уу";
// ChannelIO
"channelIO_error_message_text" = "Service not available.";

3
my-MM.lproj/Localizable.strings

@ -483,3 +483,6 @@
"token_renewal_text" = "အသစ္ျပန္လုပ္ၿပီးပါၿပီ";
"token_renewal_confirm_text" = "သင့္ ေအာ္တိုခ်ိတ္ဆက္မႈအား သက္တမ္းတိုးလိုပါသလား \n(တစ္နွစ္တစ္ခါ သက္တမ္းတိုးရပါမည္)";
"token_renewal_placeholder_text" = "သက္တမ္းတိုးရန္အတြက္ ဘာသာစကားေရြးခ်ယ္ပါ";
// ChannelIO
"channelIO_error_message_text" = "Service not available.";

3
my.lproj/Localizable.strings

@ -517,3 +517,6 @@
"token_renewal_text" = "အသစ္ျပန္လုပ္ၿပီးပါၿပီ";
"token_renewal_confirm_text" = "သင့္ ေအာ္တိုခ်ိတ္ဆက္မႈအား သက္တမ္းတိုးလိုပါသလား \n(တစ္နွစ္တစ္ခါ သက္တမ္းတိုးရပါမည္)";
"token_renewal_placeholder_text" = "သက္တမ္းတိုးရန္အတြက္ ဘာသာစကားေရြးခ်ယ္ပါ";
// ChannelIO
"channelIO_error_message_text" = "Service not available.";

2
ne.lproj/Localizable.strings

@ -509,3 +509,5 @@
"token_renewal_confirm_text" = "के तपाई दर्ता गरिएका स्वत: डेबिट खाताहरूको कुपन पुन: नवीकरण गर्न प्रयास गर्नुभयो ? \n(यो हरेक वर्ष नवीकरण गर्न अनिवार्य छ।)";
"token_renewal_placeholder_text" = "कुपन नवीकरणको लागि भाषा छनौट गर्नुहोस |";
// ChannelIO
"channelIO_error_message_text" = "Service not available.";

3
ru-RU.lproj/Localizable.strings

@ -508,3 +508,6 @@
"token_renewal_text" = "Token Renewal";
"token_renewal_confirm_text" = "Do you try to renew token of registered Auto Debit Accounts?\n(It must be renewed every one year.)";
"token_renewal_placeholder_text" = "Select Language for Renewal Token";
// ChannelIO
"channelIO_error_message_text" = "Service not available.";

3
si.lproj/Localizable.strings

@ -515,3 +515,6 @@
"token_renewal_text" = "Token Renewal";
"token_renewal_confirm_text" = "Do you try to renew token of registered Auto Debit Accounts?\n(It must be renewed every one year.)";
"token_renewal_placeholder_text" = "Select Language for Renewal Token";
// ChannelIO
"channelIO_error_message_text" = "Service not available.";

3
th.lproj/Localizable.strings

@ -514,3 +514,6 @@
"token_renewal_text" = "Token Renewal";
"token_renewal_confirm_text" = "Do you try to renew token of registered Auto Debit Accounts?\n(It must be renewed every one year.)";
"token_renewal_placeholder_text" = "Select Language for Renewal Token";
// ChannelIO
"channelIO_error_message_text" = "Service not available.";

3
uz.lproj/Localizable.strings

@ -511,3 +511,6 @@
"token_renewal_text" = "Token Renewal";
"token_renewal_confirm_text" = "Do you try to renew token of registered Auto Debit Accounts?\n(It must be renewed every one year.)";
"token_renewal_placeholder_text" = "Select Language for Renewal Token";
// ChannelIO
"channelIO_error_message_text" = "Service not available.";

3
vi-VN.lproj/Localizable.strings

@ -507,3 +507,6 @@
"token_renewal_text" = "Token Renewal";
"token_renewal_confirm_text" = "Do you try to renew token of registered Auto Debit Accounts?\n(It must be renewed every one year.)";
"token_renewal_placeholder_text" = "Select Language for Renewal Token";
// ChannelIO
"channelIO_error_message_text" = "Service not available.";
Loading…
Cancel
Save