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

app/build.gradle

@@ -23,7 +23,7 @@ android {
         minSdkVersion 19    // 4.4
         targetSdkVersion 27
         versionCode 149
-        versionName "4.0.0.48"
+        versionName "4.0.0.49"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/coop/CoopRecommendRequestBean.java

@@ -21,13 +21,13 @@ public class CoopRecommendRequestBean extends CoopRequestBean {
   { "userKey": "aaa", "code": "P00001", "price": "3000", "timestamp": "20181010120160" }
    */
   @SerializedName("price")
-  private int price;     // 상품 가격
+  private String price;     // 상품 가격
 
-  public int getPrice() {
+  public String getPrice() {
     return price;
   }
 
-  public void setPrice(int price) {
+  public void setPrice(String price) {
     this.price = price;
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/Presenter.java

@@ -592,13 +592,15 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
     }
   }
 
-  // IWaiterCallable
-
+  /***********************************
+   * IWaiterCallable
+   ***********************************/
   @Override
   public void showWaiter() {
-    hideWaiter();
-    waiter = new Loading(view.getActivity());
-    waiter.show();
+    if (null == waiter) {
+      waiter = new Loading(view.getActivity());
+      waiter.show();
+    }
   }
 
   @Override
@@ -609,7 +611,9 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
     }
   }
 
-  // IModelResult
+  /***********************************
+   * IModelResult
+   ***********************************/
 
   /**
    * Model 에서 전달되는 결과/이벤트 등을 처리한다.

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainContentsCategoryHolder.java

@@ -18,6 +18,7 @@ import kr.co.zumo.app.lifeplus.supervisor.AnimatorManager;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
+import kr.co.zumo.app.lifeplus.view.screen.category.CategoryID;
 
 /**
  * MainContentsCategoryHolder
@@ -72,12 +73,23 @@ public class MainContentsCategoryHolder extends MainContentsHolder {
     this.index = index;
 
     textView.setText(bean.getCategoryName());
-    textMore.setOnClickListener(v -> {
-      listener.onEvent(new Event.Builder(Event.MORE).string(bean.getCategoryNumber()).build());
-    });
-    imageMore.setOnClickListener(v -> {
-      listener.onEvent(new Event.Builder(Event.MORE).string(bean.getCategoryNumber()).build());
-    });
+    // 기본 카테고리가 아닌 경우 (2~6 이외) 더보기 버튼 없음.
+    int categoryNo = Integer.parseInt(bean.getCategoryNumber());
+    if (categoryNo < Integer.parseInt(CategoryID.CATEGORY_1) || categoryNo > Integer.parseInt(CategoryID.CATEGORY_5)) {
+      // 더보기 없음.
+      textMore.setVisibility(View.GONE);
+      imageMore.setVisibility(View.GONE);
+    }
+    else {
+      textMore.setVisibility(View.VISIBLE);
+      imageMore.setVisibility(View.VISIBLE);
+      textMore.setOnClickListener(v -> {
+        listener.onEvent(new Event.Builder(Event.MORE).string(bean.getCategoryNumber()).build());
+      });
+      imageMore.setOnClickListener(v -> {
+        listener.onEvent(new Event.Builder(Event.MORE).string(bean.getCategoryNumber()).build());
+      });
+    }
 
     // 첫 번째 카테고리만 에니메이션 적용
     if (this.index == 1 && AnimatorManager.getInstance().isCompleted() == false) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinMainModel.java

@@ -86,7 +86,7 @@ public class MyCoinMainModel extends Model {
 
   public void loadRecommendGoods() {
     CoopRecommendRequestBean requestBean = new CoopRecommendRequestBean();
-    requestBean.setPrice(10000);
+    requestBean.setPrice(getCoin());
 
     disposable = new CoopRecommendGoodsModule().call(requestBean, new APIModuleSimpleListener<CoopRecommendBean>(waiterCaller) {
       @Override