[공통][New] dev debug 에서는 다중 디바이스 체크 안함

app/src/common/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java

@@ -80,10 +80,7 @@ import kr.co.zumo.app.lifeplus.bean.api.WeatherRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.WeatherResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.WidgetResultBean;
 import kr.co.zumo.app.lifeplus.config.NetworkConfig;
-import kr.co.zumo.app.lifeplus.model.BasicParamProvider;
-import kr.co.zumo.app.lifeplus.model.IParamProvider;
 import okhttp3.Interceptor;
-import okhttp3.Request;
 
 /**
  * LifeplusAPIService
@@ -111,43 +108,23 @@ public class LifeplusAPIService extends LifeplusRetrofitService implements Lifep
     return API_URL;
   }
 
+  /**
+   * Header 정보를 포함한 api 객체
+   *
+   * @return
+   */
   private LifeplusAPI api() {
-    return api(chain -> {
-      IParamProvider paramProvider = new BasicParamProvider();
-      Request original = chain.request();
-      Request request = original.newBuilder()
-        .header(RequestBean.PARAM_APP_VER, paramProvider.getVersionName())
-        .header(RequestBean.PARAM_USER_NO, paramProvider.getUserId())
-        .header(RequestBean.PARAM_DEVICE_ID, paramProvider.getDeviceId())
-        .header(RequestBean.PARAM_OS_TYPE, paramProvider.getOsType())
-
-        .method(original.method(), original.body())
-        .build();
-
-      return chain.proceed(request);
-    });
+    return api(getHeaderInterceptor());
   }
 
   /**
-   * Header 에 userNo 를 넣지 않으면 다중 디바이스 검출을 하지 않는다.
+   * Header 정보를 포함하지않은 api 객체
+   * - Header 에 userNo 를 넣지 않으면 다중 디바이스 검출을 하지 않는다.
    *
    * @return
    */
