From 2e0beab8e6880f92037798817274c9518cfe1872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Fri, 13 Nov 2020 21:07:06 +0300 Subject: [PATCH] service base url changed, test codes removed for umimplemented services, category id changed to string --- .../ch/pizzalemon/android/activity/MainActivity.java | 12 ++++++------ .../pizzalemon/android/activity/SplashActivity.java | 4 ---- .../java/ch/pizzalemon/android/api/ApiConstants.java | 11 +++++------ .../ch/pizzalemon/android/model/CategoryModel.java | 8 ++++---- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/ch/pizzalemon/android/activity/MainActivity.java b/app/src/main/java/ch/pizzalemon/android/activity/MainActivity.java index 0569ed5..a482a07 100644 --- a/app/src/main/java/ch/pizzalemon/android/activity/MainActivity.java +++ b/app/src/main/java/ch/pizzalemon/android/activity/MainActivity.java @@ -72,7 +72,7 @@ public class MainActivity extends BaseActivity { private FragmentManager fragmentManager; private String currentFragmentName = ""; - private int currentCategoryId = -1; + private String currentCategoryId = ""; private boolean isStartWithOrderHistory, isStartWithCart; private ArrayList categoryList = new ArrayList<>(); private NavigationMenuRecyclerAdapter navigationMenuRecyclerAdapter; @@ -226,7 +226,7 @@ public class MainActivity extends BaseActivity { fragmentManager.beginTransaction().replace(R.id.fragmentContainer, CartFragment.newInstance()).commit(); currentFragmentName = CartFragment.FRAGMENT_NAME; - currentCategoryId = -1; + currentCategoryId = ""; cartTotalRelativeLayout.setVisibility(View.GONE); shoppingCartImageView.setImageDrawable(yellowCartDrawable); @@ -244,7 +244,7 @@ public class MainActivity extends BaseActivity { fragmentManager.beginTransaction().replace(R.id.fragmentContainer, OrderHistoryFragment.newInstance()).commit(); currentFragmentName = OrderHistoryFragment.FRAGMENT_NAME; - currentCategoryId = -1; + currentCategoryId = ""; cartTotalRelativeLayout.setVisibility(View.GONE); shoppingCartImageView.setImageDrawable(whiteCartDrawable); @@ -262,7 +262,7 @@ public class MainActivity extends BaseActivity { fragmentManager.beginTransaction().replace(R.id.fragmentContainer, ProfileFragment.newInstance()).commit(); currentFragmentName = ProfileFragment.FRAGMENT_NAME; - currentCategoryId = -1; + currentCategoryId = ""; cartTotalRelativeLayout.setVisibility(View.GONE); shoppingCartImageView.setImageDrawable(whiteCartDrawable); @@ -276,7 +276,7 @@ public class MainActivity extends BaseActivity { fragmentManager.beginTransaction().replace(R.id.fragmentContainer, StoreInfoFragment.newInstance()).commit(); currentFragmentName = StoreInfoFragment.FRAGMENT_NAME; - currentCategoryId = -1; + currentCategoryId = ""; cartTotalRelativeLayout.setVisibility(View.GONE); shoppingCartImageView.setImageDrawable(whiteCartDrawable); @@ -435,7 +435,7 @@ public class MainActivity extends BaseActivity { private void openProductsScreen(CategoryModel clickedCategoryModel){ - if(clickedCategoryModel.getId() == ApiConstants.PRODUCT_ID_VERSION_MENU){ + if(clickedCategoryModel.getId().equals(ApiConstants.PRODUCT_ID_VERSION_MENU)){ return; } diff --git a/app/src/main/java/ch/pizzalemon/android/activity/SplashActivity.java b/app/src/main/java/ch/pizzalemon/android/activity/SplashActivity.java index 16b7930..976fc40 100644 --- a/app/src/main/java/ch/pizzalemon/android/activity/SplashActivity.java +++ b/app/src/main/java/ch/pizzalemon/android/activity/SplashActivity.java @@ -121,7 +121,6 @@ public class SplashActivity extends BaseActivity { else { DialogHelper.hideLoadingDialog(); ApiErrorUtils.parseError(response); - getStoreList(); } } @@ -129,7 +128,6 @@ public class SplashActivity extends BaseActivity { public void onFailure(Call> call, Throwable t) { DialogHelper.hideLoadingDialog(); DialogHelper.showFailedDialog(); - getStoreList(); } }); } @@ -268,7 +266,6 @@ public class SplashActivity extends BaseActivity { else{ DialogHelper.hideLoadingDialog(); ApiErrorUtils.parseError(response); - getCategoryList(); } } @@ -276,7 +273,6 @@ public class SplashActivity extends BaseActivity { public void onFailure(Call> call, Throwable t) { DialogHelper.hideLoadingDialog(); DialogHelper.showFailedDialog(); - getCategoryList(); } }); } diff --git a/app/src/main/java/ch/pizzalemon/android/api/ApiConstants.java b/app/src/main/java/ch/pizzalemon/android/api/ApiConstants.java index db743df..7939f09 100644 --- a/app/src/main/java/ch/pizzalemon/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzalemon/android/api/ApiConstants.java @@ -3,15 +3,14 @@ package ch.pizzalemon.android.api; public class ApiConstants { public static final int API_READ_TIMEOUT = 30; public static final int API_CONNECT_TIMEOUT = 10; - public static final String API_PATH = "https://pizzalemon.ch/"; - //public static final String API_PATH = "https://cucinaexpress.ch/"; + public static final String API_PATH = "http://172.104.247.141/"; public static final String APP_TYPE_ID_ANDROID = "2"; public static final int APP_ERROR_CODE_AUTHORIZATION = 1; public static final int PRODUCT_ID_WUNSCHPIZZA = 56; public static final int PRODUCT_ID_ABEND_MENU = 733; public static final int PRODUCT_ID_MITTAGS_MENU = 732; - public static final int PRODUCT_ID_VERSION_MENU = -111; + public static final String PRODUCT_ID_VERSION_MENU = "-111"; public static final String CAMPAIGN_CODE_PIZZA_PROMOTION = "PIZZAPROMOTION"; @@ -44,10 +43,10 @@ public class ApiConstants { public static final String ONESIGNAL_NOTIFICATION_TAG_KEY = "notificationAllowed"; public static final String ONESIGNAL_NOTIFICATION_TAG_VALUE = "true"; - public static final String PAYMENT_WEBVIEW_URL_POSTFINANCE_TWINT = "https://pizzalemon.ch/lemon/index.php?route=mobile/service/postFinancePayment&order_id="; + public static final String PAYMENT_WEBVIEW_URL_POSTFINANCE_TWINT = "http://172.104.247.141/lemon/index.php?route=mobile/service/postFinancePayment&order_id="; public static final String PAYMENT_WEBVIEW_REDIRECT_URL_POSTFINANCE_TWINT_SUCCESS = "postFinancePaymentIsSuccess"; public static final String PAYMENT_WEBVIEW_REDIRECT_URL_POSTFINANCE_TWINT_FAIL = "postFinancePaymentIsFailed"; - public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTP = "https://pizzalemon.ch/"; - public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTPS = "https://pizzalemon.ch/"; + public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTP = "http://172.104.247.141/"; + public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTPS = "https://172.104.247.141/"; } diff --git a/app/src/main/java/ch/pizzalemon/android/model/CategoryModel.java b/app/src/main/java/ch/pizzalemon/android/model/CategoryModel.java index 1c88971..bc46071 100644 --- a/app/src/main/java/ch/pizzalemon/android/model/CategoryModel.java +++ b/app/src/main/java/ch/pizzalemon/android/model/CategoryModel.java @@ -16,7 +16,7 @@ public class CategoryModel implements Serializable{ @Expose @SerializedName("category_id") - private int id; + private String id; @Expose @SerializedName("name") @@ -67,11 +67,11 @@ public class CategoryModel implements Serializable{ return String.valueOf(id); } - public int getId() { - return id; + public String getId() { + return id != null ? id : ""; } - public void setId(int id) { + public void setId(String id) { this.id = id; }