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

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

@@ -22,6 +22,7 @@ import kr.co.zumo.app.lifeplus.model.module.APIError;
 import kr.co.zumo.app.lifeplus.model.module.APIEventAnswerRecordModule;
 import kr.co.zumo.app.lifeplus.model.module.APIEventRecommendModule;
 import kr.co.zumo.app.lifeplus.model.module.APIModuleListener;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 
 /**
@@ -43,6 +44,8 @@ public class EventRecommendBasicModel extends Model {
   private EventDetailBean deliveredEventDetailBean;
   private EventAnswerRecordBean eventAnswerRecordBean;
 
+  private String selectedAnswerNo = "";
+
 
   @Override
   protected void createViewInternal() {
@@ -96,6 +99,17 @@ public class EventRecommendBasicModel extends Model {
 
   public void setDeliveredEventDetailBean(EventDetailBean deliveredEventDetailBean) {
     this.deliveredEventDetailBean = deliveredEventDetailBean;
+
+    List<EventQuestionBean> beforeList = deliveredEventDetailBean.getEventQuestionList();
+    for (EventQuestionBean eventQuestionBean : beforeList) {
+      // 동일 보기 찾기 -> 문제 no 가 없어서 보기와 직접 맵핑한다.
+      for (EventAnswerItemBean answerItemBean : eventQuestionBean.getEventAnswerItemBeanList()) {
+        if (answerItemBean.isChecked()) {
+          setSelectedAnswerNo(answerItemBean.getAnswerItemNo());
+          return;
+        }
+      }
+    }
   }
 
   public List<LifeplusContentsBean> getContentsBeans() {
@@ -106,7 +120,7 @@ public class EventRecommendBasicModel extends Model {
     stopLoading();
 
     String itemNo = deliveredEventDetailBean.getItemNo();
-    String answerNo = eventAnswerRecordBean.getSelectedAnswerNo();
+    String answerNo = getSelectedAnswerNo();
 
     disposableRelatedContents = new APIEventRecommendModule().call(new EventRecommendRequestBean(itemNo, answerNo), new APIModuleListener<EventRecommendResultBean>(waiterCaller) {
       @Override
@@ -121,8 +135,15 @@ public class EventRecommendBasicModel extends Model {
         onResult(new Event.Builder(Event.ERROR).string(errorMessage).build());
       }
     });
+  }
 
+  private String getSelectedAnswerNo() {
+    return selectedAnswerNo;
+  }
 
+  private void setSelectedAnswerNo(String selectedAnswerNo) {
+    this.selectedAnswerNo = selectedAnswerNo;
+    Log.d("APP# EventRecommendBasicModel | setSelectedAnswerNo, 134", "|" + " selectedAnswerNo --> " + selectedAnswerNo);
   }
 
   /**
@@ -131,7 +152,8 @@ public class EventRecommendBasicModel extends Model {
    * @return
    */
   public boolean isAnswered() {
-    return deliveredEventDetailBean.isAnswered();
+//    return deliveredEventDetailBean.isAnswered();
+    return StringUtil.isFull(selectedAnswerNo);
   }
 
   public void loadEventAnswerRecord() {
@@ -142,6 +164,8 @@ public class EventRecommendBasicModel extends Model {
         eventAnswerRecordBean = resultBean.getData();
 
         if (null != eventAnswerRecordBean) {
+          setSelectedAnswerNo(eventAnswerRecordBean.getSelectedAnswerNo());
+
           // eventDetailBean 에 결과를 맵핑한다.
           // 참여 후 직접 넘오 올 경우 eventDetailBean 을 이용하기 때문에 같은 형식으로 이용
 

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

@@ -219,7 +219,7 @@ public class InquiryWriteModel extends Model {
   public void setPushEnabled(boolean isEnabled) {
     setPushEnabledInternal(isEnabled);
 
-    MemberPushAgreeRequestBean bean = getPushBean(APIData.valueOf(isEnabled), "", "");
+    MemberPushAgreeRequestBean bean = getPushBean("", APIData.valueOf(isEnabled), "");
 
     disposablePush = new APIMemberPushUpdateModule().call(bean, new APIModuleListener<LifeplusAPIBean>(waiterCaller) {
       @Override