Pārlūkot izejas kodu

[컨텐츠][New] 구매/예약하기 웹뷰 타이틀 변경

hyodong.min 6 gadi atpakaļ
vecāks
revīzija
aeabd557fd

+ 2 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/ScreenID.java

@@ -115,6 +115,7 @@ public class ScreenID {
   public static final int EVENT_RECOMMEND_BASIC = 1094;
   public static final int EVENT_RECOMMEND_TAG = 1095;
   public static final int EVENT_RECORD = 96;
+  public static final int WEB_PURCHASE = 97;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({BACK, MAIN, SETTING, FAQ, NETWORK_ERROR, PIN, PIN_RESET, SIGN_UP_START_FROM_ZUMO, ON_BOARDING, PERMISSION_INFO,
@@ -128,7 +129,7 @@ public class ScreenID {
     NETWORK_ERROR_STARTING, OVER_VIEW, ACTIVITY, SERIES, SIGN_UP_START_FROM_ZUMO_ON_BOARDING, WEB_FROM_CONTENTS, BUCKET_ACTIVITY, MAP, MY_EVENT, EVENT_WINNER,
     EVENT_DETAIL, SEARCH, EVENT_QUESTION, SYSTEM_CHECK, UTILITY_ACTIVITY, SEARCH_RESULT, MY_COIN_DETAIL_GUEST, PIN_RESET_AUTH_FROM_MULTI_DEVICE, PIN_RESET_INPUT_FROM_MULTI_DEVICE,
     PIN_RESET_AUTH_FROM_MEMBER_BLOCK, PIN_RESET_INPUT_FROM_MEMBER_BLOCK, MEMBER_UNLOCK, EVENT_DETAIL_ENTRY, EVENT_DETAIL_SELECT, EVENT_RECOMMEND, EVENT_RECOMMEND_BASIC, EVENT_RECOMMEND_TAG,
-    EVENT_RECORD
+    EVENT_RECORD, WEB_PURCHASE
   })
   public @interface ID {}
 

+ 4 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/category/series/MainSeriesView.java

@@ -87,6 +87,9 @@ public class MainSeriesView extends ConstraintLayout implements IMainSeriesContr
   }
 
   public RecyclerView.LayoutManager getLayoutManager() {
-    return recyclerView.getLayoutManager();
+    if (null != recyclerView) {
+      return recyclerView.getLayoutManager();
+    }
+    return null;
   }
 }

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsPresenter.java

@@ -209,7 +209,7 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
         // todo tool tip 표시 필요
         Log.e("APP#  ContentsPresenter | onEventInternal", "|" + event.getString());
         shipToWeb(event.getString());
-        go(ScreenID.WEB_FROM_CONTENTS);
+        go(ScreenID.WEB_PURCHASE);
         break;
       case Event.OVER_VIEW:
         model.setDeliveryPackaging(new ContentsOverviewDeliveryBean(model.getContentsBean(), model.getContentsDetailListBean()));

+ 4 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/factory/BasicFragmentFactory.java

@@ -89,6 +89,7 @@ import kr.co.zumo.app.lifeplus.view.screen.signup.SignUpStartZumoFragment;
 import kr.co.zumo.app.lifeplus.view.screen.signup.SignUpStartZumoOnBoardingFragment;
 import kr.co.zumo.app.lifeplus.view.screen.signup.SignUpUnder14YearsFragment;
 import kr.co.zumo.app.lifeplus.view.screen.web.WebFromContentsFragment;
+import kr.co.zumo.app.lifeplus.view.screen.web.WebPurchaseFragment;
 
 /**
  * 프래그먼트 팩토리
@@ -327,6 +328,9 @@ public class BasicFragmentFactory extends FragmentFactory {
       case ScreenID.WEB_FROM_CONTENTS:
         fragment = new WebFromContentsFragment();
         break;
+      case ScreenID.WEB_PURCHASE:
+        fragment = new WebPurchaseFragment();
+        break;
 
       // event
       case ScreenID.EVENT_LIST:

+ 29 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/web/WebPurchaseFragment.java

@@ -0,0 +1,29 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.view.screen.web;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
+
+/**
+ * WebPurchaseFragment
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 12. 14.]   [최초 작성]
+ * @since 2018. 12. 14.
+ */
+public class WebPurchaseFragment extends WebFromContentsFragment {
+
+  @Override
+  protected void defineActionBar(ActionBarHelper actionBarHelper) {
+    actionBarHelper.begin()
+      .title(R.string.purchase)
+      .close(navigationBar -> presenter.onNavigationClickClose(navigationBar))
+      .show();
+
+  }
+}

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -802,6 +802,7 @@
   <string name="main_flag_benefit">Benefit</string>
   <string name="main_flag_get">Get</string>
   <string name="lifeplus_app">Lifeplus app</string>
+  <string name="purchase">구매·예약하기</string>
   <string name="list_result">조회결과 %s건</string>
   <string name="main_location_agree">Lifeplus app에서 현재 위치 정보를 사용하는데 동의하시겠어요?</string>
   <string name="main_location_agree_yes">동의</string>