From 10350388a794c8cfc3aba9d68ec6e0a473f12a20 Mon Sep 17 00:00:00 2001 From: phanhuuloi27 <73208452+Nezumi2711@users.noreply.github.com> Date: Thu, 16 Jun 2022 14:03:01 +0700 Subject: [PATCH] Fix notification and Order Food --- .../main/java/com/waterbase/foodify/Cart.java | 1 + .../foodify/Service/MyFirebaseMessaging.java | 1 + .../foodifyServer/Common/Common.java | 3 ++- .../waterbase/foodifyServer/Model/Token.java | 3 +++ .../Remote/FCMRetrofitClient.java | 19 +++++++++++++++++++ .../ViewHolder/OrderViewHolder.java | 9 +-------- 6 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Remote/FCMRetrofitClient.java diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/Cart.java b/Foodify/app/src/main/java/com/waterbase/foodify/Cart.java index ee6f5b2..e69d192 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/Cart.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/Cart.java @@ -178,6 +178,7 @@ public class Cart extends AppCompatActivity { //Only run when get result if (response.code() == 200) { if (response.body().success == 1) { + new Database(getBaseContext()).cleanCart(); Toast.makeText(Cart.this, "Đặt hàng thành công!", Toast.LENGTH_SHORT).show(); finish(); } else { diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/Service/MyFirebaseMessaging.java b/Foodify/app/src/main/java/com/waterbase/foodify/Service/MyFirebaseMessaging.java index 690f891..6bc7e4c 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/Service/MyFirebaseMessaging.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/Service/MyFirebaseMessaging.java @@ -16,6 +16,7 @@ import androidx.core.app.NotificationCompat; import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; import com.waterbase.foodify.Home; +import com.waterbase.foodify.OrderStatus; import com.waterbase.foodify.R; public class MyFirebaseMessaging extends FirebaseMessagingService { diff --git a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Common/Common.java b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Common/Common.java index 1fac2f2..26793c0 100644 --- a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Common/Common.java +++ b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Common/Common.java @@ -8,6 +8,7 @@ import android.graphics.Paint; import com.waterbase.foodifyServer.Model.Request; import com.waterbase.foodifyServer.Model.User; import com.waterbase.foodifyServer.Remote.APIService; +import com.waterbase.foodifyServer.Remote.FCMRetrofitClient; import com.waterbase.foodifyServer.Remote.IGeoCoordinates; import com.waterbase.foodifyServer.Remote.RetrofitClient; @@ -24,7 +25,7 @@ public class Common { private static final String fcmUrl = "https://fcm.googleapis.com/"; public static APIService getFCMClient(){ - return RetrofitClient.getClient(fcmUrl).create(APIService.class); + return FCMRetrofitClient.getClient(fcmUrl).create(APIService.class); } public static String coverCodeToStatus(String code){ diff --git a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Model/Token.java b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Model/Token.java index d71a8c1..d4c3e6e 100644 --- a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Model/Token.java +++ b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Model/Token.java @@ -9,6 +9,9 @@ public class Token { this.isServerToken = isServerToken; } + public Token() { + } + public String getToken() { return token; } diff --git a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Remote/FCMRetrofitClient.java b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Remote/FCMRetrofitClient.java new file mode 100644 index 0000000..5863423 --- /dev/null +++ b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Remote/FCMRetrofitClient.java @@ -0,0 +1,19 @@ +package com.waterbase.foodifyServer.Remote; + +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; + +public class FCMRetrofitClient { + private static Retrofit retrofit = null; + + public static Retrofit getClient(String baseUrl) { + if(retrofit == null) { + retrofit = new Retrofit.Builder() + .baseUrl(baseUrl) + .addConverterFactory(GsonConverterFactory.create()) + .build(); + } + + return retrofit; + } +} diff --git a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/ViewHolder/OrderViewHolder.java b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/ViewHolder/OrderViewHolder.java index d33e4da..f7eed9f 100644 --- a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/ViewHolder/OrderViewHolder.java +++ b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/ViewHolder/OrderViewHolder.java @@ -10,8 +10,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.waterbase.foodifyServer.Interface.ItemClickListener; import com.waterbase.foodifyServer.R; -public class OrderViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnCreateContextMenuListener, -View.OnLongClickListener{ +public class OrderViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnCreateContextMenuListener{ public TextView txtOrderId, txtOrderStatus, txtOrderPhone, txtOrderAddress; @@ -27,7 +26,6 @@ View.OnLongClickListener{ itemView.setOnClickListener(this); itemView.setOnCreateContextMenuListener(this); - itemView.setOnLongClickListener(this); } public void setItemClickListener(ItemClickListener itemClickListener) { @@ -47,9 +45,4 @@ View.OnLongClickListener{ contextMenu.add(0,1, getAdapterPosition(), "Xoá"); } - @Override - public boolean onLongClick(View view) { - itemClickListener.onClick(view, getAdapterPosition(), true); - return true; - } }