flutter 호환을 위한 리팩토링

rupy1014 · rupy1014 · commit 39989f112678 · 2020-11-09T14:25:58.000+09:00
diff --git a/bootpay/src/main/java/kr/co/bootpay/BootpayBuilder.java b/bootpay/src/main/java/kr/co/bootpay/BootpayBuilder.java
@@ -514,8 +514,7 @@ private void requestBioActivity() {
         isBioIntent = true;
         CurrentBioRequest.getInstance().request = request;
 
-        CurrentBioRequest.getInstance().bioActivity = null;
-        CurrentBioRequest.getInstance().webActivity = null;
+        CurrentBioRequest.getInstance().activity = null;
 
         if(BiometricManager.from(context).canAuthenticate() == BIOMETRIC_SUCCESS) {
             CurrentBioRequest.getInstance().type = CurrentBioRequest.REQUEST_TYPE_NONE;
@@ -603,10 +602,8 @@ public void transactionConfirm(String data) {
         if (dialog != null)
             dialog.transactionConfirm(data);
         if(isBioIntent == true) {
-            if(CurrentBioRequest.getInstance().bioActivity != null)
-                CurrentBioRequest.getInstance().bioActivity.transactionConfirm(data);
-            if(CurrentBioRequest.getInstance().webActivity != null)
-                CurrentBioRequest.getInstance().webActivity.transactionConfirm(data);
+            if(CurrentBioRequest.getInstance().activity != null)
+                CurrentBioRequest.getInstance().activity.transactionConfirm(data);
         }
 
 //        if(bioDialog != null)
@@ -621,10 +618,8 @@ public void removePaymentWindow() {
     public void dismiss() {
         if(dialog != null) dialog.dismiss();
         if(isBioIntent == true) {
-            if(CurrentBioRequest.getInstance().bioActivity != null)
-                CurrentBioRequest.getInstance().bioActivity.finish();
-            if(CurrentBioRequest.getInstance().webActivity != null)
-                CurrentBioRequest.getInstance().webActivity.finish();
+            if(CurrentBioRequest.getInstance().activity != null)
+                CurrentBioRequest.getInstance().activity.activityFinish();
         }
 //        if(bioDialog != null) {
 //            if(CurrentBioRequest.getInstance().type != CurrentBioRequest.REQUEST_TYPE_OTHER)
diff --git a/bootpay/src/main/java/kr/co/bootpay/bio/IBioPayFunction.java b/bootpay/src/main/java/kr/co/bootpay/bio/IBioPayFunction.java
@@ -0,0 +1,10 @@
+package kr.co.bootpay.bio;
+
+import kr.co.bootpay.model.bio.BioDeviceUse;
+import kr.co.bootpay.model.bio.BioWallet;
+
+
+public interface IBioPayFunction {
+    void transactionConfirm(String data);
+    void activityFinish();
+}
diff --git a/bootpay/src/main/java/kr/co/bootpay/bio/activity/BootpayBioActivity.java b/bootpay/src/main/java/kr/co/bootpay/bio/activity/BootpayBioActivity.java
@@ -12,7 +12,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.os.PersistableBundle;
 import android.os.Vibrator;
 import android.util.Log;
 import android.util.TypedValue;
@@ -46,8 +45,8 @@
 import dev.samstevens.totp.exceptions.CodeGenerationException;
 import kr.co.bootpay.R;
 import kr.co.bootpay.api.ApiService;
-import kr.co.bootpay.bio.BootpayBioPayLayout;
 import kr.co.bootpay.bio.IBioActivityFunction;
+import kr.co.bootpay.bio.IBioPayFunction;
 import kr.co.bootpay.bio.api.BioApiPresenter;
 import kr.co.bootpay.bio.memory.CurrentBioRequest;
 import kr.co.bootpay.bio.pager.CardPagerAdapter;
@@ -56,7 +55,6 @@
 import kr.co.bootpay.listener.ConfirmListener;
 import kr.co.bootpay.listener.DoneListener;
 import kr.co.bootpay.listener.ErrorListener;
-import kr.co.bootpay.listener.EventListener;
 import kr.co.bootpay.model.Request;
 import kr.co.bootpay.model.bio.BioDeviceUse;
 import kr.co.bootpay.model.bio.BioPayload;
@@ -73,7 +71,7 @@
 import static androidx.biometric.BiometricManager.BIOMETRIC_SUCCESS;
 
 
-public class BootpayBioActivity extends FragmentActivity implements BootpayBioRestImplement, IBioActivityFunction {
+public class BootpayBioActivity extends FragmentActivity implements BootpayBioRestImplement, IBioActivityFunction, IBioPayFunction {
 
     private Context context;
     private Request request;
@@ -115,7 +113,7 @@ public void onBackPressed() {
             return;
         }
         this.doubleBackToExitPressedOnce = true;
-        Toast.makeText(this, "'뒤로' 버튼을 한번 더 눌러주세요.", Toast.LENGTH_SHORT).show();
+        Toast.makeText(this, "결제를 종료하시려면 '뒤로' 버튼을 한번 더 눌러주세요.", Toast.LENGTH_SHORT).show();
         new Handler().postDelayed(new Runnable() {
             @Override
             public void run() {
@@ -136,7 +134,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         if(request != null) bioPayload = request.getBioPayload();
         initProgressCircle();
 
-        CurrentBioRequest.getInstance().bioActivity = this;
+        CurrentBioRequest.getInstance().activity = this;
 
         initView();
         getEasyCardWalletList();
@@ -183,13 +181,13 @@ List<String> getQuotaList() {
 
     @Override
     protected void onDestroy() {
-        CurrentBioRequest.getInstance().bioActivity = null;
+        CurrentBioRequest.getInstance().activity = null;
         super.onDestroy();
     }
 
     @Override
     public void finish() {
-        CurrentBioRequest.getInstance().bioActivity = null;
+        CurrentBioRequest.getInstance().activity = null;
         super.finish();
         overridePendingTransition(R.anim.open, R.anim.close);
     }
@@ -539,6 +537,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
         });
     }
 
+    @Override
     public void transactionConfirm(String data) {
         try {
             ResReceiptID res = new Gson().fromJson(data, ResReceiptID.class);
@@ -553,6 +552,11 @@ public void transactionConfirm(String data) {
         }
     }
 
+    @Override
+    public void activityFinish() {
+        finish();
+    }
+
     @Override
     public void callbacktEasyBiometricRegister(ResEasyBiometric res) {
         progress.dismiss();
@@ -760,7 +764,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
         CurrentBioRequest.getInstance().listener = null;
-        CurrentBioRequest.getInstance().webActivity = null;
+//        CurrentBioRequest.getInstance().webActivity = null;
 
         if(requestCode == 9999 && resultCode > 0) {
             //wallet 재갱신
diff --git a/bootpay/src/main/java/kr/co/bootpay/bio/activity/BootpayBioWebviewActivity.java b/bootpay/src/main/java/kr/co/bootpay/bio/activity/BootpayBioWebviewActivity.java
@@ -11,6 +11,7 @@
 
 import kr.co.bootpay.R;
 import kr.co.bootpay.api.ApiService;
+import kr.co.bootpay.bio.IBioPayFunction;
 import kr.co.bootpay.bio.api.BioApiPresenter;
 import kr.co.bootpay.bio.listener.BioEventListener;
 import kr.co.bootpay.bio.memory.CurrentBioRequest;
@@ -19,7 +20,7 @@
 import kr.co.bootpay.model.res.ResReceiptID;
 import kr.co.bootpay.pref.UserInfo;
 
-public class BootpayBioWebviewActivity extends Activity implements BioEventListener {
+public class BootpayBioWebviewActivity extends Activity implements BioEventListener, IBioPayFunction {
 
 //    Context context;
 //    BioApiPresenter presenter;
@@ -35,7 +36,7 @@ public void onBackPressed() {
             return;
         }
         this.doubleBackToExitPressedOnce = true;
-        Toast.makeText(this, "'뒤로' 버튼을 한번 더 눌러주세요.", Toast.LENGTH_SHORT).show();
+        Toast.makeText(this, "결제를 종료하시려면 '뒤로' 버튼을 한번 더 눌러주세요.", Toast.LENGTH_SHORT).show();
         new Handler().postDelayed(new Runnable() {
             @Override
             public void run() {
@@ -49,16 +50,22 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         CurrentBioRequest.getInstance().listener = this;
-        CurrentBioRequest.getInstance().webActivity = this;
+        CurrentBioRequest.getInstance().activity = this;
 
         setContentView(R.layout.layout_bio_activity);
         webView = findViewById(R.id.webview);
     }
 
+    @Override
     public void transactionConfirm(String data) {
         webView.transactionConfirm(data);
     }
 
+    @Override
+    public void activityFinish() {
+
+    }
+
 
     @Override
     public void onEasyCancel(String data) {
diff --git a/bootpay/src/main/java/kr/co/bootpay/bio/memory/CurrentBioRequest.java b/bootpay/src/main/java/kr/co/bootpay/bio/memory/CurrentBioRequest.java
@@ -1,5 +1,6 @@
 package kr.co.bootpay.bio.memory;
 
+import kr.co.bootpay.bio.IBioPayFunction;
 import kr.co.bootpay.bio.activity.BootpayBioActivity;
 import kr.co.bootpay.bio.activity.BootpayBioWebviewActivity;
 import kr.co.bootpay.bio.listener.BioEventListener;
@@ -23,8 +24,9 @@ public class CurrentBioRequest {
     public CancelListener cancel;
     public ConfirmListener confirm;
 
-    public BootpayBioActivity bioActivity;
-    public BootpayBioWebviewActivity webActivity;
+    public IBioPayFunction activity;
+//    public BootpayBioActivity bioActivity;
+//    public BootpayBioWebviewActivity webActivity;
 
     public int type = -1;
     public String token;
