Browse Source

Minor fixes

master
Preyea Regmi 5 years ago
parent
commit
6b92a03643
  1. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/gateway/inboundaccountmanage/InboundAccountAddV2Gateway.java
  2. 17
      app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2Presenter.java
  3. 5
      app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2PresenterInterface.java
  4. 3
      app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountConfirmFragment.java
  5. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountPennyTestFragment.java

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/gateway/inboundaccountmanage/InboundAccountAddV2Gateway.java

@ -13,7 +13,7 @@ public class InboundAccountAddV2Gateway extends PrivilegedGateway implements Inb
@Override
public Observable<ResponseBody> getKoreanBankList(String auth, String Uid) {
return HttpClientV2.getInstance().getKoreanBankList(auth);
return HttpClientV2.getInstance().getAvailableKFTCBankList(auth);
}

17
app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2Presenter.java

@ -4,6 +4,7 @@ import com.gmeremit.online.gmeremittance_native.R;
import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.AutoDebitAccount;
import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.InboundAccount;
import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.KoreanBankDTO;
import com.gmeremit.online.gmeremittance_native.accountmanage.model.bankaccountvalidation.BankInfo;
import com.gmeremit.online.gmeremittance_native.accountmanage.model.inboundaccountmanage.InboundAccountAddRequestBody;
import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAddAccountConfirmFragment;
import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAddAccountPennyTestFragment;
@ -32,7 +33,7 @@ public class InboundAccountAddV2Presenter extends BasePresenter implements Inbou
private final InboundAccountAddV2InteractorInterface.InboundAccountAddV2GatewayInterface gateway;
private final CompositeDisposable compositeDisposable;
private InboundAccountAddRequestBody pennyTestRequestBody;
private List<KoreanBankDTO> availableKoreanBankList;
private List<BankInfo> availableKoreanBankList;
private BehaviorSubject<InboundAddAccountConfirmFragment.InboundAddAccountViewDTO> addAcountDataSubject;
private BehaviorSubject<InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO> pennyTestDataSubject;
@ -105,12 +106,12 @@ public class InboundAccountAddV2Presenter extends BasePresenter implements Inbou
}
@Override
public List<KoreanBankDTO> getKoreanBankList() {
public List<BankInfo> getKoreanBankList() {
return availableKoreanBankList;
}
@Override
public void updateBank(KoreanBankDTO selectedBank) {
public void updateBank(BankInfo selectedBank) {
this.pennyTestRequestBody.setBankName(selectedBank.getBankName());
this.pennyTestRequestBody.setBankCode(selectedBank.getBankCode());
validateForm1();
@ -157,7 +158,7 @@ public class InboundAccountAddV2Presenter extends BasePresenter implements Inbou
@Override
public void onBankDetailValidated() {
requestForPennyTest("Y");
requestForPennyTest("N");
}
public class PennyTestRequestObserver extends GenericApiObserverResponseV2<MessageResponseDataModel> {
@ -166,7 +167,7 @@ public class InboundAccountAddV2Presenter extends BasePresenter implements Inbou
protected void onSuccess(GenericResponseDataModel<MessageResponseDataModel> t) {
if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO pennyTestViewDTO = new InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO(pennyTestRequestBody.getBankName(), pennyTestRequestBody.getBankCode(), pennyTestRequestBody.getAccountNo(), getStringfromStringId(R.string.pennytest_information_text));
view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> {
view.showPopUpMessage(getStringfromStringId(R.string.pennytest_information_text), CustomAlertDialog.AlertType.SUCCESS, alertType -> {
pennyTestDataSubject.onNext(pennyTestViewDTO);
view.showPennyTestScreen();
});
@ -220,16 +221,16 @@ public class InboundAccountAddV2Presenter extends BasePresenter implements Inbou
}
}
public class KoreanBankListObserver extends GenericApiObserverResponseV2<List<KoreanBankDTO>> {
public class KoreanBankListObserver extends GenericApiObserverResponseV2<List<BankInfo>> {
@Override
protected Type getDataType() {
return TypeToken.getParameterized(List.class, KoreanBankDTO.class).getType();
return TypeToken.getParameterized(List.class, BankInfo.class).getType();
}
@Override
protected void onSuccess(GenericResponseDataModel<List<KoreanBankDTO>> t) {
protected void onSuccess(GenericResponseDataModel<List<BankInfo>> t) {
if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
availableKoreanBankList = t.getData();
} else {

5
app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2PresenterInterface.java

@ -3,6 +3,7 @@ package com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inbound
import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.AutoDebitAccount;
import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.InboundAccount;
import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.KoreanBankDTO;
import com.gmeremit.online.gmeremittance_native.accountmanage.model.bankaccountvalidation.BankInfo;
import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAddAccountConfirmFragment;
import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAddAccountPennyTestFragment;
import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface;
@ -24,9 +25,9 @@ public interface InboundAccountAddV2PresenterInterface extends BasePresenterInte
void submitPennyTest(String depositReference);
List<KoreanBankDTO> getKoreanBankList();
List<BankInfo> getKoreanBankList();
void updateBank(KoreanBankDTO selectedBank);
void updateBank(BankInfo selectedBank);
void onBankAccNoChanged(String bankAccNo);

3
app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountConfirmFragment.java

@ -12,6 +12,7 @@ import android.widget.ImageView;
import com.gmeremit.online.gmeremittance_native.R;
import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.KoreanBankDTO;
import com.gmeremit.online.gmeremittance_native.accountmanage.model.bankaccountvalidation.BankInfo;
import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
import com.gmeremit.online.gmeremittance_native.customwidgets.GMEFormInputField;
import com.gmeremit.online.gmeremittance_native.customwidgets.TextWatcherAdapter;
@ -39,7 +40,7 @@ public class InboundAddAccountConfirmFragment extends BaseFragment {
@BindView(R.id.startPennyTestButton)
Button startPennyTestButton;
private BankSelectClickListener bankSelectionClickListener;
private GenericTextListingDialog<KoreanBankDTO> bankListingDialog;
private GenericTextListingDialog<BankInfo> bankListingDialog;
private BankAccountNumberTextWatcher bankAccountNoTextWatcher;
@Override

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountPennyTestFragment.java

@ -103,7 +103,7 @@ public class InboundAddAccountPennyTestFragment extends BaseFragment {
@OnClick(R.id.resend_request)
public void resendRequest()
{
((InboundAccountAddActionListener) getActivity()).getPresenter().requestForPennyTest("N");
((InboundAccountAddActionListener) getActivity()).getPresenter().requestForPennyTest("Y");
}

Loading…
Cancel
Save