[공통][New] 쿠폰몰 코드 정의 및 config 파일 정리

app/src/dev/res/values/config.xml

@@ -4,6 +4,7 @@
   <string name="host_port" translatable="false">30080</string>
   <string name="coop_url" translatable="false">http://dev-lifeplus.multicon.co.kr</string>
   <string name="coop_port" translatable="false">7777</string>
+  <string name="coop_code" translatable="false">devLifeplus20181217!@</string>
   <string name="xecure_url" translatable="false">www.zumo.co.kr:1443:28080</string>
   <string name="app_shield_url" translatable="false">http://www.zumo.co.kr/xas-server/</string>
 </resources>

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/coop/CoopRequestBean.java

@@ -30,7 +30,7 @@ public class CoopRequestBean extends JsonBeanBase {
   @SerializedName("code")
   private String code;      // 코드?
   @SerializedName("price")
-  private String price;     // 상품 가격
+  private int price;     // 상품 가격
   @SerializedName("timestamp")
   private String timeStamp; // yyyyMMddHHmmss
 
@@ -50,11 +50,11 @@ public class CoopRequestBean extends JsonBeanBase {
     this.code = code;
   }
 
-  public String getPrice() {
+  public int getPrice() {
     return price;
   }
 
-  public void setPrice(String price) {
+  public void setPrice(int price) {
     this.price = price;
   }
 

app/src/dev/java/kr/co/zumo/app/lifeplus/config/NetworkConfig.java

@@ -5,11 +5,15 @@ import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 
 public class NetworkConfig {
 
-  public static final String HOST_URL = ResourceUtil.getString(R.string.host_url); // dev
-  public static final int HOST_PORT = Integer.parseInt(ResourceUtil.getString(R.string.host_port));
+  /**
+   * dev / product / sandbox 별로 res/config.xml 에서 각각 설정
+   */
+  public static final String HOST_URL = ResourceUtil.getString(R.string.host_url);
+  public static final String HOST_PORT = ResourceUtil.getString(R.string.host_port);
 
-  public static final String COOP_URL = ResourceUtil.getString(R.string.coop_url); // dev
-  public static final int COOP_PORT = Integer.parseInt(ResourceUtil.getString(R.string.coop_port));
+  public static final String COOP_URL = ResourceUtil.getString(R.string.coop_url);
+  public static final String COOP_PORT = ResourceUtil.getString(R.string.coop_port);
+  public static final String COOP_CODE = ResourceUtil.getString(R.string.coop_code);
 
   public static final String XECURE_URL = ResourceUtil.getString(R.string.xecure_url);
   public static final String APP_SHIELD_URL = ResourceUtil.getString(R.string.app_shield_url);

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

@@ -152,9 +152,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/view/screen/my/coin/MyCoinMainModel.java

@@ -3,6 +3,7 @@ package kr.co.zumo.app.lifeplus.view.screen.my.coin;
 import io.reactivex.disposables.Disposable;
 import kr.co.zumo.app.lifeplus.bean.api.coop.CoopRecommendBean;
 import kr.co.zumo.app.lifeplus.bean.api.coop.CoopRequestBean;
+import kr.co.zumo.app.lifeplus.config.NetworkConfig;
 import kr.co.zumo.app.lifeplus.model.Model;
 import kr.co.zumo.app.lifeplus.model.module.APIError;
 import kr.co.zumo.app.lifeplus.model.module.coop.CoopRecommendGoodsModule;
@@ -66,7 +67,13 @@ public class MyCoinMainModel extends Model {
   }
 
   public void loadRecommendGoods() {
-    disposable = new CoopRecommendGoodsModule().call(new CoopRequestBean(), new ICoopAPISimpleModuleListener<CoopRecommendBean>() {
+    CoopRequestBean requestBean = new CoopRequestBean();
+    requestBean.setCode(NetworkConfig.COOP_CODE);
+    requestBean.setPrice(10000);
+    requestBean.setTimeStamp();
+    requestBean.setUserKey(getUserId());
+
+    disposable = new CoopRecommendGoodsModule().call(requestBean, new ICoopAPISimpleModuleListener<CoopRecommendBean>() {
       @Override
       public void onApiSuccess(CoopRecommendBean resultBean) {
         coopRecommendBean = resultBean;

app/src/product/java/kr/co/zumo/app/lifeplus/config/NetworkConfig.java

@@ -1,17 +0,0 @@
-package kr.co.zumo.app.lifeplus.config;
-
-import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.util.ResourceUtil;
-
-public class NetworkConfig {
-
-  public static final String HOST_URL = ResourceUtil.getString(R.string.host_url); // product
-  public static final int HOST_PORT = Integer.parseInt(ResourceUtil.getString(R.string.host_port));
-
-  public static final String COOP_URL = ResourceUtil.getString(R.string.coop_url); // product
-  public static final int COOP_PORT = Integer.parseInt(ResourceUtil.getString(R.string.coop_port));
-
-  public static final String XECURE_URL = ResourceUtil.getString(R.string.xecure_url);
-  public static final String APP_SHIELD_URL = ResourceUtil.getString(R.string.app_shield_url);
-
-}

app/src/product/res/values/config.xml

@@ -4,6 +4,7 @@
   <string name="host_port" translatable="false">443</string>
   <string name="coop_url" translatable="false">https://lifeplus.multicon.co.kr</string>
   <string name="coop_port" translatable="false">443</string>
+  <string name="coop_code" translatable="false">Lifeplus20181217!@</string>
   <string name="xecure_url" translatable="false">www.zumo.co.kr:1443:28080</string>
   <string name="app_shield_url" translatable="false">http://www.zumo.co.kr/xas-server/</string>
 </resources>

app/src/sandbox/res/values/config.xml

@@ -4,6 +4,7 @@
   <string name="host_port" translatable="false">nothing</string>
   <string name="coop_url" translatable="false">http://dev-lifeplus.multicon.co.kr</string>
   <string name="coop_port" translatable="false">7777</string>
+  <string name="coop_code" translatable="false">devLifeplus20181217!@</string>
   <string name="xecure_url" translatable="false">nothing</string>
   <string name="app_shield_url" translatable="false">nothing</string>
 </resources>