-Add alert type in model

-Add dynamic text when status not passed
-Fixing variable name
-Add plugin git version from ajoberstar for easy tag git
-Update soundpool and audio attributes for >= LOLLIPOP

app/build.gradle

@@ -1,5 +1,7 @@
 apply plugin: 'com.android.application'
 
+apply from: '../config/git-version.gradle'
+
 android {
     compileSdkVersion 29
     buildToolsVersion "29.0.2"
@@ -7,8 +9,8 @@ android {
         applicationId "com.fusi24.rfid"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        versionCode gitVersionCode
+        versionName gitVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/com/fusi24/rfid/MainActivity.java

@@ -140,6 +140,17 @@ public class MainActivity extends BaseActivity {
         });
 
         btnScan.setOnClickListener(v -> {
+
+            if (spinnerSite.getSelectedItem() == null){
+                Toast.makeText(this, "Data Site Belum Terpilih", Toast.LENGTH_SHORT).show();
+                return;
+            }
+
+            if (spinnerPermit.getSelectedItem() == null){
+                Toast.makeText(this, "Data Permit Belum Terpilih", Toast.LENGTH_SHORT).show();
+                return;
+            }
+
             Intent intent = new Intent(this, ScanActivity.class);
             intent.putExtra(ScanActivity.ID_SITE, String.valueOf(dataSite.getId()));
             intent.putExtra(ScanActivity.ID_PERMIT, String.valueOf(dataEntryPermit.getId()));

app/src/main/java/com/fusi24/rfid/data/entity/DataResultRfid.java

@@ -6,6 +6,7 @@ public class DataResultRfid {
 
     private DataEmployee employee;
     private Boolean passed;
+    private String alertType;
     private String message;
     private List<DataProblems> problems;
 
@@ -25,6 +26,14 @@ public class DataResultRfid {
         this.passed = passed;
     }
 
+    public String getAlertType() {
+        return alertType;
+    }
+
+    public void setAlertType(String alertType) {
+        this.alertType = alertType;
+    }
+
     public String getMessage() {
         return message;
     }

app/src/main/java/com/fusi24/rfid/ui/ScanActivity.java

@@ -48,18 +48,18 @@ public class ScanActivity extends LFScanProcessing {
             onStop();
     }
 
-    void startInstance(String reception){
+    void startInstance(String rfidCardNumber){
         Intent intent = new Intent(this, ScanResultActivity.class);
         intent.putExtra(ScanResultActivity.ID_SITE, idSite);
         intent.putExtra(ScanResultActivity.ID_PERMIT, idPermit);
-        intent.putExtra(ScanResultActivity.RFID_CARD_NUMBER, reception);
+        intent.putExtra(ScanResultActivity.RFID_CARD_NUMBER, rfidCardNumber);
         startActivityForResult(intent, 1);
     }
 
     @Override
     protected void onDataReceived(byte[] buffer, int size) {
         runOnUiThread(() -> {
-            if (stringReception != null) {
+            if (rfidCardNumber != null) {
                 if (size > 0) {
                     if (size >= 5) {
                         byte[] tempBuf = new byte[size - 4];
@@ -67,14 +67,13 @@ public class ScanActivity extends LFScanProcessing {
                         String temStr = new String(tempBuf);
                         int temInt = Integer.parseInt(temStr, 16);
                         soundpool.play(soundid, 1, 1, 0, 0, 1);
-                        stringReception = Integer.toString(temInt);
+                        rfidCardNumber = Integer.toString(temInt);
 
-                        //Toast.makeText(ScanHomepage.this, "Hasil dari RFID LF: " + stringReception, Toast.LENGTH_LONG).show();
-                        Timber.i("Hasil dari RFID LF: %s", stringReception);
-                        startInstance(stringReception);
+                        Timber.i("Hasil dari RFID LF: %s", rfidCardNumber);
+                        startInstance(rfidCardNumber);
                     } else {
                         // receipt data 4 digit to start
-                        stringReception = new String(buffer, 0, size);
+                        rfidCardNumber = new String(buffer, 0, size);
                     }
                 }
             }

app/src/main/java/com/fusi24/rfid/ui/scanresult/ScanResultActivity.java

@@ -140,8 +140,15 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
             tvProfileStatus.setText(R.string.label_status_passed);
             llProfileStatus.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
         } else {
-            tvProfileStatus.setText(R.string.label_status_not_passed);
-            llProfileStatus.setBackgroundColor(getResources().getColor(R.color.colorRedDark));
+            if (dataResultRfid.getAlertType().equalsIgnoreCase("ERROR")){
+                tvProfileStatus.setText(R.string.label_status_not_passed);
+                llProfileStatus.setBackgroundColor(getResources().getColor(R.color.colorRedDark));
+            }
+
+            if (dataResultRfid.getAlertType().equalsIgnoreCase("WARNING")){
+                tvProfileStatus.setText(R.string.label_status_not_valid);
+                llProfileStatus.setBackgroundColor(getResources().getColor(R.color.colorRedDark));
+            }
         }
 
         problemsList = dataResultRfid.getProblems();

app/src/main/java/com/fusi24/rfid/util/LFScanProcessing.java

@@ -1,7 +1,9 @@
 package com.fusi24.rfid.util;
 
+import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.SoundPool;
+import android.os.Build;
 
 import com.fusi24.rfid.R;
 
@@ -9,11 +11,26 @@ public abstract class LFScanProcessing extends LFSerialPortActivity {
 
     protected int soundid;
     protected SoundPool soundpool = null;
+    protected AudioAttributes attributes = null;
 
-    public String stringReception = "";
+    public String rfidCardNumber = "";
 
     protected void initSound(){
-        soundpool = new SoundPool(1, AudioManager.STREAM_NOTIFICATION, 100);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            attributes = new AudioAttributes.Builder()
+                    .setAllowedCapturePolicy(AudioAttributes.ALLOW_CAPTURE_BY_NONE)
+                    .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                    .setUsage(AudioAttributes.USAGE_NOTIFICATION_EVENT)
+                    .build();
+
+            soundpool = new SoundPool.Builder()
+                    .setMaxStreams(1)
+                    .setAudioAttributes(attributes)
+                    .build();
+        } else {
+            soundpool = new SoundPool(1, AudioManager.STREAM_NOTIFICATION, 100);
+        }
         soundid = soundpool.load(this, R.raw.rfid_beep, 1);
     }
 

app/src/main/res/values/strings.xml

@@ -16,5 +16,6 @@
     <string name="label_scan_other">Scan Other</string>
     <string name="label_status_passed">PASSED</string>
     <string name="label_status_not_passed">NOT PASSED</string>
+    <string name="label_status_not_valid">NOT VALID</string>
 
 </resources>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,7 +18,12 @@ allprojects {
     repositories {
         google()
         jcenter()
-        
+        maven {
+            url 'https://maven.google.com/'
+        }
+        maven {
+            url 'https://jitpack.io'
+        }
     }
 }
 

config/git-version.gradle

@@ -0,0 +1,15 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'org.ajoberstar:grgit:1.5.0'
+    }
+}
+
+ext {
+    git = org.ajoberstar.grgit.Grgit.open(currentDir: projectDir)
+    gitVersionName = git.describe()
+    gitVersionCode = git.tag.list().size() + 1
+    gitVersionCodeTime = git.head().time
+}