Browse Source

Dashboard API fetch

master
preyearegmi 6 years ago
parent
commit
a417d03718
  1. 10
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/gateway/HomeV2Gateway.java
  2. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2InteractorInterface.java
  3. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java
  4. 1
      app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java
  5. 5
      app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java
  6. 3
      app/src/main/res/layout/activity_home_v2.xml
  7. 2
      app/src/main/res/layout/activity_profile.xml

10
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<UserInfoV2DataApiResponse> getUserRelatedData(String auth) {
return Observable.timer(3, TimeUnit.SECONDS).flatMap(tick->Observable.error(new Throwable("Not api developed")));
public Observable<UserInfoV2DataApiResponse> 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

2
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<UserInfoV2DataApiResponse> getUserRelatedData(String auth);
Observable<UserInfoV2DataApiResponse> getUserRelatedData(String auth,String userId);
Observable<UserInfoModelV2> saveUserInfo(UserInfoModelV2 userRelatedData);

2
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<UserInfoModelV2> 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

1
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";
}

5
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<TransactionHistoryAPIResponse> 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<UserProfile> getUserRelatedInfo(@Path("userId") String userId);
Observable<UserInfoV2DataApiResponse> getUserRelatedInfoV2(@Header("Authorization") String token, @Body() JsonObject jsonObject);
}

3
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" />
<ImageView
android:id="@+id/iv_home"

2
app/src/main/res/layout/activity_profile.xml

@ -179,7 +179,7 @@
android:text="KRW"/>
</LinearLayout>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:visibility="gone"
android:visibility="invisible"
android:id="@+id/tv_withdraw"
android:layout_width="75dp"
android:layout_height="wrap_content"

Loading…
Cancel
Save