thomas
/
ODP-AppVehOwn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added new Project for asn files

This commit is contained in:
yb 2021-05-14 15:42:49 +02:00
parent f98174f298
commit 5aa1c145cf
10 changed files with 66 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/gradle.xml
View File

@ -15,6 +15,7 @@
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/services" />
<option value="$PROJECT_DIR$/services/appserverclient" />
<option value="$PROJECT_DIR$/services/asn" />
<option value="$PROJECT_DIR$/services/core" />
<option value="$PROJECT_DIR$/services/localstorage" />
</set>

24
app/src/main/java/eu/csc/personalapp/services/ServiceManager.java
View File

@ -1,10 +1,15 @@
package eu.csc.personalapp.services;
import android.content.Context;
import android.util.Log;
import eu.csc.personalapp.data.model.Event;
import eu.csc.personalapp.data.model.IRepairShop;
import eu.csc.personalapp.data.model.RepairShop;
import eu.csc.personalapp.services.persistence.ExampleDataClient;
import eu.csc.personalapp.services.persistence.PersistenceFactory;
import eu.csc.personalapp.services.persistence.entity.lease.LeaseEntity;
import eu.csc.personalapp.services.rest.data.GrantedLeaseResponse;
import lombok.var;
import java.util.ArrayList;
import java.util.List;
@ -14,6 +19,7 @@ public class ServiceManager {
public static final ArrayList<IRepairShop> exampleRepairShops;
private static final String TAG = ServiceManager.class.getSimpleName();
static {
@ -45,4 +51,22 @@ public class ServiceManager {
return exampleRepairShops;
}
public void storeLeaseResponse(GrantedLeaseResponse leaseResponse){
Log.d(TAG, "START SAVING LEASE");
LeaseEntity leaseEntity = new LeaseEntity();
leaseEntity.setVehicle(leaseResponse.getVehicle());
leaseEntity.setAppointmentStart(leaseResponse.getValidFrom());
leaseEntity.setAppointmentEnd(leaseResponse.getValidTill());
leaseEntity.setToken(leaseResponse.getToken());
leaseEntity.setToken(leaseResponse.getVehicle());
var db = PersistenceFactory.generateDatabase(this.context);
db.leaseDao().insert(leaseEntity);
}
}

5
app/src/main/java/eu/csc/personalapp/services/persistence/ExampleDataClient.java
View File

@ -1,6 +1,6 @@
package eu.csc.personalapp.services.persistence;
import asn.GTLease.Lease;
import eu.csc.personalapp.data.model.*;
import java.io.File;
@ -37,6 +37,7 @@ public class ExampleDataClient implements IPersistenceClient {
}
/*
public static Lease getExampleLease() {
Date startDate = new GregorianCalendar(2021, Calendar.MAY, 12, 16, 30).getTime();
Date endDate = new GregorianCalendar(2021, Calendar.MAY, 12, 18, 0).getTime();
@ -44,7 +45,7 @@ public class ExampleDataClient implements IPersistenceClient {
lease.setSystems(Arrays.asList("obd-ii", "imu"));
return lease;
}
*/
public static final VehicleSystem System_GNSS = new VehicleSystem("gnss", "GNSS");
public static final VehicleSystem System_IMU = new VehicleSystem("imu", "IMU");
public static final VehicleSystem System_OBDII = new VehicleSystem("obd-ii", "OBD II");

5
app/src/main/java/eu/csc/personalapp/services/persistence/PersistenceFactory.java
View File

@ -4,6 +4,7 @@ import android.app.Activity;
import android.content.Context;
import android.util.Log;
import androidx.room.Room;
import eu.csc.personalapp.services.persistence.entity.lease.LeaseEntity;
import static eu.csc.personalapp.services.persistence.PersonalAppDatabase.dbName;
@ -15,7 +16,7 @@ public class PersistenceFactory {
return new ExampleDataClient();
}
private static PersonalAppDatabase generateDatabase(Context context){
public static PersonalAppDatabase generateDatabase(Context context){
PersonalAppDatabase db = Room.databaseBuilder(context,
PersonalAppDatabase.class, dbName).build();
@ -24,6 +25,8 @@ public class PersistenceFactory {
}
public static void LoadExampleData(Context context){
Log.d(TAG, "START LOADING EXAMPLE DATA");

1
app/src/main/java/eu/csc/personalapp/services/rest/data/GrantedLeaseResponse.java
View File

@ -21,6 +21,7 @@ public class GrantedLeaseResponse implements Serializable {
private Date validTill;
private String repairshop;
private String token;

20
app/src/main/java/eu/csc/personalapp/ui/tp/TreatmentPlanFragment.java
View File

@ -3,6 +3,7 @@ package eu.csc.personalapp.ui.tp;
import android.content.Intent;
import android.os.Bundle;
import android.text.method.ScrollingMovementMethod;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -15,10 +16,12 @@ import androidx.navigation.fragment.NavHostFragment;
import androidx.recyclerview.widget.RecyclerView;
import eu.csc.personalapp.R;
import eu.csc.personalapp.data.model.TreatmentPlan;
import eu.csc.personalapp.services.ServiceManager;
import eu.csc.personalapp.services.persistence.PersistenceFactory;
import eu.csc.personalapp.services.rest.RetrofitApiClientFactory;
import eu.csc.personalapp.services.rest.data.GrantedLeaseRequest;
import eu.csc.personalapp.services.rest.data.GrantedLeaseResponse;
import lombok.var;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
@ -32,6 +35,7 @@ import java.util.TimeZone;
public class TreatmentPlanFragment extends Fragment {
private static final SimpleDateFormat dateFormat;
private static final String TAG = TreatmentPlanFragment.class.getSimpleName();
static {
dateFormat = new SimpleDateFormat("yyyy/dd/MM HH:mm", Locale.ENGLISH);
@ -117,13 +121,27 @@ public class TreatmentPlanFragment extends Fragment {
Callback<GrantedLeaseResponse> callback = new Callback<GrantedLeaseResponse>() {
@Override
public void onResponse(Call<GrantedLeaseResponse> call, Response<GrantedLeaseResponse> response) {
Log.d(TAG, "");
var serviceManager = ServiceManager.getInstance(getContext());
var leaseObj = response.body();
//ToDo store Lease local
serviceManager.storeLeaseResponse(leaseObj);
try{
}catch (Exception ex){
}
viewModel.setLease(response.body());
NavHostFragment.findNavController(TreatmentPlanFragment.this).navigate(R.id.action_TreatmentPlanFragment_to_AcceptTreatmentPlanFragment);
}
@Override
public void onFailure(Call<GrantedLeaseResponse> call, Throwable t) {
Log.d(TAG, t.toString());
}
};
call.enqueue(callback);

1
services/asn/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/build

8
services/asn/build.gradle Normal file
View File

@ -0,0 +1,8 @@
plugins {
id 'java-library'
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

4
services/asn/src/main/java/eu/csc/asn/MyClass.java Normal file
View File

@ -0,0 +1,4 @@
package eu.csc.asn;
public class MyClass {
}

1
settings.gradle
View File

@ -1,3 +1,4 @@
include ':services:asn'
include ':services:core'