[마이][New] 보유 쿠폰(쿠폰몰) 링크 추가

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

@@ -27,6 +27,7 @@ public class DevBasicNetworkConfig implements INetworkConfig {
   private static final String COOP_URL = ResourceUtil.getString(R.string.dev_coop_url);
   private static final String COOP_PORT = ResourceUtil.getString(R.string.dev_coop_port);
   private static final String COOP_CODE = ResourceUtil.getString(R.string.dev_coop_code);
+  private static final String COOP_MY_PAGE = "MyPage";
 
   private static final String XECURE_URL = ResourceUtil.getString(R.string.dev_xecure_url);
   private static final String APP_SHIELD_URL = ResourceUtil.getString(R.string.dev_app_shield_url);
@@ -56,6 +57,11 @@ public class DevBasicNetworkConfig implements INetworkConfig {
     return COOP_CODE;
   }
 
+  @Override
+  public String getCoopMyPage() {
+    return COOP_MY_PAGE;
+  }
+
   @Override
   public String getXecureUrl() {
     return XECURE_URL;

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

@@ -27,6 +27,7 @@ public class DevProductNetworkConfig implements INetworkConfig {
   private static final String COOP_URL = ResourceUtil.getString(R.string.coop_url);
   private static final String COOP_PORT = ResourceUtil.getString(R.string.coop_port);
   private static final String COOP_CODE = ResourceUtil.getString(R.string.coop_code);
+  private static final String COOP_MY_PAGE = "MyPage";
 
   private static final String XECURE_URL = ResourceUtil.getString(R.string.xecure_url);
   private static final String APP_SHIELD_URL = ResourceUtil.getString(R.string.app_shield_url);
@@ -56,6 +57,11 @@ public class DevProductNetworkConfig implements INetworkConfig {
     return COOP_CODE;
   }
 
+  @Override
+  public String getCoopMyPage() {
+    return COOP_MY_PAGE;
+  }
+
   @Override
   public String getXecureUrl() {
     return XECURE_URL;

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

@@ -44,6 +44,10 @@ public class NetworkConfig {
     return networkConfig.getCoopPort();
   }
 
+  public static String getCoopMyPage() {
+    return networkConfig.getCoopMyPage();
+  }
+
   public static String getCoopCode() {
     return networkConfig.getCoopCode();
   }

app/src/main/java/kr/co/zumo/app/lifeplus/config/INetworkConfig.java

@@ -24,6 +24,8 @@ public interface INetworkConfig {
 
   String getCoopCode();
 
+  String getCoopMyPage();
+
   String getXecureUrl();
 
   String getAppShieldUrl();

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/couponmall/CouponMallModel.java

@@ -22,7 +22,7 @@ import kr.co.zumo.app.lifeplus.util.ResourceUtil;
  * @since 2018. 11. 2.
  */
 public class CouponMallModel extends Model {
-  private String goodsUrl;
+  private String givenUrl;
 
   @Override
   protected void createViewInternal() {
@@ -77,12 +77,12 @@ public class CouponMallModel extends Model {
     return SuperModel.getInstance().isMember();
   }
 
-  public void setGoodsUrl(String goodsUrl) {
-    this.goodsUrl = goodsUrl;
+  public void setGivenUrl(String givenUrl) {
+    this.givenUrl = givenUrl;
   }
 
-  public String getGoodsUrl() {
-    return goodsUrl;
+  public String getGivenUrl() {
+    return givenUrl;
   }
 
 
@@ -91,7 +91,7 @@ public class CouponMallModel extends Model {
    *
    * @return
    */
-  public String getEncrytedUserId() {
+  public String getEncryptedUserId() {
     try {
       return AES.encrypt(super.getUserId(), ResourceUtil.getString(R.string.aes_key));
     } catch (Exception e) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/couponmall/CouponMallPresenter.java

@@ -36,7 +36,7 @@ public class CouponMallPresenter extends Presenter<CouponMallModel, ICouponMallV
     super(model, view);
 
     String goodsUrl = model.getDeliveryPackaging(String.class);
-    model.setGoodsUrl(goodsUrl);
+    model.setGivenUrl(goodsUrl);
   }
 
   @Override
@@ -99,16 +99,19 @@ public class CouponMallPresenter extends Presenter<CouponMallModel, ICouponMallV
   public void onScreenReady() {
 
     // http://xxx.xx./xxxxx?user_key=xxxx
-    Uri uri;
-    if (StringUtil.isFull(model.getGoodsUrl())) {
-      uri = Uri.parse(model.getGoodsUrl());
-    }
-    else {
-      uri = Uri.parse(NetworkConfig.getCoopUrl() + ":" + NetworkConfig.getCoopPort());
+    Uri.Builder uri = Uri.parse(NetworkConfig.getCoopUrl() + ":" + NetworkConfig.getCoopPort()).buildUpon();
+
+    if (StringUtil.isFull(model.getGivenUrl())) {
+      Uri headUri = Uri.parse(model.getGivenUrl());
+
+      uri.path(headUri.getPath());
+
+      for (String s : headUri.getQueryParameterNames()) {
+        uri.appendQueryParameter(s, headUri.getQueryParameter(s));
+      }
     }
 
-    String url = uri.buildUpon()
-      .appendQueryParameter("key", model.getEncrytedUserId())
+    String url = uri.appendQueryParameter("key", model.getEncryptedUserId())
       .build().toString();
     Log.w("APP# CouponMallPresenter | onScreenReady", "|" + " url: " + url);
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/main/MyMainPresenter.java

@@ -1,6 +1,7 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.main;
 
 
+import android.net.Uri;
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -11,6 +12,7 @@ import kr.co.zumo.app.lifeplus.bean.BucketDeliveryBean;
 import kr.co.zumo.app.lifeplus.bean.ContentsDeliveryBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketWithTagBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
+import kr.co.zumo.app.lifeplus.config.NetworkConfig;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.supervisor.ContentsFlagHelper;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
@@ -224,7 +226,12 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
         model.setDeliveryPackaging(contentsDeliveryBean);
         go(ScreenID.CONTENTS);
         break;
-      case Event.COUPON_MALL :
+      case Event.COUPON_MALL:
+        // 보유 쿠폰
+        Uri.Builder uri = Uri.parse(NetworkConfig.getCoopUrl() + ":" + NetworkConfig.getCoopPort()).buildUpon();
+        uri.appendPath(NetworkConfig.getCoopMyPage());
+        model.setDeliveryPackaging(uri.toString());
+
         go(ScreenID.COUPON_MALL);
         break;
       case Event.MY_PURCHASE_HISTORY:

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

@@ -38,6 +38,10 @@ public class NetworkConfig {
     return networkConfig.getCoopCode();
   }
 
+  public static String getCoopMyPage() {
+    return networkConfig.getCoopMyPage();
+  }
+
   public static String getXecureUrl() {
     return networkConfig.getXecureUrl();
   }