생체인식 결제 - 결제수단 등록 후 결제시 화면이 꺼지는버그 수정

Author: rupy1014

bootpay/src/main/java/kr/co/bootpay/BootpayBuilder.java

@@ -502,6 +502,7 @@ public void onClick(
     }
 
     private void requestBioActivity() {
+        CurrentBioRequest.getInstance().listener = null;
 //        bioDialog =  BootpayBioDialog();
         if(close != null) CurrentBioRequest.getInstance().close = close;
         if(cancel != null) CurrentBioRequest.getInstance().cancel = cancel;
@@ -517,6 +518,7 @@ private void requestBioActivity() {
         CurrentBioRequest.getInstance().webActivity = null;
 
         if(BiometricManager.from(context).canAuthenticate() == BIOMETRIC_SUCCESS) {
+            CurrentBioRequest.getInstance().type = CurrentBioRequest.REQUEST_TYPE_NONE;
             Intent intent = new Intent(context, BootpayBioActivity.class);
             context.startActivity(intent);
         } else {
@@ -621,6 +623,8 @@ public void dismiss() {
         if(isBioIntent == true) {
             if(CurrentBioRequest.getInstance().bioActivity != null)
                 CurrentBioRequest.getInstance().bioActivity.finish();
+            if(CurrentBioRequest.getInstance().webActivity != null)
+                CurrentBioRequest.getInstance().webActivity.finish();
         }
 //        if(bioDialog != null) {
 //            if(CurrentBioRequest.getInstance().type != CurrentBioRequest.REQUEST_TYPE_OTHER)

bootpay/src/main/java/kr/co/bootpay/api/ApiPresenter.java

@@ -291,7 +291,6 @@ public void onSubscribe(Disposable d) {
 
                 @Override
                 public void onNext(ResEasyPayUserToken res) {
-                    Log.d("res", res.toString());
 
                     if(parentScope.parent != null) {
                         parentScope.easyPayUserToken = res;

bootpay/src/main/java/kr/co/bootpay/bio/activity/BootpayBioActivity.java

@@ -444,7 +444,7 @@ void goRegisterBiometricRequest() {
         if(uuid == null || "".equals(uuid)) { Log.d("bootpay", "uuid 값이 없습니다"); return; }
         if(userToken == null || "".equals(userToken)) { Log.d("bootpay", "userToken 값이 없습니다"); return; }
 
-        showProgress("결제권한 추가중");
+        showProgress("권한 추가중");
         presenter.postEasyBiometric(uuid, userToken, passwordToken);
     }
 
@@ -676,6 +676,7 @@ public void startBioPay(BioDeviceUse user, BioWallet bioWallet) {
         } else {
             //지문인식 후 api를 넘김
             this.bioWallet = bioWallet;
+            CurrentBioRequest.getInstance().type = CurrentBioRequest.REQUEST_TYPE_NONE;
             goBiometricAuth();
         }
     }
@@ -710,6 +711,9 @@ public void onClick(DialogInterface dialogInterface, int i) {
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
+        CurrentBioRequest.getInstance().listener = null;
+        CurrentBioRequest.getInstance().webActivity = null;
+
         if(requestCode == 9999 && resultCode > 0) {
             //wallet 재갱신
             if(CurrentBioRequest.getInstance().type == CurrentBioRequest.REQUEST_TYPE_VERIFY_PASSWORD) {

sample/src/main/java/bootpay/co/kr/samplepayment/BioActivity.java

@@ -85,6 +85,7 @@ public void callbackRestToken(RestTokenData acessToken) {
 //        String user_id =  String.valueOf(System.currentTimeMillis()); //고유 user_id로 고객별로 유니크해야하며, 다른 고객과 절대로 중복되어서는 안됩니다
         String user_id = UserInfo.getInstance(this).getBootpayUuid(); // 실제값을 적용하실 때에는, 관리하시는 user_id를 입력해주세요.
 
+
         BootUser user = new BootUser();
         user.setID(user_id);
         user.setArea("서울");