|
51 | 51 | import kr.co.bootpay.bio.memory.CurrentBioRequest; |
52 | 52 | import kr.co.bootpay.bio.pager.CardPagerAdapter; |
53 | 53 | import kr.co.bootpay.bio.pager.CardViewPager; |
| 54 | +import kr.co.bootpay.listener.CancelListener; |
54 | 55 | import kr.co.bootpay.listener.ConfirmListener; |
55 | 56 | import kr.co.bootpay.listener.DoneListener; |
56 | 57 | import kr.co.bootpay.listener.EventListener; |
@@ -105,6 +106,8 @@ public class BootpayBioActivity extends FragmentActivity implements BootpayBioRe |
105 | 106 | @Override |
106 | 107 | public void onBackPressed() { |
107 | 108 | if (doubleBackToExitPressedOnce) { |
| 109 | + CancelListener cancel = CurrentBioRequest.getInstance().cancel; |
| 110 | + if(cancel != null) cancel.onCancel("사용자가 창을 닫았습니다"); |
108 | 111 | super.onBackPressed(); |
109 | 112 | return; |
110 | 113 | } |
@@ -230,24 +233,22 @@ public void onPageScrollStateChanged(int state) { |
230 | 233 | findViewById(R.id.cancel).setOnClickListener(new View.OnClickListener() { |
231 | 234 | @Override |
232 | 235 | public void onClick(View view) { |
| 236 | + CancelListener cancel = CurrentBioRequest.getInstance().cancel; |
| 237 | + if(cancel != null) cancel.onCancel("사용자가 창을 닫았습니다"); |
233 | 238 | finish(); |
234 | | -// if(scope.bootpayBioDialog != null) scope.bootpayBioDialog.dismiss(); |
235 | 239 | } |
236 | 240 | }); |
237 | 241 | findViewById(R.id.barcode).setOnClickListener(new View.OnClickListener() { |
238 | 242 | @Override |
239 | 243 | public void onClick(View view) { |
240 | | - |
241 | | - clearCardPager(); |
242 | | - |
243 | | -// if(data == null || data.wallets == null || data.wallets.card == null || data.wallets.card.size() <= currentIndex) return; |
244 | | -// if(data.wallets.card.get(currentIndex).wallet_type == -1) { |
245 | | -// startBioPay(data.user, data.wallets.card.get(currentIndex)); |
246 | | -// } else if(data.wallets.card.get(currentIndex).wallet_type == 1) { |
247 | | -// goNewCardActivity(); |
248 | | -// } else if(data.wallets.card.get(currentIndex).wallet_type == 2) { |
249 | | -// goOtherActivity(); |
250 | | -// } |
| 244 | + if(data == null || data.wallets == null || data.wallets.card == null || data.wallets.card.size() <= currentIndex) return; |
| 245 | + if(data.wallets.card.get(currentIndex).wallet_type == -1) { |
| 246 | + startBioPay(data.user, data.wallets.card.get(currentIndex)); |
| 247 | + } else if(data.wallets.card.get(currentIndex).wallet_type == 1) { |
| 248 | + goNewCardActivity(); |
| 249 | + } else if(data.wallets.card.get(currentIndex).wallet_type == 2) { |
| 250 | + goOtherActivity(); |
| 251 | + } |
251 | 252 | } |
252 | 253 | }); |
253 | 254 | // getFra |
|
0 commit comments