Browse Source

Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

Hasemi 7 years ago
parent
commit
e0e68f57df

+ 5 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIModule.java

@@ -9,6 +9,7 @@ import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
+import io.reactivex.plugins.RxJavaPlugins;
 import io.reactivex.schedulers.Schedulers;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
 import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
@@ -131,6 +132,10 @@ public abstract class APIModule<T extends RequestBean, R extends LifeplusAPIBean
    ***********************************/
 
   public Disposable call(T requestBean, IAPIModuleListener<R> listener) {
+    RxJavaPlugins.setErrorHandler(e -> {
+      Log.e("APP#  APIModule | call", "| > GLOBAL ERROR ->" + e.getLocalizedMessage());
+      new APIErrorConsumer(listener).accept(e);
+    });
     requestBean = mapBasicParameter(requestBean);
     Log.d("APP# APIModule | call", "| <" + requestBean.getClass().getSimpleName() + ">");
     Log.d("APP# APIModule | call", "|" + APIModule.this.getClass().getSimpleName() + " -> " + requestBean.toPrettyJson());

+ 6 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/AddMyBucketListModel.java

@@ -57,6 +57,7 @@ public class AddMyBucketListModel extends Model {
   @Override
   protected void createViewInternal() {
   }
+
   @Override
   protected void destroyInternal() {
     stopLoading();
@@ -143,17 +144,20 @@ public class AddMyBucketListModel extends Model {
     if (bucketBackgroundList.size() <= selectedIndex) {
       return;
     }
-    if (null == bucketBackgroundList.get(selectedIndex)) {
+    LifeplusImageBean backgroundImageBean = bucketBackgroundList.get(selectedIndex);
+    if (null == backgroundImageBean) {
       return;
     }
 
-    disposableRegister = new APIBucketRegisterModule().call(new BucketRegisterRequestBean(getUserName(), bucketText, bucketBackgroundList.get(selectedIndex).getImageNumber()), new IAPIModuleListener<BucketRegisterResultBean>() {
+    disposableRegister = new APIBucketRegisterModule().call(new BucketRegisterRequestBean(getUserName(), bucketText, backgroundImageBean.getImageNumber()), new IAPIModuleListener<BucketRegisterResultBean>() {
 
       @Override
       public void onApiSuccess(BucketRegisterResultBean resultBean) {
         addedBucketMyBean = resultBean.getData();
 
         if (null != addedBucketMyBean) {
+          // fixme imageUrl 이 정상적이지 않아서 임시로 넣어줌.
+          addedBucketMyBean.setImageUrl(backgroundImageBean.getImageUrl());
           // 버킷 추가
           BucketListModelHelper.getInstance().addBucket(addedBucketMyBean);
           // 태그 추가