Skip to content

M
mdd_update_balance_simulator
Commit 4937c98b authored by Gandha Ryanto's avatar Gandha Ryanto
Browse files
Options

Update lib update balance v3.2.14-mobile-rev9 and run on pax A920

parent fb4256b3
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 69 deletions
app/build.gradle
View file @ 4937c98b
......@@ -57,7 +57,7 @@ dependencies {
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.7-mobile-rev1', ext: 'aar')
implementation(group: 'com.mdd.topup', name: 'update-balance', version: '3.2.14-mobile-rev9', 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/AndroidManifest.xml
View file @ 4937c98b
......@@ -15,8 +15,10 @@
<application
android:name="com.mdd.updateaja.MyApp"
android:allowBackup="true"
android:hardwareAccelerated="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:largeHeap="true"
android:networkSecurityConfig="@xml/network_security_config"
android:roundIcon="@mipmap/ic_launcher"
android:supportsRtl="true"
......
app/src/main/java/com/mdd/updateaja/MainActivity.java
View file @ 4937c98b
package com.mdd.updateaja;
import static android.view.View.GONE;
import static com.medicom.organicdrv.utilsLib.ByteArrayToHexString;
import android.Manifest;
import android.app.PendingIntent;
import android.content.Context;
......@@ -44,9 +47,6 @@ import butterknife.ButterKnife;
import cn.pedant.SweetAlert.SweetAlertDialog;
import id.emhusnan.mdd.service.MDDUpdateBalanceView;
import static android.view.View.GONE;
import static com.medicom.organicdrv.utilsLib.ByteArrayToHexString;
public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceView, InitListener, NfcAdapter.ReaderCallback {
@BindView(R.id.logo_atas)
......@@ -71,8 +71,6 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
MaterialCardView mvResult;
@BindView(R.id.tap_card)
TextView tapCard;
private MainCardProcessor cardProcessor;
InitReader reader = null;
String TAG = "MainActivity";
Intent newIntent;
......@@ -80,6 +78,7 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
int prevBalance = 0;
CommandResult<CardInfo> execute;
TextToSpeech textToSpeech;
private MainCardProcessor cardProcessor;
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -143,7 +142,9 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
resultBalance.setText("Rp. " + 0);
cardNumber.setText("xxxx xxxx xxxx xxxx");
});
beep();
cardProcessor.getBalance();
// beep();
}
private void validateHasPermissions() {
......@@ -212,7 +213,6 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
Toast.makeText(MainActivity.this, getResources().getString(R.string.connection_error), Toast.LENGTH_SHORT).show();
}
}
}
@Override
......@@ -238,7 +238,6 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
if (hasCardUid) {
Log.d(TAG, "---> Send to UI Card Found");
CardInfoCommand command = new CardInfoCommand(reader.myReader);
Log.e("myReader", "Myreader : " + reader.myReader);
......@@ -303,8 +302,12 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
@Override
public void onCardDetected(CardInfo cardInfo) {
runOnUiThread(() -> MainActivity.this.onBalanceInfoAvailable(cardInfo));
if (!execute.isSuccess()) {
cardProcessor.updateBalanceBri(newIntent, "1");
if (MyApp.idDriver == 1) {
cardProcessor.updateBalance(cardInfo, 1, newIntent);
}else{
if (!execute.isSuccess()) {
cardProcessor.updateBalanceBri(newIntent, "1");
}
}
}
......@@ -313,6 +316,11 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
runOnUiThread(() -> MainActivity.this.onNFcCardNotSupported(errorCode));
}
}, ApiUtils.prod_environment, MyConstant.enabledBri);
if (MyApp.idDriver == 1) {
cardProcessor.getBalance();
}
}
@Override
......
app/src/main/java/com/mdd/updateaja/MyApp.java
View file @ 4937c98b
......@@ -13,6 +13,7 @@ import com.bugfender.sdk.Bugfender;
import com.mdd.aar.deviceid.AarDeviceId;
import com.mdd.aar.deviceid.DeviceEnvironment;
import com.mdd.aar.deviceid.exceptions.DeviceNotRegisteredException;
import com.mdd.topupUnik.ubal.ApiUtils;
import com.mdd.topupUnik.ubal.InitReader;
import com.medicom.dudikov.mybanklibrary.halDriver;
import com.medicom.dudikov.mybanklibrary.nativeLib;
......@@ -27,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";
int idDriver = nativeLib.USE_NFC_NATIVE;
public static int idDriver = nativeLib.USE_PAX_ENGGINE;
private InitReader reader;
@Override
......@@ -44,61 +45,61 @@ public class MyApp extends Application {
ConfigService configService = new ConfigService();
configService.setMid(MyConstant.MID);
configService.setToken(MyConstant.TOKEN);
configService.setEnvironment(0);
if (idDriver == 1) {
// configService.setTid("1234");
TelephonyManager telephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (checkSelfPermission(Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
Toast.makeText(this, "Please grant permission", Toast.LENGTH_SHORT).show();
return;
} else {
AarDeviceId aarDeviceId = new AarDeviceId(this);
String deviceId = "";
try {
deviceId = aarDeviceId.getDeviceId();
Log.d("deviceId", deviceId);
} catch (DeviceNotRegisteredException e) {
aarDeviceId.init(accessToken, DeviceEnvironment.PROD);
}
configService.setTid(deviceId);
MDDService initialize = MDDService.with(this, configService);
if (initialize.isValid()) {
reader = initialize.getInitReader();
// listener.onInitReaderComplete(reader);
Log.d("reader", String.valueOf(reader));
Log.d("MyApp", "--> Build Version");
Toast.makeText(this, "Aktivasi library sukses", Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(this, "Library belum aktif", Toast.LENGTH_SHORT).show();
}
}
} else {
AarDeviceId aarDeviceId = new AarDeviceId(this);
String deviceId = "";
try {
deviceId = aarDeviceId.getDeviceId();
} catch (DeviceNotRegisteredException e) {
aarDeviceId.init(accessToken, DeviceEnvironment.PROD);
}
configService.setTid(deviceId);
MDDService initialize = MDDService.with(this, configService);
if (initialize.isValid()) {
Log.d("MyApp", "--> aardeviceid");
reader = initialize.getInitReader();
Toast.makeText(this, "Aktivasi library sukses", Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(this, "Library belum aktif", Toast.LENGTH_SHORT).show();
}
}
} else {
configService.setEnvironment(ApiUtils.prod_environment);
// if (idDriver == 1) {
//// configService.setTid("1234");
// TelephonyManager telephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
// if (checkSelfPermission(Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
// Toast.makeText(this, "Please grant permission", Toast.LENGTH_SHORT).show();
// return;
// } else {
// AarDeviceId aarDeviceId = new AarDeviceId(this);
// String deviceId = "";
// try {
// deviceId = aarDeviceId.getDeviceId();
// Log.d("deviceId", deviceId);
// } catch (DeviceNotRegisteredException e) {
// aarDeviceId.init(accessToken, DeviceEnvironment.PROD);
// }
//
// configService.setTid(deviceId);
//
// MDDService initialize = MDDService.with(this, configService);
// if (initialize.isValid()) {
// reader = initialize.getInitReader();
//// listener.onInitReaderComplete(reader);
// Log.d("reader", String.valueOf(reader));
// Log.d("MyApp", "--> Build Version");
// Toast.makeText(this, "Aktivasi library sukses", Toast.LENGTH_SHORT).show();
// } else {
// Toast.makeText(this, "Library belum aktif", Toast.LENGTH_SHORT).show();
// }
// }
// } else {
// AarDeviceId aarDeviceId = new AarDeviceId(this);
// String deviceId = "";
// try {
// deviceId = aarDeviceId.getDeviceId();
// } catch (DeviceNotRegisteredException e) {
// aarDeviceId.init(accessToken, DeviceEnvironment.PROD);
// }
//
// configService.setTid(deviceId);
//
// MDDService initialize = MDDService.with(this, configService);
// if (initialize.isValid()) {
// Log.d("MyApp", "--> aardeviceid");
// reader = initialize.getInitReader();
// Toast.makeText(this, "Aktivasi library sukses", Toast.LENGTH_SHORT).show();
// } else {
// Toast.makeText(this, "Library belum aktif", Toast.LENGTH_SHORT).show();
// }
// }
//
// } else {
Log.d("lariKemana", "Lari ke else bro");
new RxReader().initEdcReader(this, nativeLib.USE_NFC_NATIVE)
new RxReader().initEdcReader(this, idDriver)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new SingleObserver<InitReader>() {
......@@ -120,7 +121,7 @@ public class MyApp extends Application {
}
});
}
// }
}
public InitReader getReader() {
......
app/src/main/java/com/mdd/updateaja/MyConstant.java
View file @ 4937c98b
package com.mdd.updateaja;
import com.medicom.dudikov.mybanklibrary.nativeLib;
public class MyConstant {
public static boolean enabledBri = true;
public static boolean enabledBri = false;
//prod
public static String MID = "49df5f81d59fae23ec6f542372fc9497";
public static String TOKEN = "82ae0ec8da26bca26d3540b08defc17d";
......
app/src/main/java/com/mdd/updateaja/RxReader.java
View file @ 4937c98b
......@@ -6,6 +6,7 @@ import android.provider.Settings;
import com.mdd.aar.deviceid.AarDeviceId;
import com.mdd.aar.deviceid.DeviceEnvironment;
import com.mdd.aar.deviceid.exceptions.DeviceNotRegisteredException;
import com.mdd.topupUnik.ubal.ApiUtils;
import com.mdd.topupUnik.ubal.InitDebugCertificate;
import com.mdd.topupUnik.ubal.InitReader;
import com.medicom.dudikov.mybanklibrary.nativeLib;
......@@ -37,7 +38,7 @@ public class RxReader {
configService.setMid(MyConstant.MID);
configService.setTid(androidId);
configService.setToken(MyConstant.TOKEN);
configService.setEnvironment(0);
configService.setEnvironment(ApiUtils.prod_environment);
LibraryConfig config = new LibraryConfig(
configService.getMid(),
configService.getTid(),
......
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