Explorar o código

[공통][Common] Sandbox Gradle 세팅

hyodong.min %!s(int64=7) %!d(string=hai) anos
pai
achega
3a6348f7ec

+ 21 - 0
app/build.gradle

@@ -42,8 +42,29 @@ android {
         }
     }
 
+    sourceSets {
+        /*
+        - dev / product = NetworkConfig 를 다르게 설정
+        - sandbox / common = LifeplusAPIRepository 를 설정
+         */
+        sandbox {
+            java.srcDirs = ['src/dev/java', 'src/sandbox/java']
+        }
+        dev {
+            java.srcDirs = ['src/dev/java', 'src/common/java']
+        }
+        product {
+            java.srcDirs = ['src/product/java', 'src/common/java']
+        }
+    }
+
+
     flavorDimensions "build"
     productFlavors {
+        sandbox {
+            versionNameSuffix "-sandbox"
+            manifestPlaceholders = [appLabel: "@string/app_name"]
+        }
         dev {
             versionNameSuffix "-dev"
             manifestPlaceholders = [appLabel: "@string/app_name"]

+ 72 - 0
app/src/common/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIRepository.java

@@ -0,0 +1,72 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.network.api;
+
+import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.AuthConfirmRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.AuthRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.FAQResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
+import kr.co.zumo.app.lifeplus.bean.api.LoginResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.MemberJoinRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.MemberJoinResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.PolicyConfirmRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.PolicyResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.UserNoBean;
+
+/**
+ * LifeplusAPIRepository
+ * - cache 를 활용할 수 있는 api 는 저장해둔다.
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018-10-06]   [최초 작성]
+ * @since 2018-10-06
+ */
+public class LifeplusAPIRepository implements LifeplusAPI {
+
+  @Override
+  public Single<LifeplusAPIBean> requestMobileAuth(AuthRequestBean bean) {
+    return new LifeplusAPIService().requestMobileAuth(bean);
+  }
+
+  @Override
+  public Single<LifeplusAPIBean> confirmMobileAuth(AuthConfirmRequestBean bean) {
+    return new LifeplusAPIService().confirmMobileAuth(bean);
+  }
+
+  @Override
+  public Single<PolicyResultBean> getPolicyList(RequestBean bean) {
+    return new LifeplusAPIService().getPolicyList(bean);
+  }
+
+  @Override
+  public Single<LifeplusAPIBean> confirmPolicy(PolicyConfirmRequestBean bean) {
+    return new LifeplusAPIService().confirmPolicy(bean);
+  }
+
+  @Override
+  public Single<MemberJoinResultBean> insertMember(MemberJoinRequestBean bean) {
+    return new LifeplusAPIService().insertMember(bean);
+  }
+
+  @Override
+  public Single<LifeplusAPIBean> deleteMember(UserNoBean bean) {
+    return new LifeplusAPIService().deleteMember(bean);
+  }
+
+  @Override
+  public Single<FAQResultBean> getFaqList(RequestBean bean) {
+    return new LifeplusAPIService().getFaqList(bean);
+  }
+
+  @Override
+  public Single<LoginResultBean> selectMember(UserNoBean bean) {
+    return new LifeplusAPIService().selectMember(bean);
+  }
+
+}

+ 4 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/activity/ActivityBase.java

@@ -20,6 +20,7 @@ import kr.co.zumo.app.lifeplus.model.Model;
 import kr.co.zumo.app.lifeplus.network.NetworkReceiver;
 import kr.co.zumo.app.lifeplus.network.NetworkWatcher;
 import kr.co.zumo.app.lifeplus.supervisor.DialogHelper;
+import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.view.IView;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
@@ -204,9 +205,9 @@ public abstract class ActivityBase<P extends Presenter> extends AppCompatActivit
    * 변동이 있을 때 presenter 로 알려준다.
    */
   protected void watchNetwork() {
-//    if (AppUtil.isDebug()) {
-//      return;
-//    }
+    if (AppUtil.isDebug()) {
+      return;
+    }
 
     Log.w("APP# ActivityBase | watchNetwork", "| " + this.getClass().getSimpleName() + " - WATCHING............");
 

+ 5 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/activity/SplashActivity.java

@@ -16,6 +16,7 @@ import kr.co.zumo.app.lifeplus.application.App;
 import kr.co.zumo.app.lifeplus.model.SuperModelInit;
 import kr.co.zumo.app.lifeplus.network.NetworkWatcher;
 import kr.co.zumo.app.lifeplus.supervisor.DialogHelper;
+import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.util.PermissionUtil;
 
 /**
@@ -43,10 +44,10 @@ public class SplashActivity extends AppCompatActivity {
 
     starter = new ActivityStarter(this);
 
-//    if (AppUtil.isDebug()) {
-//      starter.launch(true);
-//      return;
-//    }
+    if (AppUtil.isDebug()) {
+      starter.launch(true);
+      return;
+    }
 
     disposable.add(NetworkWatcher.check(context)
       .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())

+ 71 - 0
app/src/sandbox/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIRepository.java

@@ -0,0 +1,71 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.network.api;
+
+import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.AuthConfirmRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.AuthRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.FAQResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
+import kr.co.zumo.app.lifeplus.bean.api.LoginResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.MemberJoinRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.MemberJoinResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.PolicyConfirmRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.PolicyResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.UserNoBean;
+
+/**
+ * LifeplusAPIRepository
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018-10-06]   [최초 작성]
+ * @since 2018-10-06
+ */
+public class LifeplusAPIRepository implements LifeplusAPI {
+
+  @Override
+  public Single<LifeplusAPIBean> requestMobileAuth(AuthRequestBean bean) {
+    return new LifeplusAPIService().requestMobileAuth(bean);
+  }
+
+  @Override
+  public Single<LifeplusAPIBean> confirmMobileAuth(AuthConfirmRequestBean bean) {
+    return new LifeplusAPIService().confirmMobileAuth(bean);
+  }
+
+  @Override
+  public Single<PolicyResultBean> getPolicyList(RequestBean bean) {
+    return new LifeplusAPIService().getPolicyList(bean);
+  }
+
+  @Override
+  public Single<LifeplusAPIBean> confirmPolicy(PolicyConfirmRequestBean bean) {
+    return new LifeplusAPIService().confirmPolicy(bean);
+  }
+
+  @Override
+  public Single<MemberJoinResultBean> insertMember(MemberJoinRequestBean bean) {
+    return new LifeplusAPIService().insertMember(bean);
+  }
+
+  @Override
+  public Single<LifeplusAPIBean> deleteMember(UserNoBean bean) {
+    return new LifeplusAPIService().deleteMember(bean);
+  }
+
+  @Override
+  public Single<FAQResultBean> getFaqList(RequestBean bean) {
+    return new LifeplusAPIService().getFaqList(bean);
+  }
+
+  @Override
+  public Single<LoginResultBean> selectMember(UserNoBean bean) {
+    return new LifeplusAPIService().selectMember(bean);
+  }
+
+}

+ 5 - 0
app/src/sandbox/res/values/app.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name" translatable="false">Lifeplus - sandbox(release)</string>
+  <string name="app_name_debug" translatable="false">Lifeplus - sandbox(debug)</string>
+</resources>