[푸시][New] 이벤트 당첨 화면 연결

app/src/main/java/kr/co/zumo/app/lifeplus/activity/ActivityBaseSetup.java

@@ -67,7 +67,9 @@ public abstract class ActivityBaseSetup extends ActivityBase {
        * deliveryHelper 등 모든 헬퍼가 초기화 되므로 데이터 연계가 되지 않으므로 주의
        */
       PushBean pushBean = ActivityDeliveryHelper.getInstance().getPackaging(PushBean.class);
+
       if (null != pushBean) {
+        Log.d("APP# ActivityBaseSetup | doOnLink", "|" + "pushBean: " + pushBean.toJson());
         ActivityDeliveryHelper.getInstance().clearPackaging();
         DeliveryHelper deliveryHelper = getHelper(DeliveryHelper.class);
 
@@ -93,17 +95,13 @@ public abstract class ActivityBaseSetup extends ActivityBase {
               break;
             case PushMessageManager.CODE_EVENT_WINNER:
               // event winner
-              // todo event winner
-
+              deliveryHelper.setPackaging(pushBean.getItemNo());
               id = ScreenID.EVENT_WINNER;
               break;
             case PushMessageManager.CODE_EVENT_DETAIL:
               // event detail
-              String eventNo = pushBean.getItemNo();
-
               // 이벤트 타입없이 전달하면 타입 구분 후 진행된다.
-              EventDeliveryBean eventDeliveryBean = new EventDeliveryBean(eventNo, "");
-              deliveryHelper.setPackaging(eventDeliveryBean);
+              deliveryHelper.setPackaging(new EventDeliveryBean(pushBean.getItemNo(), ""));
 
               id = ScreenID.EVENT_DETAIL;
 
@@ -133,7 +131,7 @@ public abstract class ActivityBaseSetup extends ActivityBase {
         }
 
         if (id != ScreenID.NONE) {
-          go(id);
+          goTo(id);
         }
       }
       else {
@@ -143,7 +141,7 @@ public abstract class ActivityBaseSetup extends ActivityBase {
     }
   }
 
-  private void go(int id) {
+  private void goTo(int id) {
     //fixme 화면 이동하는데 필요 설정을 더 간단히 할 수 있을 것 같다.
 
     // dummy for change screen

app/src/main/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPI.java

@@ -209,7 +209,7 @@ public interface LifeplusAPI {
   Single<EventDetailResultBean> getEventDetail(@Body ItemNoRequestBean bean);
 
   // 이벤트 당첨 결과
-  @POST("mapi/event/evntdtlinfo.plus")
+  @POST("mapi/event/evntwinlist.plus")
   Single<EventWinnerResultBean> getEventWinner(@Body ItemNoRequestBean bean);
 
 

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/screen/ScreenManager.java

@@ -102,6 +102,9 @@ public class ScreenManager implements IScreen {
         case ScreenID.EVENT_DETAIL:
           screen = new ActivityScreen(helper, id, direction, method);
           break;
+        case ScreenID.EVENT_WINNER:
+          screen = new ActivityScreen(helper, id, direction, method);
+          break;
         case ScreenID.MY_EVENT:
         case ScreenID.MY_EVENT_FROM_LIST:
           screen = new ActivityScreen(helper, id, direction, method);

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

@@ -1,7 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.notification;
 
 import android.net.Uri;
-import android.util.Log;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.UtilityActivityBean;
@@ -127,9 +126,8 @@ public class NotiPresenter extends Presenter<NotiModel, INotiView> {
           break;
         case NoticeBean.FLAG_NEWS_WINNER:
           // 당첨 발표
-          // item no = bean.getEventId();
-          // todo 당첨 발표 화면으로 이동
-          Log.i("APP# NotiPresenter | onResult", "|" + " todo 당첨 발표 화면으로 이동");
+          model.setDeliveryPackaging(bean.getEventId());
+          go(ScreenID.EVENT_WINNER);
           break;
         case NoticeBean.FLAG_NEWS_COUPON:
           // 보유 쿠폰