diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/gateway/HomeV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/gateway/HomeV2Gateway.java index ff9d406c..926a3856 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/gateway/HomeV2Gateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/gateway/HomeV2Gateway.java @@ -9,6 +9,8 @@ import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway; import com.gmeremit.online.gmeremittance_native.homeV2.model.UserInfoModelV2; import com.gmeremit.online.gmeremittance_native.homeV2.model.UserInfoV2DataApiResponse; import com.gmeremit.online.gmeremittance_native.homeV2.presenter.HomeV2InteractorInterface; +import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2; +import com.google.gson.JsonObject; import java.util.concurrent.TimeUnit; @@ -23,8 +25,12 @@ public class HomeV2Gateway extends PrivilegedGateway implements HomeV2Interactor } @Override - public Observable getUserRelatedData(String auth) { - return Observable.timer(3, TimeUnit.SECONDS).flatMap(tick->Observable.error(new Throwable("Not api developed"))); + public Observable getUserRelatedData(String auth,String userId) { + JsonObject jsonObject=new JsonObject(); + jsonObject.addProperty("userId",userId); + + return HttpClientV2.getInstance().getUserRelatedInfoV2(auth,jsonObject); +// return Observable.timer(3, TimeUnit.SECONDS).flatMap(tick->Observable.error(new Throwable("Not api developed"))); } @Override diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2InteractorInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2InteractorInterface.java index 2384f804..283f87e7 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2InteractorInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2InteractorInterface.java @@ -18,7 +18,7 @@ public interface HomeV2InteractorInterface extends BaseInteractorInterface { interface HomeV2GatewayInterface extends PrivilegedGatewayInterface { - Observable getUserRelatedData(String auth); + Observable getUserRelatedData(String auth,String userId); Observable saveUserInfo(UserInfoModelV2 userRelatedData); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java index f9091c3f..cdc3dc4f 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java @@ -58,7 +58,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt } private Observable getDataFromServerAndCacheIt() { - return this.gateway.getUserRelatedData(this.gateway.getAuth()).flatMap(userInfoV2DataApiResponse -> { + return this.gateway.getUserRelatedData(this.gateway.getAuth(),this.gateway.getUserID()).flatMap(userInfoV2DataApiResponse -> { if (userInfoV2DataApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) return Observable.just(userInfoV2DataApiResponse.getData()); else diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java index ee214637..c3d67021 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java @@ -140,5 +140,6 @@ public class API_URL { public static final String UPLOAD_KYC_V2 = "mobile/RegisterKyc"; public static final String GET_TRANSACTION_HISTORY_V2 = "mobile/tranhistory/{userId}"; public static final String GET_USER_INFO_V2 = "/users/{userId}"; + public static final String GET_USER_RELATED_INFO_V2="mobile/refreshcutomerinformation"; } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java index 8f6d2510..2723d70c 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java @@ -9,6 +9,7 @@ import com.gmeremit.online.gmeremittance_native.exchange_rate.model.datav2.Payme import com.gmeremit.online.gmeremittance_native.gme_branches.model.data.PayoutLocationData; import com.gmeremit.online.gmeremittance_native.home.model.data.FireToken; import com.gmeremit.online.gmeremittance_native.home.model.data.Profile; +import com.gmeremit.online.gmeremittance_native.homeV2.model.UserInfoV2DataApiResponse; import com.gmeremit.online.gmeremittance_native.int_notification.model.IntNotfication; import com.gmeremit.online.gmeremittance_native.int_notification.model.IntNotificationRequest; import com.gmeremit.online.gmeremittance_native.invite.model.Invite; @@ -621,7 +622,7 @@ public interface ApiEndpoints { Observable getTransactionHistoryV2(@Header("Authorization") String token, @Path("userId") String userId, @Body() JsonObject jsonObject); - @GET(API_URL.USER_PROFILE + "/{userId}") + @POST(API_URL.GET_USER_RELATED_INFO_V2) @Headers("Content-Type: application/json") - Call getUserRelatedInfo(@Path("userId") String userId); + Observable getUserRelatedInfoV2(@Header("Authorization") String token, @Body() JsonObject jsonObject); } diff --git a/app/src/main/res/layout/activity_home_v2.xml b/app/src/main/res/layout/activity_home_v2.xml index 494a49ce..17da5582 100644 --- a/app/src/main/res/layout/activity_home_v2.xml +++ b/app/src/main/res/layout/activity_home_v2.xml @@ -28,7 +28,8 @@ android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:padding="10dp" - android:src="@drawable/ic_home_nav_icon" /> + android:src="@drawable/ic_home_nav_icon" + android:layout_alignParentStart="true" />