Fix notification and Order Food

This commit is contained in:
phanhuuloi27
2022-06-16 14:03:01 +07:00
parent 0352a208df
commit 10350388a7
6 changed files with 27 additions and 9 deletions
@@ -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 {
@@ -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 {
@@ -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){
@@ -9,6 +9,9 @@ public class Token {
this.isServerToken = isServerToken;
}
public Token() {
}
public String getToken() {
return token;
}
@@ -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;
}
}
@@ -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;
}
}