카드 추가나 삭제시 UI미변경 버그 개선

Author: rupy1014

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

@@ -237,14 +237,17 @@ public void onClick(View view) {
         findViewById(R.id.barcode).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if(data == null || data.wallets == null || data.wallets.card == null || data.wallets.card.size() <= currentIndex) return;
-                if(data.wallets.card.get(currentIndex).wallet_type == -1) {
-                    startBioPay(data.user, data.wallets.card.get(currentIndex));
-                } else if(data.wallets.card.get(currentIndex).wallet_type == 1) {
-                    goNewCardActivity();
-                } else if(data.wallets.card.get(currentIndex).wallet_type == 2) {
-                    goOtherActivity();
-                }
+
+                clearCardPager();
+
+//                if(data == null || data.wallets == null || data.wallets.card == null || data.wallets.card.size() <= currentIndex) return;
+//                if(data.wallets.card.get(currentIndex).wallet_type == -1) {
+//                    startBioPay(data.user, data.wallets.card.get(currentIndex));
+//                } else if(data.wallets.card.get(currentIndex).wallet_type == 1) {
+//                    goNewCardActivity();
+//                } else if(data.wallets.card.get(currentIndex).wallet_type == 2) {
+//                    goOtherActivity();
+//                }
             }
         });
 //        getFra
@@ -330,12 +333,12 @@ private String getComma(double value) {
     }
 
     public void clearCardPager() {
-        this.data = data;
         Handler handler = new Handler(Looper.getMainLooper());
         handler.post(new Runnable() {
             @Override
             public void run() {
                 cardPagerAdapter.removeData();
+
                 cardPagerAdapter.notifyDataSetChanged();
             }
         });
@@ -353,6 +356,14 @@ public void run() {
         });
     }
 
+//    @Override
+//    protected void onPostResume() {
+//        super.onPostResume();
+//        if(this.cardPagerAdapter != null){
+//            this.cardPagerAdapter.notifyDataSetChanged();
+//        }
+//    }
+
     //    @Override
 //    protected void onStart() {
 //        super.onStart();
@@ -373,7 +384,7 @@ void getEasyCardWalletList() {
         if(uuid == null || "".equals(uuid)) { Log.d("bootpay", "uuid 값이 없습니다"); return; }
         if(userToken == null || "".equals(userToken)) { Log.d("bootpay", "userToken 값이 없습니다"); return; }
 
-        clearCardPager();
+//        clearCardPager();
         presenter.getEasyCardWallet(uuid, userToken);
     }
 
@@ -718,6 +729,9 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 vibrator.vibrate(10);
                 finish();
             }
+        } else {
+            CurrentBioRequest.getInstance().type = CurrentBioRequest.REQUEST_TYPE_RESULT_FAILED;
+            getEasyCardWalletList();
         }
     }
 }

bootpay/src/main/java/kr/co/bootpay/bio/memory/CurrentBioRequest.java

@@ -39,6 +39,7 @@ public class CurrentBioRequest {
     public static final int REQUEST_TYPE_ENABLE_DEVICE = 5; //해당 기기 활성화
     public static final int REQUEST_TYPE_OTHER = 6; //다른 결제수단
     public static final int REQUEST_TYPE_PASSWORD_PAY = 7; //생체인증 이용 불가시 비밀번호로 간편결제
+    public static final int REQUEST_TYPE_RESULT_FAILED = -100; //생체인증 이용 불가시 비밀번호로 간편결제
 
     public static CurrentBioRequest getInstance() {
         if(instance == null) instance = new CurrentBioRequest();

bootpay/src/main/java/kr/co/bootpay/bio/pager/CardPagerAdapter.java

@@ -5,13 +5,16 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
 
 import java.util.ArrayList;
 
 import kr.co.bootpay.bio.BootpayBioDialog;
 import kr.co.bootpay.bio.activity.BootpayBioActivity;
+import kr.co.bootpay.model.bio.BioDeviceUse;
 import kr.co.bootpay.model.bio.BioWallet;
 import kr.co.bootpay.model.bio.BioWalletData;
+import kr.co.bootpay.model.bio.BioWalletList;
 
 public class CardPagerAdapter extends FragmentStatePagerAdapter {
 
@@ -26,13 +29,15 @@ public CardPagerAdapter(FragmentManager fm, Context context) {
     }
 
     public void removeData() {
-        if(this.data == null) return;
-        if(this.data.wallets == null) return;
-        if(this.data.wallets.card == null) this.data.wallets.card = new ArrayList<>();
-        data.wallets.card.clear();
+
+        data = new BioWalletData();
+        data.wallets = new BioWalletList();
+        data.wallets.card = new ArrayList<>();
+        data.user = new BioDeviceUse();
     }
 
 
+
     public void setData(BioWalletData data) {
         this.data = data;
         if(this.data == null) return;
@@ -63,6 +68,12 @@ public Fragment getItem(int position) {
         return obj;
     }
 
+    @Override
+    public int getItemPosition(Object object) {
+        // refresh all fragments when data set changed
+        return PagerAdapter.POSITION_NONE;
+    }
+
     @Override
     public int getCount() {
         if(data == null) return 0;