diff --git a/app/build.gradle b/app/build.gradle index 2f5d62c..44f049a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ android { minSdk 26 targetSdk 30 versionCode 1 - versionName "0.5.1" + versionName "0.5.2" configurations.all { resolutionStrategy { diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 16c8e07..7b9dab4 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "attributes": [], "versionCode": 1, - "versionName": "0.5.1", + "versionName": "0.5.2", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java b/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java index ad6c9ce..faab0bd 100644 --- a/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java +++ b/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java @@ -58,6 +58,8 @@ import com.google.android.gms.location.SettingsClient; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.tasks.OnFailureListener; import com.google.android.gms.tasks.OnSuccessListener; +import com.google.firebase.database.DatabaseReference; +import com.google.firebase.database.FirebaseDatabase; import com.sjapps.library.customdialog.BasicDialog; import com.sjapps.library.customdialog.DialogButtonEvents; import com.sjapps.library.customdialog.SJDialog; @@ -119,7 +121,6 @@ public class OrderDetailActivity extends AppCompatActivity { initComponent(); initData(); - getFCMTokenUser(); @@ -142,40 +143,38 @@ public class OrderDetailActivity extends AppCompatActivity { btn_shipping.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (Common.CURRENT_ORDER == null) { - //Change order status - FoodApiToken.apiService.changeStatusOrder(order.getUser().getId(), order.getId(), "SHIPPING").enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - if(response.code() == 200){ - //If success + startLocationService(); - LatLng latLng = new LatLng(order.getLat(), order.getLng()); - addGeofence(latLng, GEOFENCE_RADIUS); + //Change order status + FoodApiToken.apiService.changeStatusOrder(order.getUser().getId(), order.getId(), "SHIPPING").enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if(response.code() == 200){ + //If success - Common.CURRENT_ORDER = order; + LatLng latLng = new LatLng(order.getLat(), order.getLng()); + addGeofence(latLng, GEOFENCE_RADIUS); - startLocationService(); + Common.CURRENT_ORDER = order; - Intent intent = new Intent(Intent.ACTION_VIEW, - Uri.parse("google.navigation:q=" + order.getLat() + "," + order.getLng() + "&mode=l")); - intent.setPackage("com.google.android.apps.maps"); - startActivity(intent); - } else { - //If error - Toast.makeText(OrderDetailActivity.this, "", Toast.LENGTH_SHORT).show(); - } + + + Intent intent = new Intent(Intent.ACTION_VIEW, + Uri.parse("google.navigation:q=" + order.getLat() + "," + order.getLng() + "&mode=l")); + intent.setPackage("com.google.android.apps.maps"); + startActivity(intent); + } else { + //If error + Toast.makeText(OrderDetailActivity.this, "Đã có lỗi xảy ra! Mã lỗi: " + response.code(), Toast.LENGTH_SHORT).show(); } + } - @Override - public void onFailure(Call call, Throwable t) { - Toast.makeText(OrderDetailActivity.this, Common.ERROR_CONNECT_SERVER, Toast.LENGTH_SHORT).show(); - } - }); - } else{ - Common.showErrorDialog(OrderDetailActivity.this, "Không thể lấy được thông tin đơn, vui lòng thử lại sau!"); - } + @Override + public void onFailure(Call call, Throwable t) { + Toast.makeText(OrderDetailActivity.this, Common.ERROR_CONNECT_SERVER, Toast.LENGTH_SHORT).show(); + } + }); } }); @@ -305,6 +304,14 @@ public class OrderDetailActivity extends AppCompatActivity { @Override public void onResponse(Call call, Response response) { if(response.code() == 200){ + + //Remove position on database + FirebaseDatabase database = FirebaseDatabase.getInstance(); + DatabaseReference orderDatabase = database.getReference("Order"); + + orderDatabase.child(order.getOrderTrackingNumber()).removeValue(); + + //Show notification new AestheticDialog.Builder(OrderDetailActivity.this, DialogStyle.TOASTER, DialogType.SUCCESS) .setTitle("THÔNG BÁO!") .setMessage("Đã thay đổi trạng thái đơn thành công!") @@ -587,6 +594,8 @@ public class OrderDetailActivity extends AppCompatActivity { protected void onResume() { super.onResume(); + stopLocationService(); + if(Common.CURRENT_LOCATION != null){ changeLayoutButton(Common.CURRENT_LOCATION.getLatitude(), Common.CURRENT_LOCATION.getLongitude()); } diff --git a/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/CancelOrder.java b/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/CancelOrder.java index 573dd63..05ceb7a 100644 --- a/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/CancelOrder.java +++ b/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/CancelOrder.java @@ -33,8 +33,8 @@ import retrofit2.Response; public class CancelOrder extends Fragment { private static int CURRENT_PAGE = 0; private static final int PAGE_SIZE = 8; - private static final String SORT_BY = "id"; - private static final String SORT_DIR = "asc"; + private static final String SORT_BY = "orderTime"; + private static final String SORT_DIR = "desc"; private static boolean LAST_PAGE = false; private final List listOrders = new ArrayList<>(); RecyclerView recyclerView; diff --git a/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/CompletedOrder.java b/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/CompletedOrder.java index 7344fb7..b877f46 100644 --- a/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/CompletedOrder.java +++ b/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/CompletedOrder.java @@ -33,8 +33,8 @@ import retrofit2.Response; public class CompletedOrder extends Fragment { private static int CURRENT_PAGE = 0; private static final int PAGE_SIZE = 8; - private static final String SORT_BY = "id"; - private static final String SORT_DIR = "asc"; + private static final String SORT_BY = "orderTime"; + private static final String SORT_DIR = "desc"; private static boolean LAST_PAGE = false; private final List listOrders = new ArrayList<>(); RecyclerView recyclerView; diff --git a/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/ConfirmedOrder.java b/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/ConfirmedOrder.java index 5bbb67f..0ca15cb 100644 --- a/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/ConfirmedOrder.java +++ b/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/ConfirmedOrder.java @@ -33,8 +33,8 @@ import retrofit2.Response; public class ConfirmedOrder extends Fragment { private static int CURRENT_PAGE = 0; private static final int PAGE_SIZE = 8; - private static final String SORT_BY = "id"; - private static final String SORT_DIR = "asc"; + private static final String SORT_BY = "orderTime"; + private static final String SORT_DIR = "desc"; private static boolean LAST_PAGE = false; private final List listOrders = new ArrayList<>(); RecyclerView recyclerView;