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

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

@@ -219,6 +219,7 @@ public class ContentsModel extends ContentsBaseModel {
 
   public void updateSeriesLiked() {
     boolean toChecked = !selectedSeriesItemBean.isLiked();
+    // 시리즈에서는 전체 좋아요만 가능하기 때문에 listItemNo 가 따로 없다.
     disposableSeriesLiked = ContentsFlagHelper.getInstance().updateLiked(new ContentsLikeRequestBean(getUserName(), selectedSeriesItemBean.getItemNo(), LifeplusData.valueOf(toChecked)), new APIModuleSimpleListener<LifeplusAPIBean>() {
       @Override
       public void onApiSuccess(LifeplusAPIBean resultBean) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/BookMarkListModel.java

@@ -11,7 +11,6 @@ import kr.co.zumo.app.lifeplus.bean.api.BookmarkListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsBookmarkRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsLikeRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
-import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusData;
 import kr.co.zumo.app.lifeplus.bean.api.PageRequestBean;
 import kr.co.zumo.app.lifeplus.model.Model;
@@ -291,11 +290,10 @@ public class BookMarkListModel extends Model {
   }
 
   public void updateLiked(int index) {
-    LifeplusContentsBean contentsBean = getBookmarkList().get(index);
+    BookmarkBean contentsBean = getBookmarkList().get(index);
 
     boolean toChecked = !contentsBean.isLiked();
-    // 북마크 리스트에서는 컨텐츠No 를 좋아요에 이용한다.
-    disposableLiked = ContentsFlagHelper.getInstance().updateLiked(new ContentsLikeRequestBean(getUserName(), contentsBean.getItemNo(), LifeplusData.valueOf(toChecked)), new APIModuleSimpleListener<LifeplusAPIBean>() {
+    disposableLiked = ContentsFlagHelper.getInstance().updateLiked(new ContentsLikeRequestBean(getUserName(), contentsBean.getListItemNo(), LifeplusData.valueOf(toChecked)), new APIModuleSimpleListener<LifeplusAPIBean>() {
       @Override
       public void onApiSuccess(LifeplusAPIBean resultBean) {
         contentsBean.setLiked(toChecked);

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

@@ -17,7 +17,6 @@ import kr.co.zumo.app.lifeplus.bean.api.CoinInfoResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsBookmarkRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsLikeRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
-import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusData;
 import kr.co.zumo.app.lifeplus.bean.api.PageRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
@@ -252,10 +251,10 @@ public class MyMainModel extends Model {
   }
 
   public void updateLiked(int index) {
-    LifeplusContentsBean contentsBean = getMyBookmarkList().get(index);
+    BookmarkBean contentsBean = getMyBookmarkList().get(index);
 
     boolean toChecked = !contentsBean.isLiked();
-    disposableLiked = ContentsFlagHelper.getInstance().updateLiked(new ContentsLikeRequestBean(getUserName(), contentsBean.getItemNo(), LifeplusData.valueOf(toChecked)), new APIModuleSimpleListener<LifeplusAPIBean>() {
+    disposableLiked = ContentsFlagHelper.getInstance().updateLiked(new ContentsLikeRequestBean(getUserName(), contentsBean.getListItemNo(), LifeplusData.valueOf(toChecked)), new APIModuleSimpleListener<LifeplusAPIBean>() {
       @Override
       public void onApiSuccess(LifeplusAPIBean resultBean) {
         contentsBean.setLiked(toChecked);