diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/accountlisting/AccountListingV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/accountlisting/AccountListingV2Activity.java index 4d6da00f..eaeceb20 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/accountlisting/AccountListingV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/accountlisting/AccountListingV2Activity.java @@ -168,6 +168,7 @@ public class AccountListingV2Activity extends BaseActivity implements AutoDebitA @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); if ((requestCode == AUTO_DEBIT_ADD_REQUEST && resultCode == RESULT_OK)) { if (this.presenter == null) return; @@ -181,7 +182,12 @@ public class AccountListingV2Activity extends BaseActivity implements AutoDebitA return; } Intent intent = new Intent(AccountListingV2Activity.this, AutoDebitWebBrowserActivityV2.class); - intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY, this.presenter.getWebRequestDataForAddingAccount(verifiedData)); + WebRequestModel webRequestModel=this.presenter.getWebRequestDataForAddingAccount(verifiedData); + + //TODO Remove test url later + webRequestModel.setUrl("https://testapi.openbanking.or.kr/oauth/2.0/authorize?auth_type=0&response_type=code&client_id=KxvHs6w5RLvByYmLrj3vCeD9Y9fWknzvLHetOhUE&edit_option=on&scope=inquiry&redirect_uri=https://www.kftc.or.kr&state=abcdefghijklmnopqrstuvwxyz123456&lang=kor"); + + intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,webRequestModel ); startActivityForResult(intent, AUTO_DEBIT_ADD_REQUEST); } catch (Exception e) { @@ -203,6 +209,8 @@ public class AccountListingV2Activity extends BaseActivity implements AutoDebitA @Override public void redirectToKFTCForAccRenewal(WebRequestModel webRequestModel) { Intent intent = new Intent(AccountListingV2Activity.this, AutoDebitWebBrowserActivityV2.class); + //TODO Remove test url later + webRequestModel.setUrl("https://testapi.openbanking.or.kr/oauth/2.0/authorize?auth_type=0&response_type=code&client_id=KxvHs6w5RLvByYmLrj3vCeD9Y9fWknzvLHetOhUE&edit_option=on&scope=inquiry&redirect_uri=https://www.kftc.or.kr&state=abcdefghijklmnopqrstuvwxyz123456&lang=kor"); intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY, webRequestModel); startActivityForResult(intent, AUTO_DEBIT_ADD_REQUEST); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/addautodebitV2/view/AddPrimaryAccounAsAutoDebitActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/addautodebitV2/view/AddPrimaryAccounAsAutoDebitActivity.java index 17a22603..907bcb69 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/addautodebitV2/view/AddPrimaryAccounAsAutoDebitActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/addautodebitV2/view/AddPrimaryAccounAsAutoDebitActivity.java @@ -194,6 +194,9 @@ public class AddPrimaryAccounAsAutoDebitActivity extends BaseActivity implements @Override public void navigateToKftcWebScreen(WebRequestModel kftcAddAccountWebRequestModel) { kftcAddAccountWebRequestModel = new WebRequestModel("Register Auto Debit Account", kftcAddAccountWebRequestModel.getUrl(), kftcAddAccountWebRequestModel.getHeaderData()); + //TODO Remove test url later + kftcAddAccountWebRequestModel.setUrl("https://testapi.openbanking.or.kr/oauth/2.0/authorize?auth_type=0&response_type=code&client_id=KxvHs6w5RLvByYmLrj3vCeD9Y9fWknzvLHetOhUE&edit_option=on&scope=inquiry&redirect_uri=https://www.kftc.or.kr&state=abcdefghijklmnopqrstuvwxyz123456&lang=kor"); + addAutoDebitWebBrowserFragment.setWebRequestData(kftcAddAccountWebRequestModel); addAutoDebitAccountViewPager.setCurrentItem(1); addAutoDebitWebBrowserFragment.loadWebView(); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/notice/view/NoticeActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/notice/view/NoticeActivity.java index 612ab889..69f47c49 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/notice/view/NoticeActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/notice/view/NoticeActivity.java @@ -24,6 +24,7 @@ import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; +import butterknife.OnClick; public class NoticeActivity extends BaseActivity implements NoticePresenterInterface.NoticeViewContractInterface, ViewPager.OnPageChangeListener { @@ -84,6 +85,11 @@ public class NoticeActivity extends BaseActivity implements NoticePresenterInter } + @OnClick(R.id.iv_back) + public void backButtonPressed() { + this.onBackPressed(); + } + @Override public void lazyInitViews() { setupViewPager(); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/push_notifications/MyFirebaseMessagingService.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/push_notifications/MyFirebaseMessagingService.java index 8b003fe0..7d0e2998 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/push_notifications/MyFirebaseMessagingService.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/push_notifications/MyFirebaseMessagingService.java @@ -74,12 +74,15 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService { } public Intent getIntentFromDestinationValue(String destination) { - Intent intent=new Intent(this, NoticeActivity.class); + Intent intent=new Intent(this, SplashScreen.class); if ("HOME".equalsIgnoreCase(GmeApplication.getStorage().getString(USER_LOGGED_IN_STATUS, ""))) { if ("RechargeHistory".equals(destination)) { intent = new Intent(this, LocalTopUpHistoryActivity.class); } + else if ("PushNotification".equals(destination)) { + intent = new Intent(this, NoticeActivity.class); + } } intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserFragmentV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserFragmentV2.java index 550470c3..986f6949 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserFragmentV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserFragmentV2.java @@ -99,7 +99,11 @@ public abstract class WebBrowserFragmentV2 extends BaseFragment { webView.clearCache(true); webView.clearHistory(); WebSettings settings = webView.getSettings(); + settings.setJavaScriptEnabled(true); + settings.setDomStorageEnabled(true); + settings.setUseWideViewPort(true); + settings.setLoadWithOverviewMode(true); settings.setTextZoom(100); settings.setSupportMultipleWindows(true); settings.setJavaScriptCanOpenWindowsAutomatically(true); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserV2Activity.java index 7f3937fa..ffcce67c 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserV2Activity.java @@ -174,6 +174,22 @@ public abstract class WebBrowserV2Activity extends BaseActivity implements View } } +// webView.setNetworkAvailable(true); +// WebSettings settings = webView.getSettings(); +// settings.setJavaScriptEnabled(true); +// settings.setDomStorageEnabled(true); +// settings.setUseWideViewPort(true); +// settings.setLoadWithOverviewMode(true); +// CookieManager.getInstance().setAcceptThirdPartyCookies(webView, true); +// //(필수!!) 일부폰에서 접근성 설정에 의해 CSS 깨짐 발생 아래 설정 +// //(REQUIRED!!) set up when CSS crack for some phone depending on accessability setting +// settings.setTextZoom(100); +// settings.setSupportMultipleWindows(true); +// settings.setJavaScriptCanOpenWindowsAutomatically(true); +// //(필수!!) 모바일 브라우저와 웹뷰(하이브리드 앱)를 구분하기 위한 UserAgent 설정 +// //(REQUIRED!!) set up UserAgent for distingushing between mobile browser and webview(hybrid app) +// StringBuffer sb = new StringBuffer(settings.getUserAgentString()).append(STR_USER_AGENT_YESSIGN_ANDROID); +// settings.setUserAgentString(sb.toString()); private void setupWebView() { gmeWebViewClient = new GMEWebViewClient(); gmeChromeClient = new GMEChromeClient(); @@ -186,6 +202,9 @@ public abstract class WebBrowserV2Activity extends BaseActivity implements View WebSettings settings = webView.getSettings(); settings.setJavaScriptEnabled(true); + settings.setDomStorageEnabled(true); + settings.setUseWideViewPort(true); + settings.setLoadWithOverviewMode(true); settings.setTextZoom(100); settings.setSupportMultipleWindows(true); settings.setJavaScriptCanOpenWindowsAutomatically(true);