Commit 8bf3b372 authored by ganda@mdd.co.id's avatar ganda@mdd.co.id

Merge remote-tracking branch 'origin/dev/master'

# Conflicts:
#	app/src/main/java/id/mdd/implementationpartnerconnect/MainActivity.java
parents 07657d77 3bcd2b52
...@@ -30,6 +30,7 @@ import android.widget.ProgressBar; ...@@ -30,6 +30,7 @@ import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
...@@ -245,6 +246,12 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV ...@@ -245,6 +246,12 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
} }
} }
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
Log.e("requestPermissionResult", "reqCode "+requestCode +" permission "+permissions +" grantResults "+grantResults);
((MyApp) getApplication()).initConfig(this);
}
@Override @Override
protected void onResume() { protected void onResume() {
...@@ -484,52 +491,6 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV ...@@ -484,52 +491,6 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
InitReader paxReader = null; InitReader paxReader = null;
// private void execute() {
// Log.d("Execute", "execute dipanggil");
// AsyncTask.execute(new Runnable() {
// @Override
// public void run() {
// FindCardResponse findCardResponse = cardProcessor.findCardUid();
// String cardUid = findCardResponse.getUid();
// Log.d("cardUid", cardUid);
// boolean hasCardUid = !cardUid.isEmpty();
// if (hasCardUid) {
// Log.d(TAG, "---> Send to UI Card Found");
// runOnUiThread(new Runnable() {
// @Override
// public void run() {
// onNfcCardFound();
// }
// });
//
// CardInfoCommand command = new CardInfoCommand(paxReader.myReader);
//
// final CommandResult<CardInfo> execute = command.execute(findCardResponse);
// CardInfo detectedCardInfo = execute.getResult();
// if (execute.isSuccess()) {
// switch (getCommand()) {
// case MDDCommand.COMMAND_GET_BALANCE:
// cardProcessor.getBalance(detectedCardInfo);
// break;
// case MDDCommand.COMMAND_UPDATE_BALANCE:
// cardProcessor.updateBalance(detectedCardInfo, 1);
// break;
// }
// } else {
// runOnUiThread(() -> {
// MainActivity.this.onUpdateBalanceError("Kartu tidak terdeteksi");
// });
// }
//
//
// } else {
// //wrong card type
// }
// }
// });
// }
@Override @Override
public void onInitReaderComplete(InitReader reader) { public void onInitReaderComplete(InitReader reader) {
paxReader = reader; paxReader = reader;
......
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