-  private LifeplusAPI apiSkipHeaders() {
-    return api(chain -> {
-      IParamProvider paramProvider = new BasicParamProvider();
-      Request original = chain.request();
-      Request request = original.newBuilder()
-        .header(RequestBean.PARAM_APP_VER, paramProvider.getVersionName())
-//        .header(RequestBean.PARAM_USER_NO, paramProvider.getUserId())
-//        .header(RequestBean.PARAM_DEVICE_ID, paramProvider.getDeviceId())
-        .header(RequestBean.PARAM_OS_TYPE, paramProvider.getOsType())
-
-        .method(original.method(), original.body())
-        .build();
-
-      return chain.proceed(request);
-    });
+  private LifeplusAPI apiWithoutHeaders() {
+    return api(null);
   }
 
   /**
@@ -195,7 +172,7 @@ public class LifeplusAPIService extends LifeplusRetrofitService implements Lifep
    */
   @Override
   public Single<AuthNumberResultBean> requestMobileAuth(AuthNumberRequestBean bean) {
-    return apiSkipHeaders().requestMobileAuth(bean);
+    return apiWithoutHeaders().requestMobileAuth(bean);
   }
 
   /**
@@ -206,7 +183,7 @@ public class LifeplusAPIService extends LifeplusRetrofitService implements Lifep
    */
   @Override
   public Single<MemberAuthResultBean> confirmMobileAuth(AuthConfirmRequestBean bean) {
-    return apiSkipHeaders().confirmMobileAuth(bean);
+    return apiWithoutHeaders().confirmMobileAuth(bean);
   }
 
   /**
@@ -217,7 +194,7 @@ public class LifeplusAPIService extends LifeplusRetrofitService implements Lifep
    */
   @Override
   public Single<AuthNumberResultBean> requestMobileAuthSimple(AuthNumberRequestBean bean) {
-    return apiSkipHeaders().requestMobileAuthSimple(bean);
+    return apiWithoutHeaders().requestMobileAuthSimple(bean);
   }
 
   /**
@@ -228,7 +205,7 @@ public class LifeplusAPIService extends LifeplusRetrofitService implements Lifep
    */
   @Override
   public Single<MemberAuthResultBean> confirmMobileAuthSimple(AuthConfirmRequestBean bean) {
-    return apiSkipHeaders().confirmMobileAuthSimple(bean);
+    return apiWithoutHeaders().confirmMobileAuthSimple(bean);
   }
 
   /**
@@ -549,7 +526,7 @@ public class LifeplusAPIService extends LifeplusRetrofitService implements Lifep
 
   @Override
   public Single<LifeplusAPIBean> updateDeviceId(RequestBean bean) {
-    return apiSkipHeaders().updateDeviceId(bean);
+    return apiWithoutHeaders().updateDeviceId(bean);
   }
 
   /**
@@ -659,7 +636,7 @@ public class LifeplusAPIService extends LifeplusRetrofitService implements Lifep
    */
   @Override
   public Single<SettingMemberResultBean> getMemberInfo(RequestBean bean) {
-    return apiSkipHeaders().getMemberInfo(bean);
+    return apiWithoutHeaders().getMemberInfo(bean);
   }
 
   /**

app/src/dev/java/kr/co/zumo/app/lifeplus/network/api/LifeplusRetrofitService.java

@@ -3,10 +3,16 @@
  */
 package kr.co.zumo.app.lifeplus.network.api;
 
+import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
 import kr.co.zumo.app.lifeplus.config.DebugConfig;
+import kr.co.zumo.app.lifeplus.model.BasicParamProvider;
+import kr.co.zumo.app.lifeplus.model.IParamProvider;
 import kr.co.zumo.app.lifeplus.network.api.ssl.SSLDevSocketFactoryAssign;
 import kr.co.zumo.app.lifeplus.network.api.ssl.SSLSocketFactoryAssign;
+import kr.co.zumo.app.lifeplus.util.AppUtil;
+import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
+import okhttp3.Request;
 
 /**
  * LifeplusRetrofitService
@@ -31,4 +37,24 @@ public class LifeplusRetrofitService extends RetrofitService {
       new SSLDevSocketFactoryAssign(builder);
     }
   }
+
+  final Interceptor getHeaderInterceptor() {
+    return chain -> {
+      IParamProvider paramProvider = new BasicParamProvider();
+      Request original = chain.request();
+      Request.Builder request = original.newBuilder()
+        .header(RequestBean.PARAM_APP_VER, paramProvider.getVersionName())
+        .header(RequestBean.PARAM_OS_TYPE, paramProvider.getOsType())
+        .method(original.method(), original.body());
+
+      // dev-release 에서만 다중 디바이스를 검출한다.
+      // dev-debug 는 안함
+      if (AppUtil.isRelease()) {
+        request.header(RequestBean.PARAM_USER_NO, paramProvider.getUserId())
+          .header(RequestBean.PARAM_DEVICE_ID, paramProvider.getDeviceId());
+      }
+
+      return chain.proceed(request.build());
+    };
+  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/pin/PinResetInputPresenter.java

@@ -70,6 +70,7 @@ public class PinResetInputPresenter extends Presenter<PinResetInputModel, IPinRe
   protected void onEventInternal(Event event) {
     switch (event.getEventId()) {
       case Event.SUCCESS:
+        // 핀 입력 성공
         // 모델에 저장
         model.savePin(event.getString());
         moveToNext();

app/src/main/res/layout/event_participation_item_score.xml

@@ -100,7 +100,7 @@
     android:textColor="@color/C666666"
     android:textSize="11sp"
     android:visibility="gone"
-    app:layout_constraintTop_toBottomOf="@+id/edit_text_nickname"
+    app:layout_constraintTop_toBottomOf="@+id/text_view_score"
     app:layout_constraintTop_toTopOf="@+id/edit_text_score1"
     app:layout_constraintVertical_chainStyle="spread_inside"
     tools:visibility="visible"

app/src/product/java/kr/co/zumo/app/lifeplus/network/api/LifeplusRetrofitService.java

@@ -3,8 +3,13 @@
  */
 package kr.co.zumo.app.lifeplus.network.api;
 
+import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
+import kr.co.zumo.app.lifeplus.model.BasicParamProvider;
+import kr.co.zumo.app.lifeplus.model.IParamProvider;
 import kr.co.zumo.app.lifeplus.network.api.ssl.SSLSocketFactoryAssign;
+import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
+import okhttp3.Request;
 
 /**
  * LifeplusRetrofitService
@@ -21,4 +26,21 @@ public class LifeplusRetrofitService extends RetrofitService {
   protected void assignSslSocketFactory(OkHttpClient.Builder builder) {
     new SSLSocketFactoryAssign(builder);
   }
+
+  final Interceptor getHeaderInterceptor() {
+    return chain -> {
+      IParamProvider paramProvider = new BasicParamProvider();
+      Request original = chain.request();
+      Request request = original.newBuilder()
+        .header(RequestBean.PARAM_APP_VER, paramProvider.getVersionName())
+        .header(RequestBean.PARAM_USER_NO, paramProvider.getUserId())
+        .header(RequestBean.PARAM_DEVICE_ID, paramProvider.getDeviceId())
+        .header(RequestBean.PARAM_OS_TYPE, paramProvider.getOsType())
+
+        .method(original.method(), original.body())
+        .build();
+
+      return chain.proceed(request);
+    };
+  }
 }