Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

app/build.gradle

@@ -39,7 +39,7 @@ android {
         minSdkVersion 19    // 4.4
         targetSdkVersion 27
         versionCode 169
-        versionName "4.0.0.126"
+        versionName "4.0.0.127"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -116,13 +116,13 @@ android {
             def buildType = variant.variantData.variantConfiguration.buildType.name
             def version = variant.versionName
 
-            def newApkName = "zumo" + SEP + buildType + SEP + version + ".apk"
+            def newApkName
 
-//            if (buildType == "release") {
-//                newApkName = "lifeplus" + SEP + buildType + SEP + version + ".apk"
-//            } else {
-//                newApkName = "lifeplus" + ".apk"
-//            }
+            if (buildType == "release") {
+                newApkName = "zumo" + SEP + buildType + SEP + version + ".apk"
+            } else {
+                newApkName = "zumo" + ".apk"
+            }
             outputFileName = new File(newApkName)
         }
     }

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

@@ -165,13 +165,13 @@ public class ScreenStarter {
           }
         }
         else {
-          showErrorDialog(resultBean.getReturnMessage(), () -> exit());
+          showErrorDialog(resultBean.getReturnMessage(), () -> gotoScreen(SCREEN_SIGN_IN));
         }
       }
 
       @Override
       public void onApiError(String errorMessage, APIError error) {
-        showErrorDialog(errorMessage, () -> exit());
+        showErrorDialog(errorMessage, () -> gotoScreen(SCREEN_SIGN_IN));
       }
     });
   }

app/src/main/java/kr/co/zumo/app/lifeplus/zumo/screen/SignInFragment.java

@@ -77,8 +77,6 @@ public class SignInFragment extends BaseFragment<SignInPresenter> implements Sig
         getView().findViewById(R.id.tv_google).setOnClickListener(onClickListener);
         getView().findViewById(R.id.btn_sign_up).setOnClickListener(onClickListener);
         getView().findViewById(R.id.tv_inquiry).setOnClickListener(onClickListener);
-
-        presenter.autoLogin();
     }
 
     private View.OnClickListener onClickListener = view -> {

app/src/main/java/kr/co/zumo/app/lifeplus/zumo/screen/SignInPresenter.java

@@ -48,19 +48,6 @@ public class SignInPresenter extends BasePresenter<SignUpModel, SignInView> {
         model.isEmailSocialValidCheck(tempUserInfoDeliveryBean, true);
     }
 
-    /**
-     * 기로그인 유저 실행 시 자동 로그인
-     * - useNo 가 있으면 스플래시에서 로그인 처리 후 메인으로 전환 됨
-     */
-    @Deprecated
-    public void autoLogin() {
-        String userNo = SuperModel.getInstance().getPreferences().getUserNo();
-
-        if (!StringUtil.isEmpty(userNo)) {
-            model.getMemberInfoByUserNo();
-        }
-    }
-
     @Override
     public void onResult(Event event) {
         switch (event.getEventId()) {