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

.idea/gradle.xml

@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">

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

@@ -3,6 +3,10 @@
  */
 package kr.co.zumo.app.lifeplus.bean.api;
 
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
 /**
  * EventTagResultBean
  * <pre>
@@ -14,4 +18,14 @@ package kr.co.zumo.app.lifeplus.bean.api;
  * @since 2019. 2. 13.
  */
 public class EventTagResultBean extends LifeplusAPIResultListBean<EventTagBean> {
+  @SerializedName("evntQustAtitList")
+  private List<EventRecordAnswerItemBean> answerItemList;
+
+  public List<EventRecordAnswerItemBean> getAnswerItemList() {
+    return answerItemList;
+  }
+
+  public void setAnswerItemList(List<EventRecordAnswerItemBean> answerItemList) {
+    this.answerItemList = answerItemList;
+  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/recommend/EventRecommendBasicFragment.java

@@ -89,6 +89,11 @@ public class EventRecommendBasicFragment extends FragmentBase<EventRecommendBasi
     // nothing
   }
 
+  @Override
+  public void setSelectedAnswer(String answer) {
+    // nothing
+  }
+
   @Override
   public void drawContents(List<? extends LifeplusContentsBean> beans) {
     recommendContentsView.draw(getContext(), beans, presenter);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/recommend/EventRecommendBasicModel.java

@@ -150,12 +150,12 @@ public class EventRecommendBasicModel extends Model {
             for (EventAnswerItemBean answerItemBean : eventQuestionBean.getEventAnswerItemBeanList()) {
               if (answerItemBean.getAnswerItemNo().equals(eventAnswerRecordBean.getSelectedAnswerNo())) {
                 answerItemBean.setChecked(true);
-                Log.d("APP# EventRecommendModel | onApiSuccess", "|" + " checked => " + answerItemBean.toJson());
+                Log.d("APP# EventRecommendBasicModel | onApiSuccess", "|" + " checked => " + answerItemBean.toJson());
               }
             }
           }
 
-          Log.d("APP# EventRecommendModel | onApiSuccess", "|" + "after mapping -> " + deliveredEventDetailBean.toJson());
+          Log.d("APP# EventRecommendBasicModel | onApiSuccess", "|" + "after mapping -> " + deliveredEventDetailBean.toJson());
 
           onResult(new Event.Builder(Event.RESULT).build());
         }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/recommend/EventRecommendTagFragment.java

@@ -101,7 +101,7 @@ public class EventRecommendTagFragment extends FragmentBase<EventRecommendTagPre
 
   @Override
   protected EventRecommendTagPresenter definePresenter() {
-    return new EventRecommendTagPresenter(getModel(EventRecommendModel.class), this);
+    return new EventRecommendTagPresenter(getModel(EventRecommendTagModel.class), this);
   }
 
   @Override
@@ -140,9 +140,7 @@ public class EventRecommendTagFragment extends FragmentBase<EventRecommendTagPre
     else {
       int len = beans.size();
       EventTagBean bean;
-      StringBuffer stringBuffer = new StringBuffer();
       View view;
-      String tag = "";
       LayoutInflater inflater = LayoutInflater.from(getContext());
       for (int i = 0; i < len; ++i) {
         bean = beans.get(i);
@@ -162,15 +160,17 @@ public class EventRecommendTagFragment extends FragmentBase<EventRecommendTagPre
         });
 
         layoutTagContents.addView(view);
-        stringBuffer.append(String.format("#%s", bean.getTagName())).append(" ");
       }
 
-      Log.e("APP#  EventRecommendTagFragment | drawTag", "| tag" + stringBuffer.toString());
-      textViewSelectTitle.setText(stringBuffer.toString());
 //      OverScrollDecoratorHelper.setUpStaticOverScroll(scrollTag, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
     }
   }
 
