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

Merge branch 'developer'

pull/1/head
InKwon James Kim 5 years ago
parent
9eebb8e52b e11eddb203
commit
d009f2918c
12 changed files with 20 additions and 15 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. BIN
      .DS_Store
  2. 4
      GME Remit.xcodeproj/project.pbxproj
  3. 4
      GMERemittance/Info.plist
  4. 2
      GMERemittance/Module/Login/User Interface/View/LoginViewController.swift
  5. 2
      GMERemittance/Module/Register/User Interface/View/RegisterViewController.swift
  6. 2
      GMERemittance/Module/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift
  7. 14
      GMERemittance/Profile/Profile.storyboard
  8. 2
      GMERemittance/Profile/ProfileChangePasswordViewController.swift
  9. 4
      GMERemittance/Utility/SecureKeypad.swift
  10. BIN
      GMERemittance/virtualKeyboard/.DS_Store
  11. BIN
      GMERemittance/virtualKeyboard/MTransKeyRes/.DS_Store
  12. 1
      GMERemittance/virtualKeyboard/MTransKeyRes/license_mtranskey.rsl

BIN
.DS_Store
View File

4
GME Remit.xcodeproj/project.pbxproj
View File

@ -233,6 +233,7 @@
731154D0227C43E900FEBF7F /* BranchContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 731154CF227C43E900FEBF7F /* BranchContainer.swift */; };
7312F6482281488C00172BDD /* ConfirmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7312F6462281488C00172BDD /* ConfirmViewController.swift */; };
7312F6492281488C00172BDD /* ConfirmViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7312F6472281488C00172BDD /* ConfirmViewController.xib */; };
73141DDF22A0E31700A8A4BB /* license_mtranskey.rsl in Resources */ = {isa = PBXBuildFile; fileRef = 73141DDE22A0E31700A8A4BB /* license_mtranskey.rsl */; };
736A8C402277EB2A00337A50 /* BiometricAuthenticationNotificationModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C2D2277EB2900337A50 /* BiometricAuthenticationNotificationModuleInterface.swift */; };
736A8C412277EB2A00337A50 /* BiometricAuthenticationNotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C312277EB2900337A50 /* BiometricAuthenticationNotificationService.swift */; };
736A8C422277EB2A00337A50 /* BiometricAuthenticationNotificationServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C322277EB2900337A50 /* BiometricAuthenticationNotificationServiceType.swift */; };
@ -2472,6 +2473,7 @@
731154CF227C43E900FEBF7F /* BranchContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BranchContainer.swift; sourceTree = "<group>"; };
7312F6462281488C00172BDD /* ConfirmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmViewController.swift; sourceTree = "<group>"; };
7312F6472281488C00172BDD /* ConfirmViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ConfirmViewController.xib; sourceTree = "<group>"; };
73141DDE22A0E31700A8A4BB /* license_mtranskey.rsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license_mtranskey.rsl; sourceTree = "<group>"; };
736A8C2D2277EB2900337A50 /* BiometricAuthenticationNotificationModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationNotificationModuleInterface.swift; sourceTree = "<group>"; };
736A8C312277EB2900337A50 /* BiometricAuthenticationNotificationService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationNotificationService.swift; sourceTree = "<group>"; };
736A8C322277EB2900337A50 /* BiometricAuthenticationNotificationServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationNotificationServiceType.swift; sourceTree = "<group>"; };
@ -7119,6 +7121,7 @@
D93C201922000D5F0079BF03 /* MTransKeyRes */ = {
isa = PBXGroup;
children = (
73141DDE22A0E31700A8A4BB /* license_mtranskey.rsl */,
D93C2C6A22001C5F0079BF03 /* license_IBK_TEST_IONEBANK_20181105_20190531.rsl */,
D93C201A22000D5F0079BF03 /* iPhone_Res */,
D93C214A22000D600079BF03 /* iPad_Res */,
@ -12741,6 +12744,7 @@
D93C286E22000D640079BF03 /* iPad_transkey_alnum_key_15.png in Resources */,
D93C2AF022000D650079BF03 /* transkey_navi_pre_indonesian.png in Resources */,
D93C2A0022000D650079BF03 /* iPad_transkey_land_title.png in Resources */,
73141DDF22A0E31700A8A4BB /* license_mtranskey.rsl in Resources */,
D93C2A4B22000D650079BF03 /* iPad_transkey_alnum_cmd_5_english_down.png in Resources */,
D93C293722000D640079BF03 /* iPhone_transkey_alnum_cmd_8_vietnamese.png in Resources */,
D93C285F22000D640079BF03 /* iPad_transkey_alnum_key_9.png in Resources */,

4
GMERemittance/Info.plist
View File

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.22</string>
<string>1.0.23</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>0</string>
<string>1</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>

2
GMERemittance/Module/Login/User Interface/View/LoginViewController.swift
View File

@ -176,7 +176,7 @@ class LoginViewController: UIViewController {
mQwertyTransKeyView?.mTK_MakeSecureKey()
mQwertyTransKeyView?.mTK_Supported(byDeviceOrientation: SupportedByDevicePortrait)
// ccr key
mQwertyTransKeyView?.mTK_LicenseCheck("license_IBK_TEST_IONEBANK_20181105_20190531")
mQwertyTransKeyView?.mTK_LicenseCheck("license_mtranskey")
}
private func configureLanguage() {

2
GMERemittance/Module/Register/User Interface/View/RegisterViewController.swift
View File

@ -163,7 +163,7 @@ class RegisterViewController: UIViewController {
mQwertyTransKeyView?.mTK_Supported(byDeviceOrientation: SupportedByDevicePortrait)
mQwertyTransKeyView?.mTK_EnableSamekeyInputDataEncrypt(false)
// ccr key
mQwertyTransKeyView?.mTK_LicenseCheck("license_IBK_TEST_IONEBANK_20181105_20190531")
mQwertyTransKeyView?.mTK_LicenseCheck("license_mtranskey")
}
private func setup() {

2
GMERemittance/Module/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift
View File

@ -99,7 +99,7 @@ class SendMoneyCodeViewController: UIViewController {
mNumberTransKeyView?.delegate = self
mNumberTransKeyView?.mTK_MakeSecureKey()
mNumberTransKeyView?.mTK_Supported(byDeviceOrientation: SupportedByDevicePortraitAndLandscape)
mNumberTransKeyView?.mTK_LicenseCheck("license_IBK_TEST_IONEBANK_20181105_20190531")
mNumberTransKeyView?.mTK_LicenseCheck("license_mtranskey")
}
func showNumberTranskeyAction(){

14
GMERemittance/Profile/Profile.storyboard
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ift-aL-bsv">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ift-aL-bsv">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -85,7 +85,7 @@
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hfP-aZ-zbf" userLabel="Camera">
<button hidden="YES" opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hfP-aZ-zbf" userLabel="Camera">
<rect key="frame" x="204.5" y="87" width="16" height="16"/>
<constraints>
<constraint firstAttribute="height" constant="16" id="Q5Z-vM-fgo"/>
@ -122,7 +122,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="KRW" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EXY-5m-shp">
<rect key="frame" x="55" y="47" width="32" height="14"/>
<rect key="frame" x="55" y="47" width="29" height="14"/>
<constraints>
<constraint firstAttribute="height" constant="14" id="cBG-w2-z4r"/>
</constraints>
@ -154,7 +154,7 @@
<rect key="frame" x="20" y="69" width="315" height="21"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GME Wallet No." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nlo-iP-QwN">
<rect key="frame" x="10" y="2" width="99.5" height="16.5"/>
<rect key="frame" x="10" y="2" width="95.5" height="17"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="13" id="Vul-Ou-98m"/>
</constraints>
@ -163,7 +163,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GME Wallet No." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hkj-cL-iCj">
<rect key="frame" x="113" y="2" width="99.5" height="16.5"/>
<rect key="frame" x="109" y="2" width="95.5" height="17"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="13" id="dAY-tV-MW7"/>
</constraints>
@ -213,7 +213,7 @@
</userDefinedRuntimeAttributes>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bv9-cG-fQQ">
<rect key="frame" x="138" y="209" width="99" height="17"/>
<rect key="frame" x="141" y="209" width="93" height="17"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="MrC-na-8TP"/>
</constraints>

2
GMERemittance/Profile/ProfileChangePasswordViewController.swift
View File

@ -171,7 +171,7 @@ class ProfileChangePasswordViewController: UIViewController {
mQwertyTransKeyView?.mTK_MakeSecureKey()
mQwertyTransKeyView?.mTK_Supported(byDeviceOrientation: SupportedByDevicePortrait)
// ccr key
mQwertyTransKeyView?.mTK_LicenseCheck("license_IBK_TEST_IONEBANK_20181105_20190531")
mQwertyTransKeyView?.mTK_LicenseCheck("license_mtranskey")
}

4
GMERemittance/Utility/SecureKeypad.swift
View File

@ -117,7 +117,7 @@ class SecureKeypad: NSObject {
asciiKeypad.mTK_Supported(byDeviceOrientation: SupportedByDevicePortraitAndLandscape)
asciiKeypad.mTK_EnableSamekeyInputDataEncrypt(true)
asciiKeypad.mTK_SetUseBalloonImageButton(true)
asciiKeypad.mTK_LicenseCheck("license_IBK_TEST_IONEBANK_20181105_20190531")
asciiKeypad.mTK_LicenseCheck("license_mtranskey")
}
/// update ASCII UI
@ -140,7 +140,7 @@ class SecureKeypad: NSObject {
numberPad.mTK_Init(self)
numberPad.delegate = self
numberPad.mTK_MakeSecureKey()
numberPad.mTK_LicenseCheck("license_IBK_TEST_IONEBANK_20181105_20190531")
numberPad.mTK_LicenseCheck("license_mtranskey")
numberPad.mTK_ShowMessageIfMinLength("0자리 이상 입력해주세요.")
numberPad.mTK_ShowMessageIfMaxLength("16자리 입력이 초과되었습니다.")
numberPad.mTK_UseVoiceOver(false)

BIN
GMERemittance/virtualKeyboard/.DS_Store
View File

BIN
GMERemittance/virtualKeyboard/MTransKeyRes/.DS_Store
View File

1
GMERemittance/virtualKeyboard/MTransKeyRes/license_mtranskey.rsl
View File

@ -0,0 +1 @@
AdCizOfQ3Gswwz7dSYA1BcKaDN2TeyJMSUNFTlNFIjp7IkxJQ0VOU0VfSU5GTyI6eyJQUk9EVUNUX05BTUUiOiJUb3VjaEVuIG1UcmFuc2tleSBDUyIsIlBST0RVQ1RfVkVSU0lPTiI6IjQuNi4wLjQxIiwiU0lURV9OQU1FIjoi6riA66Gc67KM66i464uI7J217Iqk7ZSE66CI7IqkIiwiU0lURV9DT0RFIjoic2l0ZTkyIiwiTElDRU5TRV9DT0RFIjoiUmFvbkxJQzUzNyIsIklTU1VFUiI6ImFkbWluIiwiSVNTVUVEX0RBVEUiOiIyMDE5MDUzMSIsIkVYUElSRV9EQVRFIjoiMjA5OTA2MDEiLCJMSUNFTlNFX1RZUEUiOiJTVEFOREFSRCJ9LCJMSUNFTlNFX1NDSEVNQSI6eyJOT0RFX0xPQ0tFRCI6eyJNQUMiOlsiLiJdLCJJUCI6WyIuIl0sIkRPTUFJTiI6WyIuIl0sIk9TIjpbIkFORFJPSUQiLCJJT1MiXSwiSE9TVF9JRCI6WyIuIl0sIkNQVV9DT1JFX0NPVU5UIjoiOTk5IiwiV0FTX0lOU1RBTkNFX0NPVU5UIjoiOTk5In0sIkZMT0FUSU5HIjp7IlVTRVJfQ09VTlQiOiI5OTk5OTkiLCJERVZJQ0VfQ09VTlQiOiI5OTk5OTkiLCJCUk9XU0VSIjpbIklFIiwiRURHRSIsIkNIUk9NRSIsIlNBRkFSSSIsIkZJUkVGT1giLCJPUEVSIl0sIkFQUF9JRCI6WyJjb20uZ21lLmdtZXJlbWl0IiwiY29tLmdtZXJlbWl0Lm9ubGluZS5nbWVyZW1pdHRhbmNlX25hdGl2ZSJdLCJPUFRJT05TIjoiIn19LCJGRUFUVVJFIjpbXX19
Write Preview
Loading…
Cancel
Save