diff --git a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/ContainerDetailActivity.java b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/ContainerDetailActivity.java index 13201c5..3be82af 100644 --- a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/ContainerDetailActivity.java +++ b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/ContainerDetailActivity.java @@ -161,7 +161,7 @@ public class ContainerDetailActivity extends AppCompatActivity { //Log.d("API", "Status: " + pickResponse.getStatus()); Toast.makeText(this, pickResponse.getMessage(), Toast.LENGTH_SHORT).show(); - ContainerWorkflow containerToUpdate = driverResponse.getContainerWorkflowData().get(currentPosition); + ContainerWorkflow containerToUpdate = getContainerByNo(driverResponse.getContainerWorkflowData(), containerWorkflow.getContainerNo()); // Modify the values @@ -172,7 +172,7 @@ public class ContainerDetailActivity extends AppCompatActivity { DriverResponse driverResponse1 = Helper.getPreferenceObjectJson(getApplicationContext(), "DriverResponse"); ContainerWorkflow containerToUpdate1 = driverResponse1.getContainerWorkflowData().get(currentPosition); - containerWorkflow = driverResponse1.getContainerWorkflowData().get(currentPosition); + containerWorkflow = getContainerByNo(driverResponse1.getContainerWorkflowData(), containerWorkflow.getContainerNo());//driverResponse1.getContainerWorkflowData().get(currentPosition); //Log.e("driverResponse1: ",""+driverResponse1.getContainerWorkflowData()); /*Log.e("After Update: ","****************************************"); @@ -218,20 +218,19 @@ public class ContainerDetailActivity extends AppCompatActivity { }); setContainerDetail(containerWorkflow); + } + public ContainerWorkflow getContainerByNo(List containerList, String containerNo) { + for (ContainerWorkflow container : containerList) { + if (container.getContainerNo().equals(containerNo)) { + return container; + } + } + return null; } private void setContainerDetail(ContainerWorkflow containerWorkflow) { - /* Log.e("Before Update: ","****************************************"); - Log.e("containerToUpdate1-ContainerNo: ",""+containerWorkflow.getContainerNo()); - Log.e("containerToUpdate1-OriginId: ",""+containerWorkflow.getOriginId()); - Log.e("containerToUpdate1-origin: ",""+containerWorkflow.getOrigin()); - Log.e("containerToUpdate1-destination: ",""+containerWorkflow.getDestination()); - Log.e("containerToUpdate1-destinationId: ",""+containerWorkflow.getDestinationId()); - Log.e("containerToUpdate1-Status: ",""+containerWorkflow.getCurrentStatus()); - Log.e("containerToUpdate1-truckLoadId: ",""+containerWorkflow.getTruckLoadId());*/ - container_no.setText(Html.fromHtml("Container No: " + containerWorkflow.getContainerNo(), Html.FROM_HTML_MODE_LEGACY)); container_origin.setText(Html.fromHtml("Terminal Info: " + containerWorkflow.getOrigin(), Html.FROM_HTML_MODE_LEGACY)); containerDestination.setText(Html.fromHtml("Destination: " + containerWorkflow.getDestination(), Html.FROM_HTML_MODE_LEGACY)); @@ -252,14 +251,14 @@ public class ContainerDetailActivity extends AppCompatActivity { case "PICKED": - Preference.setMyIntPref(Helper.project_file, "CurrentPosition",this,3); + Preference.setMyIntPref(Helper.project_file, "CurrentPosition",this,2); btnMarkPicked.setBackgroundColor(ContextCompat.getColor(this, R.color.picked_color)); btnMarkPicked.setText("Mark it Dropped"); currentStatus = "DROPPED"; break; case "DROPPED": - Preference.setMyIntPref(Helper.project_file, "CurrentPosition",this,4); + Preference.setMyIntPref(Helper.project_file, "CurrentPosition",this,3); btnMarkPicked.setBackgroundColor(ContextCompat.getColor(this, R.color.dropped_color)); btnMarkPicked.setText("Mark it Completed"); currentStatus = "COMPLETED"; diff --git a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/HomeActivity.java b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/HomeActivity.java index 9d13a85..edc7d53 100644 --- a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/HomeActivity.java +++ b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/HomeActivity.java @@ -235,6 +235,7 @@ public class HomeActivity extends AppCompatActivity implements SelectListener { //Toast.makeText(con, "Ok", Toast.LENGTH_SHORT).show(); Preference.setMyBooleanPref(Helper.project_file, "isLoggedIn", getApplicationContext(), false); + Preference.setMyIntPref(Helper.project_file, "CurrentPosition",getApplicationContext(),0); finish(); Intent i = new Intent(HomeActivity.this, LoginActivity.class); @@ -280,5 +281,19 @@ public class HomeActivity extends AppCompatActivity implements SelectListener { } else { txtNoData.setVisibility(View.VISIBLE); } + + if (item.length > 0) { + boolean keyExists = Preference.containsKey(Helper.project_file, "CurrentPosition", this); + if (keyExists) { + Log.e("Key-Exist: ", "True"); + currentPositionStatus = Preference.getMyIntPref(Helper.project_file, "CurrentPosition", this); + autoCompleteTextView.setText(item[currentPositionStatus], false); + filterList(item[currentPositionStatus]); + } else { + Log.e("Key-Exist: ", "False"); + autoCompleteTextView.setText(item[0], false); + filterList(item[currentPositionStatus]); + } + } } } \ No newline at end of file diff --git a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/apiservice/RetrofitClient.java b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/apiservice/RetrofitClient.java index a47f68a..549a42b 100644 --- a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/apiservice/RetrofitClient.java +++ b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/apiservice/RetrofitClient.java @@ -11,7 +11,7 @@ import retrofit2.converter.gson.GsonConverterFactory; public class RetrofitClient { - private final static String BASE_URL = "http://192.168.90.228:8081/cosmos/";//"http://192.168.90.27:8080/uind/"; + private final static String BASE_URL = "http://192.168.90.228:8080/cosmos/";//"http://192.168.90.27:8080/uind/"; private static Retrofit retrofit; @@ -26,9 +26,9 @@ public class RetrofitClient { try { OkHttpClient okHttpClient = new OkHttpClient.Builder() - .connectTimeout(30, TimeUnit.SECONDS) - .readTimeout(30, TimeUnit.SECONDS) - .writeTimeout(30, TimeUnit.SECONDS) + .connectTimeout(40, TimeUnit.SECONDS) + .readTimeout(40, TimeUnit.SECONDS) + .writeTimeout(40, TimeUnit.SECONDS) .build(); retrofit = new Retrofit.Builder() diff --git a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/viewModels/HomeViewModel.java b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/viewModels/HomeViewModel.java index 1ae052e..77f0d1b 100644 --- a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/viewModels/HomeViewModel.java +++ b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/viewModels/HomeViewModel.java @@ -2,6 +2,7 @@ package com.utopiaindustries.selftrucking.Activities.dashboardScreens.viewModels import android.util.Log; +import androidx.annotation.NonNull; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; @@ -47,9 +48,9 @@ public class HomeViewModel extends ViewModel { isLoading.setValue(true); apiService.pickTruckLoad(pickupRequest).enqueue(new Callback() { @Override - public void onResponse(Call call, Response response) { + public void onResponse(@NonNull Call call, @NonNull Response response) { isLoading.setValue(false); - if (response.isSuccessful()) { + if (response.isSuccessful() && response.body() != null) { userLiveData.setValue(response.body()); } else { @@ -58,7 +59,7 @@ public class HomeViewModel extends ViewModel { } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(@NonNull Call call, @NonNull Throwable t) { isLoading.setValue(false); errorLiveData.setValue(t.getMessage()); } diff --git a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/loginScreens/LoginActivity.java b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/loginScreens/LoginActivity.java index 55340eb..6292ee9 100644 --- a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/loginScreens/LoginActivity.java +++ b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/loginScreens/LoginActivity.java @@ -108,7 +108,7 @@ public class LoginActivity extends AppCompatActivity { }*/ if (tfEmail.getText().toString().isEmpty()) { - message = "Please enter email."; + message = "Please enter user name."; returnValue = false; } diff --git a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/loginScreens/viewModels/LoginViewModel.java b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/loginScreens/viewModels/LoginViewModel.java index 5a73cae..2b4edf6 100644 --- a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/loginScreens/viewModels/LoginViewModel.java +++ b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/loginScreens/viewModels/LoginViewModel.java @@ -45,7 +45,7 @@ public class LoginViewModel extends ViewModel { @Override public void onResponse(Call call, Response response) { isLoading.setValue(false); - if (response.isSuccessful()) { + if (response.isSuccessful() && response.body() != null) { userLiveData.setValue(response.body()); } else { errorLiveData.setValue(response.message()); diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 55da5d7..4b11fdf 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -5,7 +5,7 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" + android:background="@color/grey_100" tools:context=".Activities.loginScreens.LoginActivity">