Browse Source

[로그인][New] 휴면 회원 처리: API 제외

hyodong.min 7 years ago
parent
commit
cfe09e2a84

+ 12 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/activity/RestMemberActivity.java

@@ -8,6 +8,7 @@ import android.os.Bundle;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
 import kr.co.zumo.app.lifeplus.model.BlankModel;
+import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IView;
 import kr.co.zumo.app.lifeplus.view.presenter.RestMemberPresenter;
 
@@ -28,8 +29,18 @@ public class RestMemberActivity extends ActivityBase<RestMemberPresenter> implem
 
     setContentView(R.layout.activity_rest_member);
 
-    findViewById(R.id.button_access_authority).setOnClickListener(v -> {
+    findViewById(R.id.button_rest_member_close).setOnClickListener(v -> {
+      // 닫기 버튼
+      presenter.onEvent(new Event.Builder(Event.EXIT).build());
+    });
+
+    findViewById(R.id.button_rest_cancel).setOnClickListener(v -> {
+      // 휴면 해제
+      presenter.onEvent(new Event.Builder(Event.CONFIRM).build());
+    });
 
+    findViewById(R.id.text_view_rest_email_information).setOnClickListener(v -> {
+      presenter.onEvent(new Event.Builder(Event.EMAIL_CLICK).build());
     });
 
   }

+ 20 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/RestMemberPresenter.java

@@ -3,9 +3,14 @@
  */
 package kr.co.zumo.app.lifeplus.view.presenter;
 
+import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.model.BlankModel;
+import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IView;
+import kr.co.zumo.app.lifeplus.view.command.ActivityChangeCommand;
+import kr.co.zumo.app.lifeplus.view.command.EmailSendingCommand;
 
 /**
  * RestMemberPresenter
@@ -24,7 +29,8 @@ public class RestMemberPresenter extends Presenter<BlankModel, IView> {
 
   @Override
   public boolean onBackPressed() {
-    return false;
+    onCommand(new ActivityChangeCommand(ScreenID.ACTIVITY_MAIN, ScreenID.DIRECTION_BACK));
+    return true;
   }
 
   @Override
@@ -54,6 +60,19 @@ public class RestMemberPresenter extends Presenter<BlankModel, IView> {
 
   @Override
   protected void onEventInternal(Event event) {
+    switch (event.getEventId()) {
+      case Event.EXIT:
+        onCommand(new ActivityChangeCommand(ScreenID.ACTIVITY_MAIN, ScreenID.DIRECTION_NEXT));
+        break;
+      case Event.CONFIRM:
+        // 휴면 해제 api
+        break;
+      case Event.EMAIL_CLICK:
+        onCommand(new EmailSendingCommand(ResourceUtil.getString(R.string.lifeplus_email)));
+        break;
+      default:
+        break;
+    }
 
   }
 

+ 2 - 2
app/src/main/res/layout/activity_block_member.xml

@@ -24,7 +24,7 @@
         android:text="@string/block_member_title"
         android:textAlignment="center"
         android:textColor="#000000"
-        android:textSize="15sp"/>
+        android:textSize="16sp"/>
 
       <ImageView
         android:id="@+id/button_block_member_close"
@@ -34,7 +34,7 @@
         android:scaleType="center"
         android:layout_centerVertical="true"
         android:layout_alignParentEnd="true"
-        android:layout_marginEnd="26dp"
+        android:layout_marginEnd="16dp"
         android:src="@drawable/icon_header_close"/>
     </RelativeLayout>
 

+ 2 - 2
app/src/main/res/layout/activity_rest_member.xml

@@ -24,7 +24,7 @@
         android:text="@string/rest_member_title"
         android:textAlignment="center"
         android:textColor="#000000"
-        android:textSize="15sp"/>
+        android:textSize="16sp"/>
 
       <ImageView
         android:id="@+id/button_rest_member_close"
@@ -34,7 +34,7 @@
         android:scaleType="center"
         android:layout_centerVertical="true"
         android:layout_alignParentEnd="true"
-        android:layout_marginEnd="26dp"
+        android:layout_marginEnd="16dp"
         android:src="@drawable/icon_header_close"/>
     </RelativeLayout>