[공통][Bug] 비회원 구분 isMember() -> isActiveMember()

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

@@ -28,7 +28,7 @@ public class MainActivity extends ActivityBase {
     int screenId = new ScreenStarterIDMapper().getScreenId(fragmentFlag);
 
     // 아직 핀 언락을 하지않았다면,
-    if (SuperModel.getInstance().isMember()) {
+    if (SuperModel.getInstance().isActiveMember()) {
       if (SuperModel.getInstance().getPreferences().isAutoUnlock() == false) {
         if (SuperModel.getInstance().isUnlocked() == false) {
           screenId = ScreenID.MAIN_PIN_UNLOCK;

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

@@ -24,7 +24,7 @@ public class MenuActivity extends ActivityBase {
   protected void renderScreen() {
 
     int id;
-    if (SuperModel.getInstance().isMember()) {
+    if (SuperModel.getInstance().isActiveMember()) {
       id = ScreenID.ALL_MENU;
     }
     else {

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

@@ -86,7 +86,7 @@ public class ScreenStarter {
     else if (preferences.isTutorialDone() == false) {
       gotoScreen(START_FROM_ON_BOARDING);
     }
-    else if (StringUtil.isEmpty(userId)) {
+    else {
       // 비회원;
       gotoScreen(START_FROM_MAIN);
     }

app/src/main/java/kr/co/zumo/app/lifeplus/model/Model.java

@@ -119,11 +119,12 @@ public abstract class Model extends ViewModel implements ILifeCycle {
 
   /**
    * 멤버/게스트 확인
+   * - 블럭/휴면 계정도 비회원으로 처리됨.
    *
    * @return
    */
   public boolean isMember() {
-    return SuperModel.getInstance().isMember();
+    return SuperModel.getInstance().isActiveMember();
   }
 
   /**
@@ -131,9 +132,9 @@ public abstract class Model extends ViewModel implements ILifeCycle {
    *
    * @return
    */
-  public final String getUserId() {
-    return SuperModel.getInstance().getUserId();
-  }
+//  public final String getUserId() {
+//    return SuperModel.getInstance().getUserId();
+//  }
 
   /**
    * User Name

app/src/main/java/kr/co/zumo/app/lifeplus/model/SuperModel.java

@@ -251,7 +251,7 @@ public final class SuperModel {
    * @return
    */
   public boolean isActiveMember() {
-    return StringUtil.isFull(getToken()) && StringUtil.isFull(getUserId()) && memberStatus == 0;
+    return /*StringUtil.isFull(getToken()) &&*/ StringUtil.isFull(getUserId()) && memberStatus == 0;
   }
 
   /**