Browse Source

[공통][Common] 시스템 점검안내 프래그먼트 구현

Hasemi 7 years ago
parent
commit
d8ceceda3a

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

@@ -98,6 +98,7 @@ public class ScreenID {
   public static final int EVENT_DETAIL = 78;
   public static final int SEARCH = 79;
   public static final int EVENT_PARTICIPATION = 80;
+  public static final int SERVICE_CHECK = 81;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
@@ -110,7 +111,7 @@ public class ScreenID {
     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, SIGN_UP_START_FROM_ZUMO_ON_BOARDING, WEB_FROM_CONTENTS, BUCKET_ACTIVITY, MAP, MY_EVENT, WINNER_ANNOUNCEMENT,
-    EVENT_DETAIL, SEARCH,EVENT_PARTICIPATION
+    EVENT_DETAIL, SEARCH, EVENT_PARTICIPATION, SERVICE_CHECK
   })
   public @interface ID {}
 

+ 2 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/common/IServiceCheckView.java

@@ -13,4 +13,6 @@ import kr.co.zumo.app.lifeplus.view.IView;
  * @since 2019-01-09
  */
 public interface IServiceCheckView extends IView {
+
+  void isOneButton(boolean isOneButton);
 }

+ 35 - 5
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/common/ServiceCheckFragment.java

@@ -3,10 +3,13 @@ package kr.co.zumo.app.lifeplus.view.screen.common;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.constraint.ConstraintLayout;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
+import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 
@@ -20,25 +23,40 @@ import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
  * @history 하세미   [2019-01-09]   [최초 작성]
  * @since 2019-01-09
  */
-public class ServiceCheckFragment extends FragmentBase<ServiceCheckPresenter> {
+public class ServiceCheckFragment extends FragmentBase<ServiceCheckPresenter> implements IServiceCheckView {
+
+  private ConstraintLayout layoutOneButton;
+  private ConstraintLayout layoutTwoButton;
+  private TextView textViewMain;
+  private TextView textViewPrePage;
+  private TextView textViewConfirm;
+
+
   @Override
   protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    return null;
+    return inflater.inflate(R.layout.fragment_service_check, container, false);
   }
 
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
-
+    layoutOneButton = findViewById(R.id.layout_one_button);
+    layoutTwoButton = findViewById(R.id.layout_two_button);
+    textViewMain = findViewById(R.id.main);
+    textViewPrePage = findViewById(R.id.pre_page);
+    textViewConfirm = findViewById(R.id.button_confirm);
   }
 
   @Override
   protected void defineActionBar(ActionBarHelper actionBarHelper) {
-
+    actionBarHelper.begin()
+      .title(R.string.service_check_title)
+      .back(actionBar -> presenter.onNavigationClickBack(actionBar))
+      .show();
   }
 
   @Override
   protected ServiceCheckPresenter definePresenter() {
-    return null;
+    return new ServiceCheckPresenter(getModel(ServiceCheckModel.class), this);
   }
 
   @Override
@@ -55,4 +73,16 @@ public class ServiceCheckFragment extends FragmentBase<ServiceCheckPresenter> {
   protected boolean isSkipScreenWhenBack() {
     return false;
   }
+
+  @Override
+  public void isOneButton(boolean isOneButton) {
+    if (isOneButton) {
+      layoutOneButton.setVisibility(View.VISIBLE);
+      layoutTwoButton.setVisibility(View.GONE);
+    }
+    else {
+      layoutOneButton.setVisibility(View.GONE);
+      layoutTwoButton.setVisibility(View.VISIBLE);
+    }
+  }
 }

+ 6 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/common/ServiceCheckPresenter.java

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.common;
 
+import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
@@ -78,4 +79,9 @@ public class ServiceCheckPresenter extends Presenter<ServiceCheckModel, IService
   public void onResult(Event event) {
 
   }
+
+  @Override
+  public void onNavigationClickBack(NavigationBar navigationBar) {
+    super.onNavigationClickBack(navigationBar);
+  }
 }

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

@@ -12,6 +12,7 @@ import kr.co.zumo.app.lifeplus.view.screen.category.type2.SecondCategoryMainFrag
 import kr.co.zumo.app.lifeplus.view.screen.category.type3.ThirdCategoryMainFragment;
 import kr.co.zumo.app.lifeplus.view.screen.category.type4.FourthCategoryMainFragment;
 import kr.co.zumo.app.lifeplus.view.screen.category.type5.FifthCategoryMainFragment;
+import kr.co.zumo.app.lifeplus.view.screen.common.ServiceCheckFragment;
 import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsFragment;
 import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsOverviewFragment;
 import kr.co.zumo.app.lifeplus.view.screen.contents.MapFragment;
@@ -330,6 +331,9 @@ public class BasicFragmentFactory extends FragmentFactory {
       case ScreenID.COUPON_MALL:
         fragment = new CouponMallFragment();
         break;
+      case ScreenID.SERVICE_CHECK:
+        fragment = new ServiceCheckFragment();
+        break;
       default:
         break;
     }

+ 3 - 2
app/src/main/res/layout/layout_coupon_mall_check.xml

@@ -140,7 +140,8 @@
 
   <android.support.constraint.ConstraintLayout
     android:id="@+id/layout_two_button"
-    tools:visibility="gone"
+    tools:visibility="visible"
+    android:visibility="gone"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/C000000"
@@ -193,7 +194,7 @@
   </android.support.constraint.ConstraintLayout>
   <android.support.constraint.ConstraintLayout
     android:id="@+id/layout_one_button"
-    tools:visibility="visible"
+    tools:visibility="gone"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/C000000"

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

@@ -584,6 +584,7 @@
   <string name="current_notice_nothing_detail">나와 관련된 알림을 한번에 모아서\n확인할 수 있습니다.</string>
   <string name="visit_event">%s 보러가기</string>
 
+  <string name="service_check_title">서비스 점검 안내</string>
   <string name="menu_check_title">해당 메뉴는\n시스템 점검 중입니다.</string>
   <string name="menu_check_detail">점검 시간동안 쿠폰몰 서비스를\n이용할 수 없는 점 양해 부탁드립니다.</string>
   <string name="menu_check_guide">작업안내</string>
@@ -784,6 +785,8 @@
   <string name="agree_all">전체동의</string>
 
 
+
+
   <!-- 임의 추가 문자열 : 시작 -->
   <string name="undefined_error">알 수 없는 에러</string>
   <string name="undefined_list_type">데이터가 없습니다.</string>