-Add id user who scan

-Fix device id using IMEI

app/src/main/java/com/fusi24/rfid/data/DataManager.java

@@ -36,8 +36,8 @@ public class DataManager {
         return restService.getDataDevice(deviceId, expand);
     }
 
-    public Observable<DataResultRfid> checkRfidCard(String numberRfid, Integer permitId, String rfidDeviceId, Integer checkTypeId, String longLat, String[] expand) {
-        return restService.checkRfidCard(numberRfid, permitId, rfidDeviceId, checkTypeId, longLat, expand);
+    public Observable<DataResultRfid> checkRfidCard(String numberRfid, Integer permitId, String rfidDeviceId, Integer checkTypeId, String longLat, Integer userId, String[] expand) {
+        return restService.checkRfidCard(numberRfid, permitId, rfidDeviceId, checkTypeId, longLat, userId, expand);
     }
 
 }

app/src/main/java/com/fusi24/rfid/data/api/RestService.java

@@ -43,6 +43,7 @@ public interface RestService {
                                              @Query("rfidDeviceId") String rfidDeviceId,
                                              @Query("checkTypeId") Integer checkTypeId,
                                              @Query("longLat") String longLat,
+                                             @Query("checkedBy") Integer userId,
                                              @Query("expand") String[] expand);
 
 }

app/src/main/java/com/fusi24/rfid/ui/home/HomeActivity.java

@@ -133,7 +133,7 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
     @SuppressLint("SetTextI18n")
     private void loadingData() {
         // Build.DISPLAY is different
-        idDevice = "RFID" + "-" + Build.ID + "-" + Build.DEVICE + "-" + uniqueId;
+        idDevice = "RFID" + "-" + Build.ID + "-" + uniqueId;
         binding.tvRfidGunId.setText(idDevice);
         binding.tvRfidCardNumber.setText(getSessionManager().getUserRfidNumber());
         binding.tvEmployeeName.setText(getSessionManager().getEmployeeName());

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

@@ -112,7 +112,11 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
     private void loadingdata() {
         problemsList.clear();
         String[] expand = {"employee.company, employee.structuralPosition, employee.functionalPosition, problems.documentType.category,problems.documentType.group"};
-        presenter.checkRfidCard(numberRfid, Integer.valueOf(idPermit), idDevice, Integer.valueOf(idCheckType), longLat, expand);
+
+        String bebas = "Location = " + longLat;
+        Toast.makeText(this, bebas, Toast.LENGTH_LONG).show();
+
+        presenter.checkRfidCard(numberRfid, Integer.valueOf(idPermit), idDevice, Integer.valueOf(idCheckType), longLat, getSessionManager().getUserId(), expand);
     }
 
     private void initEvent() {

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

@@ -18,8 +18,8 @@ class ScanResultPresenter extends BasePresenter<ScanResultView> {
         this.processScheduler = processScheduler;
     }
 
-    void checkRfidCard(String numberRfid, Integer permitId, String rfidDeviceId, Integer checkTypeId, String longLat, String[] expand) {
-        disposable.add(manager.checkRfidCard(numberRfid, permitId, rfidDeviceId, checkTypeId, longLat, expand)
+    void checkRfidCard(String numberRfid, Integer permitId, String rfidDeviceId, Integer checkTypeId, String longLat, Integer userId, String[] expand) {
+        disposable.add(manager.checkRfidCard(numberRfid, permitId, rfidDeviceId, checkTypeId, longLat, userId, expand)
                 .observeOn(androidScheduler)
                 .subscribeOn(processScheduler)
                 .subscribe(dataRfid -> {