|
@@ -22,8 +22,9 @@ public class ScanActivity extends LFScanProcessing {
|
22
|
22
|
public static final String ID_PERMIT = "id_permit";
|
23
|
23
|
public static final String ID_DEVICE = "id_device";
|
24
|
24
|
public static final String ID_CHECK_TYPE = "id_check_type";
|
|
25
|
+ public static final String CHECK_TYPE_NAME = "check_type_name";
|
25
|
26
|
|
26
|
|
- private String idPermit, idDevice, idCheckType, longLat;
|
|
27
|
+ private String idPermit, idDevice, idCheckType, checkTypeName, longLat;
|
27
|
28
|
private ActivityScanBinding binding;
|
28
|
29
|
private FusedLocationProviderClient locationClient;
|
29
|
30
|
|
|
@@ -42,6 +43,7 @@ public class ScanActivity extends LFScanProcessing {
|
42
|
43
|
idPermit = getIntent().getExtras().getString(ID_PERMIT);
|
43
|
44
|
idDevice = getIntent().getExtras().getString(ID_DEVICE);
|
44
|
45
|
idCheckType = String.valueOf(getIntent().getExtras().getInt(ID_CHECK_TYPE));
|
|
46
|
+ checkTypeName = getIntent().getExtras().getString(CHECK_TYPE_NAME);
|
45
|
47
|
}
|
46
|
48
|
|
47
|
49
|
locationClient = LocationServices.getFusedLocationProviderClient(this);
|
|
@@ -62,6 +64,7 @@ public class ScanActivity extends LFScanProcessing {
|
62
|
64
|
intent.putExtra(ScanResultActivity.ID_PERMIT, idPermit);
|
63
|
65
|
intent.putExtra(ScanResultActivity.ID_DEVICE, idDevice);
|
64
|
66
|
intent.putExtra(ScanResultActivity.ID_CHECK_TYPE, idCheckType);
|
|
67
|
+ intent.putExtra(ScanResultActivity.CHECK_TYPE_NAME, checkTypeName);
|
65
|
68
|
intent.putExtra(ScanResultActivity.LOCATION, longLat);
|
66
|
69
|
startActivityForResult(intent, 1);
|
67
|
70
|
}
|
|
@@ -101,8 +104,7 @@ public class ScanActivity extends LFScanProcessing {
|
101
|
104
|
double latitude = location.getLatitude();
|
102
|
105
|
double longitude = location.getLongitude();
|
103
|
106
|
longLat = longitude + "," + latitude;
|
104
|
|
- System.out.println("DEVELOPER Location : " + location.getLatitude() + " , " + location.getLongitude());
|
105
|
|
- System.out.println("DEVELOPER Location : " + longLat);
|
|
107
|
+ Timber.d("DEVELOPER Location : " + location.getLatitude() + " , " + location.getLongitude());
|
106
|
108
|
}
|
107
|
109
|
});
|
108
|
110
|
}
|