浏览代码

[수정사항]
1. 싱가폴 M1 진행에 따라 서버 선택 옵션 추가.

aaron 8 年之前
父节点
当前提交
7591010916

+ 17 - 1
kneet_v3/src/main/java/com/ntels/kneet/v3/common/Constants.java

@@ -93,8 +93,24 @@ public interface Constants {
   final static String VSAAS_SIP_DOMAIN_KNEET_V3 = "vsaas.com";
   final static String VSAAS_SIP_PASSWORD_KNEET_V3 = "qwer!@#$%1";
 
+  //    kneet 3.0 custom
+  final static int KEY_URL_KNEET_V3_DEV_CUSTOM = 2;
+  final static String URL_KNEET_V3_DEV_CUSTOM = "https://61.40.220.132:5018";
+  final static String SMART_URL_KNEET_V3_DEV_CUSTOM = "https://61.40.220.132:5018";
+  final static String SERVICE_ID_KNEET_V3_DEV_CUSTOM = "30001";
+  final static String PROJECT_ID_KNEET_V3_DEV_CUSTOM = "439012691127";
+  final static String APP_START_ID_KNEET_V3_DEV_CUSTOM = "ntels_kneet_v3";
+  final static String URL_SERVICE_HUB_WEBSOCKET_V3_DEV_CUSTOM = "ws://61.40.220.80:8081";
+  final static String URL_SERVICE_HUB_REST_V3_DEV_CUSTOM = "http://61.40.220.80:8080";
+  final static String URL_CLOUD_GATEWAY_V3_DEV_CUSTOM = "http://61.40.220.80:7070";
+  final static String VSAAS_SIP_URL_KNEET_V3_DEV_CUSTOM = "sip:61.40.220.161:5060;lr";
+  final static String VSAAS_TURN_URL_KEET_V3_DEV_CUSTOM = "61.40.220.161";
+  final static int VSAAS_TURN_PORT_KNEET_V3_DEV_CUSTOM = 3478;
+  final static String VSAAS_SIP_DOMAIN_KNEET_V3_DEV_CUSTOM = "celcom.com";
+  final static String VSAAS_SIP_PASSWORD_KNEET_V3_DEV_CUSTOM = "qwer12345!";
+
   //    kneet 2.0 custom
-  final static int KEY_URL_KNEET_V2_DEV_CUSTOM = 2;
+  final static int KEY_URL_KNEET_V2_DEV_CUSTOM = 3;
   final static String URL_KNEET_V2_DEV_CUSTOM = "http://192.168.0.10:5007";
   final static String SMART_URL_KNEET_V2_DEV_CUSTOM = "http://192.168.0.10:5001";
   final static String SERVICE_ID_KNEET_V2_DEV_CUSTOM = "20001";

+ 17 - 0
kneet_v3/src/main/java/com/ntels/kneet/v3/view/Intro.java

@@ -279,6 +279,7 @@ public class Intro extends CustomActivity implements CustomDialog.OnMsgAlterToRe
             mServerTitles.clear();
             mServerTitles.add("Kneet3_개발\n(https://dev.allofthings.com:5018, 30001)");
             mServerTitles.add("Kneet3_운영\n(http://52.163.90.87:5017, 30001)");
+            mServerTitles.add("Kneet3_Custom\n(https://61.40.220.132:5018, 30001)");
 
             Intent intent = new Intent();
             intent.setClass(mActivity, DialogSpinner.class);
@@ -289,6 +290,7 @@ public class Intro extends CustomActivity implements CustomDialog.OnMsgAlterToRe
             mUtil.callActivityForResultNoAnim(mActivity, intent, Constants.ACT_SPINNER);
         } else {
             setServer(Constants.KEY_URL_KNEET_V3);
+//            setServer(Constants.KEY_URL_KNEET_V3_DEV_CUSTOM);
         }
     }
 
@@ -467,6 +469,21 @@ public class Intro extends CustomActivity implements CustomDialog.OnMsgAlterToRe
             mAppConfig.setsSipPassword(Constants.VSAAS_SIP_PASSWORD_KNEET_V3);
             mUtil.setPreferences(mActivity, Constants.EXTRA_APPSTART_ID,
                     Constants.APP_START_ID_KNEET_V3);
+        } else if (val == Constants.KEY_URL_KNEET_V3_DEV_CUSTOM) {
+            mAppConfig.setUrl(Constants.URL_KNEET_V3_DEV_CUSTOM);
+            mAppConfig.setSmartUrl(Constants.SMART_URL_KNEET_V3_DEV_CUSTOM);
+            mAppConfig.setService_Id(Constants.SERVICE_ID_KNEET_V3_DEV_CUSTOM);
+            mAppConfig.setProject_Id(Constants.PROJECT_ID_KNEET_V3_DEV_CUSTOM);
+            mAppConfig.setServicehubWebsocketUrl(Constants.URL_SERVICE_HUB_WEBSOCKET_V3_DEV_CUSTOM);
+            mAppConfig.setServicehubRestUrl(Constants.URL_SERVICE_HUB_REST_V3_DEV_CUSTOM);
+            mAppConfig.setCloudGatewayUrl(Constants.URL_CLOUD_GATEWAY_V3_DEV_CUSTOM);
+            mAppConfig.setsSipUrl(Constants.VSAAS_SIP_URL_KNEET_V3_DEV_CUSTOM);
+            mAppConfig.setsTurnUrl(Constants.VSAAS_TURN_URL_KEET_V3_DEV_CUSTOM);
+            mAppConfig.setiTurnPort(Constants.VSAAS_TURN_PORT_KNEET_V3_DEV_CUSTOM);
+            mAppConfig.setsVsaasDomain(Constants.VSAAS_SIP_DOMAIN_KNEET_V3_DEV_CUSTOM);
+            mAppConfig.setsSipPassword(Constants.VSAAS_SIP_PASSWORD_KNEET_V3_DEV_CUSTOM);
+            mUtil.setPreferences(mActivity, Constants.EXTRA_APPSTART_ID,
+                    Constants.APP_START_ID_KNEET_V3_DEV_CUSTOM);
         } else if (val == Constants.KEY_URL_KNEET_V2_DEV_CUSTOM) {
             mAppConfig.setUrl(Constants.URL_KNEET_V2_DEV_CUSTOM);
             mAppConfig.setSmartUrl(Constants.SMART_URL_KNEET_V2_DEV_CUSTOM);