nezumi/Foodify-Shipper
1
0
Fork 0
mirror of https://github.com/Nezumi-2711/Foodify-Shipper.git synced 2026-09-22 13:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update new version

Browse Source
This commit is contained in:
Nezumi
2023-04-26 11:23:42 +07:00
parent aea02984ee
commit 893f30839e
6 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle
+1 -1
View File
@@ -19,7 +19,7 @@ android {
minSdk 26
targetSdk 30
versionCode 1
versionName "0.5.1"
versionName "0.5.2"
configurations.all {
resolutionStrategy {
app/release/output-metadata.json
+1 -1
View File
@@ -12,7 +12,7 @@
"filters": [],
"attributes": [],
"versionCode": 1,
"versionName": "0.5.1",
"versionName": "0.5.2",
"outputFile": "app-release.apk"
}
],
app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java
+16 -7
View File
@@ -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,7 +143,8 @@ public class OrderDetailActivity extends AppCompatActivity {
btn_shipping.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (Common.CURRENT_ORDER == null) {
startLocationService();
//Change order status
FoodApiToken.apiService.changeStatusOrder(order.getUser().getId(), order.getId(), "SHIPPING").enqueue(new Callback<CustomResponse>() {
@@ -156,7 +158,7 @@ public class OrderDetailActivity extends AppCompatActivity {
Common.CURRENT_ORDER = order;
startLocationService();
Intent intent = new Intent(Intent.ACTION_VIEW,
Uri.parse("google.navigation:q=" + order.getLat() + "," + order.getLng() + "&mode=l"));
@@ -164,7 +166,7 @@ public class OrderDetailActivity extends AppCompatActivity {
startActivity(intent);
} else {
//If error
Toast.makeText(OrderDetailActivity.this, "", Toast.LENGTH_SHORT).show();
Toast.makeText(OrderDetailActivity.this, "Đã có lỗi xảy ra! Mã lỗi: " + response.code(), Toast.LENGTH_SHORT).show();
}
}
@@ -173,9 +175,6 @@ public class OrderDetailActivity extends AppCompatActivity {
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!");
}
}
});
@@ -305,6 +304,14 @@ public class OrderDetailActivity extends AppCompatActivity {
@Override
public void onResponse(Call<CustomResponse> call, Response<CustomResponse> 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());
}
app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/CancelOrder.java
+2 -2
View File
@@ -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<Order> listOrders = new ArrayList<>();
RecyclerView recyclerView;
app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/CompletedOrder.java
+2 -2
View File
@@ -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<Order> listOrders = new ArrayList<>();
RecyclerView recyclerView;
app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/ConfirmedOrder.java
+2 -2
View File
@@ -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<Order> listOrders = new ArrayList<>();
RecyclerView recyclerView;