[이벤트][Bug] 이벤트 당첨자발표 액티비티 추가 및 화면 구현

app/src/main/AndroidManifest.xml

@@ -143,7 +143,7 @@
       android:screenOrientation="portrait"
       android:windowSoftInputMode="adjustResize">
     </activity>
-    
+
     <activity
       android:name=".lifeplus.activity.MapActivity"
       android:screenOrientation="portrait"
@@ -156,6 +156,12 @@
       android:windowSoftInputMode="adjustResize">
     </activity>
 
+    <activity
+      android:name=".lifeplus.activity.WinnerAnnouncementActivity"
+      android:screenOrientation="portrait"
+      android:windowSoftInputMode="adjustResize">
+    </activity>
+
     <activity
       android:name="com.facebook.FacebookActivity"
       android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"

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

@@ -0,0 +1,37 @@
+package kr.co.zumo.app.lifeplus.activity;
+
+import android.content.Intent;
+
+import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
+
+/**
+ * WinnerAnnouncementActivity
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2019-01-02]   [최초 작성]
+ * @since 2019-01-02
+ */
+public class WinnerAnnouncementActivity extends ActivityBaseScreen {
+  @Override
+  protected void render() {
+    launchScreen(ScreenID.WINNER_ANNOUNCEMENT);
+  }
+
+  @Override
+  protected void onAfterDestroy() {
+
+  }
+
+  @Override
+  protected void onBeforeDestroy() {
+
+  }
+
+  @Override
+  protected void onAfterNewIntent(Intent intent) {
+
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/ScreenID.java

@@ -95,6 +95,7 @@ public class ScreenID {
   public static final int BUCKET_ACTIVITY = 74;
   public static final int MAP = 75;
   public static final int MY_EVENT = 76;
+  public static final int WINNER_ANNOUNCEMENT = 77;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
@@ -106,7 +107,7 @@ public class ScreenID {
     LIFE_PLUS_INTRODUCTION, LIFE_PLUS_X, SETTING_MEMBER_INFO, MY_MAIN_GUEST, COUPON_MALL, ALL_MENU_GUEST, SETTING_MEMBER_QUIT_INFO, MY_FAQ, SETTING_MEMBER_QUIT_REQUEST,
     SETTING_MEMBER_QUIT_FINISH, SETTING_TERMS, SETTING_MEMBER_QUIT_FAIL, MAIN_PIN_UNLOCK, PIN_RESET_AUTH, PIN_RESET_INPUT, PIN_RESET_AUTH_FROM_SETTING,
     PIN_RESET_INPUT_FROM_SETTING, /*PIN_RESET_AUTH_FROM_ALREADY_MEMBER,*/ PIN_RESET_INPUT_FROM_ALREADY_MEMBER, CONTENTS, EVENT, PHONE_NUMBER_RESET, BUCKET_MY_EDIT, BUCKET_DETAIL,
-    NETWORK_ERROR_STARTING, OVER_VIEW, ACTIVITY, SERIES, CONTENTS_VIA_WEB, SIGN_UP_START_FROM_ZUMO_ON_BOARDING, WEB_FROM_CONTENTS, BUCKET_ACTIVITY, MAP, MY_EVENT
+    NETWORK_ERROR_STARTING, OVER_VIEW, ACTIVITY, SERIES, CONTENTS_VIA_WEB, SIGN_UP_START_FROM_ZUMO_ON_BOARDING, WEB_FROM_CONTENTS, BUCKET_ACTIVITY, MAP, MY_EVENT, WINNER_ANNOUNCEMENT
   })
   public @interface ID {}
 

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

@@ -23,6 +23,7 @@ import kr.co.zumo.app.lifeplus.activity.NotiActivity;
 import kr.co.zumo.app.lifeplus.activity.SeriesActivity;
 import kr.co.zumo.app.lifeplus.activity.SignUpActivity;
 import kr.co.zumo.app.lifeplus.activity.WebFromContentsActivity;
+import kr.co.zumo.app.lifeplus.activity.WinnerAnnouncementActivity;
 import kr.co.zumo.app.lifeplus.bean.CategoryDeliveryBean;
 import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
 import kr.co.zumo.app.lifeplus.helper.ScreenManagerHelper;
@@ -91,7 +92,9 @@ public class ActivityScreen extends Screen {
       case ScreenID.EVENT:
         intent = new Intent(activity, EventActivity.class);
         break;
-
+      case ScreenID.WINNER_ANNOUNCEMENT:
+        intent = new Intent(activity, WinnerAnnouncementActivity.class);
+        break;
       case ScreenID.COUPON_MALL:
         intent = new Intent(activity, CoopActivity.class);
         shipToActivity();

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

@@ -0,0 +1,64 @@
+package kr.co.zumo.app.lifeplus.view.screen.event;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
+import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
+
+/**
+ * WinnerAnnouncementFragment
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2019-01-02]   [최초 작성]
+ * @since 2019-01-02
+ */
+public class WinnerAnnouncementFragment extends FragmentBase<WinnerAnnouncementPresenter> {
+  @Override
+  protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    return inflater.inflate(R.layout.fragment_announcement_winner, container, false);
+  }
+
+  @Override
+  protected void onAfterActivityCreated(Bundle savedInstanceState) {
+
+  }
+
+  @Override
+  protected void defineActionBar(ActionBarHelper actionBarHelper) {
+    actionBarHelper.begin().title(R.string.winner_announcement)
+      .menu(actionBar -> presenter.onNavigationClickMenu(actionBar))
+      .search(actionBar -> presenter.onNavigationClickSearch(actionBar))
+      .back(actionBar -> presenter.onNavigationClickBack(actionBar))
+      .scroll()
+      .show();
+  }
+
+  @Override
+  protected WinnerAnnouncementPresenter definePresenter() {
+    return new WinnerAnnouncementPresenter(getModel(WinnerAnnouncementModel.class), this);
+  }
+
+  @Override
+  protected void onAfterDestroyView() {
+
+  }
+
+  @Override
+  protected void onAfterDestroy() {
+
+  }
+
+  @Override
+  protected boolean isSkipScreenWhenBack() {
+    return false;
+  }
+}

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

@@ -0,0 +1,50 @@
+package kr.co.zumo.app.lifeplus.view.screen.event;
+
+import kr.co.zumo.app.lifeplus.model.Model;
+
+/**
+ * WinnerAnnouncementModel
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2019-01-02]   [최초 작성]
+ * @since 2019-01-02
+ */
+public class WinnerAnnouncementModel extends Model {
+  @Override
+  protected void createViewInternal() {
+
+  }
+
+  @Override
+  protected void destroyInternal() {
+
+  }
+
+  @Override
+  protected void destroyViewInternal() {
+
+  }
+
+  @Override
+  protected void startInternal() {
+
+  }
+
+  @Override
+  protected void stopInternal() {
+
+  }
+
+  @Override
+  protected void resumeInternal() {
+
+  }
+
+  @Override
+  protected void pauseInternal() {
+
+  }
+}

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

@@ -0,0 +1,81 @@
+package kr.co.zumo.app.lifeplus.view.screen.event;
+
+import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.IView;
+import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
+
+/**
+ * WinnerAnnouncementPresenter
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2019-01-02]   [최초 작성]
+ * @since 2019-01-02
+ */
+public class WinnerAnnouncementPresenter extends Presenter<WinnerAnnouncementModel, IView> {
+  public WinnerAnnouncementPresenter(WinnerAnnouncementModel model, IView view) {
+    super(model, view);
+  }
+
+  @Override
+  protected void createViewInternal() {
+
+  }
+
+  @Override
+  protected void destroyInternal() {
+
+  }
+
+  @Override
+  protected void destroyViewInternal() {
+
+  }
+
+  @Override
+  protected void startInternal() {
+
+  }
+
+  @Override
+  protected void startInternalOnce() {
+
+  }
+
+  @Override
+  protected void stopInternal() {
+
+  }
+
+  @Override
+  protected void resumeInternal() {
+
+  }
+
+  @Override
+  protected void pauseInternal() {
+
+  }
+
+  @Override
+  public boolean onBackPressedInternal() {
+    return false;
+  }
+
+  @Override
+  protected void onEventInternal(Event event) {
+
+  }
+
+  @Override
+  public void onScreenReady() {
+
+  }
+
+  @Override
+  public void onResult(Event event) {
+
+  }
+}

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

@@ -20,6 +20,7 @@ import kr.co.zumo.app.lifeplus.view.screen.contents.series.ContentsSeriesFragmen
 import kr.co.zumo.app.lifeplus.view.screen.couponmall.CouponMallFragment;
 import kr.co.zumo.app.lifeplus.view.screen.error.NetworkErrorStartingFragment;
 import kr.co.zumo.app.lifeplus.view.screen.event.EventFragment;
+import kr.co.zumo.app.lifeplus.view.screen.event.WinnerAnnouncementFragment;
 import kr.co.zumo.app.lifeplus.view.screen.faq.FAQFragment;
 import kr.co.zumo.app.lifeplus.view.screen.faq.FAQWriteFragment;
 import kr.co.zumo.app.lifeplus.view.screen.faq.MyFAQFragment;
@@ -301,13 +302,19 @@ public class BasicFragmentFactory extends FragmentFactory {
         fragment = new WebFromContentsFragment();
         break;
 
+      //event
+      case ScreenID.EVENT:
+        fragment = new EventFragment();
+        break;
+
+      case ScreenID.WINNER_ANNOUNCEMENT:
+        fragment = new WinnerAnnouncementFragment();
+        break;
+
       // etc
       case ScreenID.NOTIFICATION:
         fragment = new NotiFragment();
         break;
-      case ScreenID.EVENT:
-        fragment = new EventFragment();
-        break;
       case ScreenID.LIFE_PLUS_INTRODUCTION:
         fragment = new LifeplusIntroductionFragment();
         break;

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

@@ -76,6 +76,7 @@ public class MyEventPresenter extends Presenter<MyEventModel, IView> {
         break;
       case Event.WINNER_ANNOUNCEMENT:
         //당첨자 발표
+        go(ScreenID.WINNER_ANNOUNCEMENT);
         break;
       default:
         break;

app/src/main/res/layout/fragment_announcement_winner.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                             android:layout_width="match_parent"
+                                             android:layout_height="match_parent">
+
+</android.support.constraint.ConstraintLayout>