Browse Source

[공통][Common] ip 상수 .java -> config.xml 로 이동

hyodong.min 7 years ago
parent
commit
bee0cf6aa2

+ 26 - 0
app/src/common/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java

@@ -8,6 +8,7 @@ import kr.co.zumo.app.lifeplus.bean.api.AuthConfirmBean;
 import kr.co.zumo.app.lifeplus.bean.api.AuthNumberBean;
 import kr.co.zumo.app.lifeplus.bean.api.CodeRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.CodeResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.CoinResultBean;
 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;
@@ -16,6 +17,10 @@ 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.SettingMemberEmailRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.SettingMemberEmailResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.SettingMemberResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.SettingResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.UserNoBean;
 import kr.co.zumo.app.lifeplus.config.NetworkConfig;
 
@@ -157,4 +162,25 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
   public Single<CodeResultBean> setCodes(CodeRequestBean bean) {
     return api(AUTH_URL).setCodes(bean);
   }
+
+
+  @Override
+  public Single<SettingResultBean> getSettings(RequestBean bean) {
+    return api(AUTH_URL).getSettings(bean);
+  }
+
+  @Override
+  public Single<SettingMemberResultBean> getMemberInfo(RequestBean bean) {
+    return api(AUTH_URL).getMemberInfo(bean);
+  }
+
+  @Override
+  public Single<SettingMemberEmailResultBean> setMemberEmail(SettingMemberEmailRequestBean bean) {
+    return api(AUTH_URL).setMemberEmail(bean);
+  }
+
+  @Override
+  public Single<CoinResultBean> getCoins(RequestBean bean) {
+    return api(AUTH_URL).getCoins(bean);
+  }
 }

+ 7 - 4
app/src/dev/java/kr/co/zumo/app/lifeplus/config/NetworkConfig.java

@@ -1,10 +1,13 @@
 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 String HOST_URL = "http://192.168.0.100";
-  public static int HOST_PORT = 8080;
+  public static String HOST_URL = ResourceUtil.getString(R.string.host_url); // dev
+  public static int HOST_PORT = Integer.parseInt(ResourceUtil.getString(R.string.host_port));
 
-  public static final String XECURE_URL = "210.216.157.64:1443:28080";
-  public static final String APP_SHIELD_URL = "http://210.216.157.64/xas-server/";
+  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);
 }

+ 7 - 0
app/src/dev/res/values/config.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="host_url" translatable="false">http://192.168.0.100</string>
+  <string name="host_port" translatable="false">8080</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>

+ 7 - 4
app/src/product/java/kr/co/zumo/app/lifeplus/config/NetworkConfig.java

@@ -1,11 +1,14 @@
 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 String HOST_URL = "http://192.168.0.100";
-  public static int HOST_PORT = 8080;
+  public static String HOST_URL = ResourceUtil.getString(R.string.host_url); // product
+  public static int HOST_PORT = Integer.parseInt(ResourceUtil.getString(R.string.host_port));
 
-  public static final String XECURE_URL = "www.zumo.co.kr:1443:28080";
-  public static final String APP_SHIELD_URL = "http://www.zumo.co.kr/xas-server/";
+  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);
 
 }

+ 7 - 0
app/src/product/res/values/config.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="host_url" translatable="false">https://zumo.co.kr</string>
+  <string name="host_port" translatable="false">8080</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>

+ 7 - 0
app/src/sandbox/res/values/config.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="host_url" translatable="false">nothing</string>
+  <string name="host_port" translatable="false">nothing</string>
+  <string name="xecure_url" translatable="false">nothing</string>
+  <string name="app_shield_url" translatable="false">nothing</string>
+</resources>