+  @Override
+  public void setSelectedAnswer(String answer) {
+    textViewSelectTitle.setText(answer);
+  }
+
   @Override
   public void drawContents(List<? extends LifeplusContentsBean> beans) {
     if (null == adapter) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/recommend/EventRecommendModel.java

@@ -8,6 +8,7 @@ import java.util.List;
 
 import io.reactivex.disposables.Disposable;
 import kr.co.zumo.app.lifeplus.bean.api.EventDetailBean;
+import kr.co.zumo.app.lifeplus.bean.api.EventRecordAnswerItemBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventTagBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventTagRelatedRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventTagRelatedResultBean;
@@ -24,7 +25,7 @@ import kr.co.zumo.app.lifeplus.model.module.APIModuleListener;
 import kr.co.zumo.app.lifeplus.view.Event;
 
 /**
- * EventRecommendModel
+ * EventRecommendTagModel
  * <pre>
  * </pre>
  *
@@ -33,7 +34,7 @@ import kr.co.zumo.app.lifeplus.view.Event;
  * @history 민효동   [2019. 2. 15.]   [최초 작성]
  * @since 2019. 2. 15.
  */
-public class EventRecommendModel extends Model {
+public class EventRecommendTagModel extends Model {
   private Disposable disposableRecord;
 
   private Disposable disposableTag;
@@ -45,6 +46,7 @@ public class EventRecommendModel extends Model {
   private EventDetailBean deliveredEventDetailBean;
 
   private List<Integer> tagIndices;
+  private List<EventRecordAnswerItemBean> answerItemList;
 
   @Override
   protected void createViewInternal() {
@@ -110,6 +112,9 @@ public class EventRecommendModel extends Model {
       @Override
       public void onApiSuccess(EventTagResultBean resultBean) {
         tags = resultBean.getData();
+
+        answerItemList = resultBean.getAnswerItemList();
+
         // 유저가 선택한 보기의 태그는 표시되어 있다.
         int len = tags.size();
         EventTagBean tagBean;
@@ -132,6 +137,10 @@ public class EventRecommendModel extends Model {
 
   }
 
+  public List<EventRecordAnswerItemBean> getAnswerItemList() {
+    return answerItemList;
+  }
+
   public List<EventTagBean> getTags() {
     return tags;
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/recommend/EventRecommendTagPresenter.java

@@ -5,9 +5,12 @@ package kr.co.zumo.app.lifeplus.view.screen.event.recommend;
 
 import android.util.Log;
 
+import java.util.List;
+
 import kr.co.zumo.app.lifeplus.bean.ContentsDeliveryBean;
 import kr.co.zumo.app.lifeplus.bean.EventDeliveryBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventDetailBean;
+import kr.co.zumo.app.lifeplus.bean.api.EventRecordAnswerItemBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.DoubleChecker;
@@ -24,12 +27,12 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
  * @history 민효동   [2019. 2. 15.]   [최초 작성]
  * @since 2019. 2. 15.
  */
-public class EventRecommendTagPresenter extends Presenter<EventRecommendModel, IEventRecommendView> {
+public class EventRecommendTagPresenter extends Presenter<EventRecommendTagModel, IEventRecommendView> {
 
   private DoubleChecker doubleCheckerTag;
   private DoubleChecker doubleCheckerContents;
 
-  public EventRecommendTagPresenter(EventRecommendModel model, IEventRecommendView view) {
+  public EventRecommendTagPresenter(EventRecommendTagModel model, IEventRecommendView view) {
     super(model, view);
 
     EventDeliveryBean deliveryBean = model.getDeliveryPackaging(EventDeliveryBean.class);
@@ -56,6 +59,19 @@ public class EventRecommendTagPresenter extends Presenter<EventRecommendModel, I
 
   private void render() {
     view.drawTag(model.getTags());
+
+
+    StringBuilder stringBuilder = new StringBuilder();
+    List<EventRecordAnswerItemBean> list = model.getAnswerItemList();
+    int len = list.size();
+    for (int i = 0; i < len; ++i) {
+      EventRecordAnswerItemBean bean = list.get(i);
+
+      if (null != bean) {
+        stringBuilder.append("#").append(bean.getAnswerItemName()).append(" ");
+      }
+    }
+    view.setSelectedAnswer(stringBuilder.toString());
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/recommend/IEventRecommendView.java

@@ -30,4 +30,7 @@ public interface IEventRecommendView extends IView {
   void setVisibilityResultNothing(boolean isVisible);
 
   void setCheckedTag(int index, boolean isChecked);
+
+  void setSelectedAnswer(String answer);
+
 }