Skip to content

M
mdd_update_balance_simulator
Commit 43dd089e authored by Gandha Ryanto's avatar Gandha Ryanto
Browse files
Options

Fix library update balance

parent 4937c98b
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 36 deletions
app/build.gradle
View file @ 43dd089e
......@@ -53,11 +53,10 @@ dependencies {
implementation 'com.jakewharton:butterknife:10.2.0'
implementation 'com.bugfender.sdk:android:3.0.8'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
implementation(group: 'com.mdd.payment', name: 'aar-deviceid-release', version: '2.0.7', ext: 'aar')
implementation(group: 'com.mdd.payment', name: 'aar-deviceid-release', version: '3.0.2', ext: 'aar')
implementation(group: 'com.mdd.service', name: 'partner-connect', version: '2.4.2', ext: 'aar')
implementation(group: 'com.mdd.payment', name: 'mybanklibrary-release', version: '3.7.1', ext: 'aar')
implementation(group: 'com.mdd.topup', name: 'update-balance', version: '3.2.14-mobile-rev9', ext: 'aar')
implementation(group: 'com.mdd.payment', name: 'mybanklibrary-release', version: '3.8.0', ext: 'aar')
implementation(group: 'com.mdd.topup', name: 'update-balance', version: '3.4.0-mobile-rev6', ext: 'aar')
implementation(group: 'com.mdd.payment', name: 'z91library-release', version: '2.1.2', ext: 'aar')
implementation(group: 'com.mdd.payment', name: 'organicdrv-release', version: '2.1.2', ext: 'aar')
implementation(group: 'com.mdd.payment', name: 'wepoylibrary-release', version: '2.2.6', ext: 'aar')
......
app/src/main/java/com/mdd/updateaja/MainActivity.java
View file @ 43dd089e
......@@ -82,14 +82,13 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
@Override
protected void onCreate(Bundle savedInstanceState) {
validateHasPermissions();
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
ButterKnife.bind(this);
getSupportActionBar().hide();
validateHasPermissions();
initCardProcessor();
if (isInternetAvailable()) {
NfcManager manager = (NfcManager) getSystemService(Context.NFC_SERVICE);
......@@ -170,6 +169,8 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
} else {
Log.d(TAG, "--> Init Aar");
((MyApp) getApplication()).initAar(this);
// initCardProcessor();
}
}
......@@ -192,27 +193,27 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
protected void onResume() {
super.onResume();
Log.e("onResume", "onresume");
if (MyConstant.enabledBri) {
Intent intent = new Intent(this, MainActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, 0);
IntentFilter[] filters = new IntentFilter[]{};
cardProcessor.getNfcAdapter().enableForegroundDispatch(this, pendingIntent, filters, null);
// if (MyConstant.enabledBri) {
// Intent intent = new Intent(this, MainActivity.class);
// intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
//
// PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, 0);
// IntentFilter[] filters = new IntentFilter[]{};
//// cardProcessor.getNfcAdapter().enableForegroundDispatch(this, pendingIntent, filters, null);
//
// } else {
if (isInternetAvailable()) {
NfcManager manager = (NfcManager) getSystemService(Context.NFC_SERVICE);
NfcAdapter adapter = manager.getDefaultAdapter();
final int READER_FLAGS = NfcAdapter.FLAG_READER_NFC_A | NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK;
if (adapter != null && adapter.isEnabled()) {
adapter.enableReaderMode(this, this, READER_FLAGS, null);
}
} else {
if (isInternetAvailable()) {
NfcManager manager = (NfcManager) getSystemService(Context.NFC_SERVICE);
NfcAdapter adapter = manager.getDefaultAdapter();
final int READER_FLAGS = NfcAdapter.FLAG_READER_NFC_A | NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK;
if (adapter != null && adapter.isEnabled()) {
adapter.enableReaderMode(this, this, READER_FLAGS, null);
}
} else {
Toast.makeText(MainActivity.this, getResources().getString(R.string.connection_error), Toast.LENGTH_SHORT).show();
}
Toast.makeText(MainActivity.this, getResources().getString(R.string.connection_error), Toast.LENGTH_SHORT).show();
}
// }
}
@Override
......@@ -304,7 +305,7 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
runOnUiThread(() -> MainActivity.this.onBalanceInfoAvailable(cardInfo));
if (MyApp.idDriver == 1) {
cardProcessor.updateBalance(cardInfo, 1, newIntent);
}else{
} else {
if (!execute.isSuccess()) {
cardProcessor.updateBalanceBri(newIntent, "1");
}
......@@ -396,8 +397,10 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
tvNewBalance.setVisibility(GONE);
resultNewBalance.setVisibility(GONE);
if (successUpdateBalance.getMessage().contains("Tidak ada Pending Balance")
|| successUpdateBalance.getMessage().equalsIgnoreCase("Zero Balance")) {
|| successUpdateBalance.getMessage().equalsIgnoreCase("Zero Balance")
|| successUpdateBalance.getMessage().toLowerCase(Locale.ROOT).contains("no pending")) {
Utils.showDialog(this, successUpdateBalance.getMessage(), SweetAlertDialog.WARNING_TYPE);
// textToSpeech.speak(successUpdateBalance.getMessage(), TextToSpeech.QUEUE_FLUSH, null);
} else {
Utils.showDialog(this, successUpdateBalance.getMessage(), SweetAlertDialog.SUCCESS_TYPE);
......@@ -409,9 +412,9 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
tvNewBalance.setVisibility(View.VISIBLE);
resultNewBalance.setVisibility(View.VISIBLE);
resultNewBalance.setText("Rp. " + String.format("%,d", successUpdateBalance.getBalance()));
// textToSpeech.speak(successUpdateBalance.getBalance() + "Rupiah", TextToSpeech.QUEUE_FLUSH, null);
}
// beep();
textToSpeech.speak(successUpdateBalance.getBalance() + "Rupiah", TextToSpeech.QUEUE_FLUSH, null);
}
@Override
......
app/src/main/java/com/mdd/updateaja/MyApp.java
View file @ 43dd089e
......@@ -28,7 +28,7 @@ import io.reactivex.schedulers.Schedulers;
public class MyApp extends Application {
String accessToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJhdXRoLXNlcnZpY2U6MS4wLjAiLCJzdWIiOnsibmFtZSI6IlRlc3RTdGFnIiwidXNlcm5hbWUiOiJUZXN0U3RhZyIsImF1dGhfbGV2ZWwiOiJNRVJDSEFOVCIsIm1pZCI6IjIwZjFmMTNmODA1MGFjY2QxYjNjNzFlOWUyYTQ0NzU3In0sImlhdCI6MTU5MzQxMzM5MCwiZXhwIjoxNzUxMTk4MTUwLCJuYmYiOjE1OTM0MTMzOTJ9.E6UJMKha5YCbri4KRExDV4zeA1ZBfabpW-O6SInxxvfyTTYnUZCEu58STBGrOCL0RuxTFp5Y-XEyoa932fQcTpMBMsKkvDmGeftJ0hmjzAxAjHTfUxUyEa-HHF1whsM4YQUG9CesEBjU9IUcE6Rs-jykYxuryvvqqop5BoEIwO71qQBrq6DtpwjwFk9hbNt0EKs_HmCpySfXQxorfLMbAVJCHBYoo4UVymUfwUbps7hW6eQwNoBnt11O59CRPf6uUVIfCrsaaBMcJI-mc214-EMyl3RmMbqNl_f_0ITEJhMtK2zbUFZ8dMrGdZZgWJxiHdmzxqdaEPDVshYi9Uo31w";
public static int idDriver = nativeLib.USE_PAX_ENGGINE;
public static int idDriver = nativeLib.USE_NFC_NATIVE;
private InitReader reader;
@Override
......@@ -110,14 +110,15 @@ public class MyApp extends Application {
@Override
public void onSuccess(InitReader initReader) {
listener.onInitReaderComplete(initReader);
reader = initReader;
listener.onInitReaderComplete(initReader);
Log.e("initReader", String.valueOf(initReader));
}
@Override
public void onError(Throwable e) {
Log.e("initReader", String.valueOf(e.getMessage()));
}
});
......
app/src/main/java/com/mdd/updateaja/MyConstant.java
View file @ 43dd089e
......@@ -3,12 +3,13 @@ package com.mdd.updateaja;
import com.medicom.dudikov.mybanklibrary.nativeLib;
public class MyConstant {
public static boolean enabledBri = false;
//prod
public static String MID = "49df5f81d59fae23ec6f542372fc9497";
public static String TOKEN = "82ae0ec8da26bca26d3540b08defc17d";
public static String MID = "4dd9063acfc04848b801288f23c6eeff";
public static String TOKEN = "9ef471364bca478faf77f8cc0710b7c4";
// public static String MID = "1234567abc";
// public static String TOKEN = "165eea86947a4e9483d1902f93495fc6";
}
}
\ No newline at end of file
app/src/main/java/com/mdd/updateaja/RxReader.java
View file @ 43dd089e
......@@ -43,8 +43,7 @@ public class RxReader {
configService.getMid(),
configService.getTid(),
configService.getToken(),
accessToken
, configService.getEnvironment());
accessToken, configService.getEnvironment());
nativeLib nativeLibrary = new nativeLib(context, deviceDriver);
InitDebugCertificate debugCertificate = new InitDebugCertificate();
......
build.gradle
View file @ 43dd089e
......@@ -19,7 +19,7 @@ allprojects {
google()
jcenter()
maven {
url "http://mobile-repo.mdd.co.id:8081/artifactory/android-library/"
url "https://mobile-repo.mdd.co.id:8081/artifactory/android-libs/"
credentials {
username = artifactory_username
password = artifactory_password
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment