Merge branch 'release/013-11' into kneet-v3/master

build.gradle

@@ -13,3 +13,7 @@ allprojects {
         jcenter()
     }
 }
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

kneet_v3/build.gradle

@@ -13,19 +13,24 @@ android {
         minSdkVersion 15
         targetSdkVersion 22
         multiDexEnabled true
-        versionCode 10
+        versionCode 11
         versionName "0.1.3"
     }
 
-    /*productFlavors {
+    productFlavors {
         dev {
             minSdkVersion 21
+            aaptOptions.cruncherEnabled = false;
+            resConfigs "ko", "xxxhdpi"
         }
-
-        prod {
-            minSdkVersion 15
+        prd {
         }
-    }*/
+    }
+
+    android.variantFilter {variant ->
+        def flavorName = variant.getFlavors().get(0).name;
+        splits.abi.enable = (flavorName == 'prd');
+    }
 
     /*task clean(type: Exec) {
         ext.lockhunter = '\"C:\\Program Files\\LockHunter\\LockHunter.exe"'
@@ -49,11 +54,11 @@ android {
                 def formattedDate = new Date().format("yyyyMMdd_HHmmss")
                 def apkName = "Kneet3.0_v" + variant.versionName + "_" + formattedDate + "_Release.apk"
                 output.outputFile = new File(output.outputFile.parent, apkName)
-            } /*else {
+            } else {
                 def formattedDate = new Date().format("yyyyMMdd_HHmmss")
                 def apkName = "Kneet3.0_v" + variant.versionName + "_" + formattedDate + "_Debug.apk"
                 output.outputFile = new File(output.outputFile.parent, apkName)
-            }*/
+            }
         }
     }
 
@@ -111,8 +116,8 @@ dependencies {
     compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.13'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.tsengvn:typekit:1.0.0'
-    compile 'com.koushikdutta.async:androidasync:2.+'
-    compile 'com.mcxiaoke.volley:library:1.0.+'
+    compile 'com.koushikdutta.async:androidasync:2.2.1'
+    compile 'com.mcxiaoke.volley:library:1.0.19'
     compile ('com.google.android:flexbox:0.3.0') {
         exclude module: 'support-compat'
         exclude module: 'recyclerview-v7'

kneet_v3/src/main/java/com/ntels/kneet/v3/common/Constants.java

@@ -79,13 +79,13 @@ public interface Constants {
 
   //    kneet 3.0 운영
   final static int KEY_URL_KNEET_V3 = 1;
-  final static String URL_KNEET_V3 = "http://52.163.90.87:5017";
-  final static String SMART_URL_KNEET_V3 = "http://52.163.90.87:5017";
+  final static String URL_KNEET_V3 = "http://sf.kneet.io:5017";
+  final static String SMART_URL_KNEET_V3 = "http://sf.kneet.io:5017";
   final static String SERVICE_ID_KNEET_V3 = "30001";
   final static String PROJECT_ID_KNEET_V3 = "439012691127";
   final static String APP_START_ID_KNEET_V3 = "ntels_kneet_v3";
-  final static String URL_SERVICE_HUB_WEBSOCKET_V3 = "ws://13.76.96.27:8081";
-  final static String URL_SERVICE_HUB_REST_V3 = "http://13.76.96.27:8080";
+  final static String URL_SERVICE_HUB_WEBSOCKET_V3 = "ws://sp.kneet.io:8081";
+  final static String URL_SERVICE_HUB_REST_V3 = "http://sp.kneet.io:8080";
   final static String URL_CLOUD_GATEWAY_V3 = "http://13.76.96.27:7070";
   final static String VSAAS_SIP_URL_KNEET_V3 = "sip:23.98.73.196:6061;lr";
   final static String VSAAS_TURN_URL_KEET_V3 = "23.98.73.196";