Merge remote-tracking branch 'origin/master'

Author: derohimat

README.md

@@ -39,13 +39,13 @@ check the version [here](https://github.com/astrnt/qa-sdk-android/releases)
             dimension "mode"
             applicationIdSuffix ".betasdk"
             buildConfigField "boolean", "BETA", "true"
-            buildConfigField("String", "API_URL", '"http://beta.astrnt.co/api/v2/"')
+            buildConfigField("String", "API_URL", '"http://beta.astrnt.co/api/"')
             buildConfigField ("int", "SDK_VERSION", "100")
         }
         live {
             dimension "mode"
             buildConfigField "boolean", "BETA", "false"
-            buildConfigField("String", "API_URL", '"http://app.astrnt.co/api/v2/"')
+            buildConfigField("String", "API_URL", '"http://app.astrnt.co/api/"')
             buildConfigField ("int", "SDK_VERSION", "100")
         }
     }

qasdk/build.gradle

@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 3
-        versionName "1.2"
+        versionCode 5
+        versionName "1.4"
     }
 
     buildTypes {

qasdk/src/main/java/co/astrnt/qasdk/ApiService.java

@@ -18,65 +18,65 @@
 public interface ApiService {
 
     @FormUrlEncoded
-    @POST("interview")
+    @POST("v2/interview")
     Observable<InterviewResultApiDao> enterCode(@Header("token") String token,
                                                 @FieldMap HashMap<String, String> data);
 
     @FormUrlEncoded
-    @POST("user/register")
+    @POST("v2/user/register")
     Observable<InterviewResultApiDao> registerUser(@Header("token") String token,
                                                    @FieldMap HashMap<String, String> data);
 
     @FormUrlEncoded
-    @POST("interview/start")
+    @POST("v2/interview/start")
     Observable<InterviewStartApiDao> startInterview(@Header("token") String token,
                                                     @FieldMap HashMap<String, String> data);
 
     @FormUrlEncoded
-    @POST("interview/finish")
+    @POST("v2/interview/finish")
     Observable<BaseApiDao> finishInterview(@Header("token") String token,
                                            @FieldMap HashMap<String, String> data);
 
     @FormUrlEncoded
-    @POST("cv/status")
+    @POST("v2/cv/status")
     Observable<BaseApiDao> cvStatus(@Header("token") String token,
                                     @FieldMap HashMap<String, String> data);
 
     @FormUrlEncoded
-    @POST("cv/start")
+    @POST("v2/cv/start")
     Observable<BaseApiDao> cvStart(@Header("token") String token,
                                    @FieldMap HashMap<String, String> data);
 
     @FormUrlEncoded
-    @POST("question/attempt")
+    @POST("v2/question/attempt")
     Observable<BaseApiDao> addAttempt(@Header("token") String token,
                                       @FieldMap HashMap<String, String> data);
 
     @FormUrlEncoded
-    @POST("question/answer")
+    @POST("v2/question/answer")
     Observable<BaseApiDao> answerQuestion(@Header("token") String token,
                                           @FieldMap HashMap<String, String> data);
 
     @FormUrlEncoded
-    @POST("question/finish")
+    @POST("v2/question/finish")
     Observable<BaseApiDao> finishQuestion(@Header("token") String token,
                                           @FieldMap HashMap<String, String> data);
 
     @GET("interview/ping")
     Observable<BaseApiDao> pingNetwork(@Header("token") String token);
 
     @FormUrlEncoded
-    @POST("section/start")
+    @POST("v2/section/start")
     Observable<InterviewStartApiDao> startSection(@Header("token") String token,
                                                   @FieldMap HashMap<String, String> data);
 
     @FormUrlEncoded
-    @POST("section/stop")
+    @POST("v2/section/stop")
     Observable<BaseApiDao> stopSection(@Header("token") String token,
                                        @FieldMap HashMap<String, String> data);
 
     @FormUrlEncoded
-    @POST("interview/update/elapsedTime")
+    @POST("v2/interview/update/elapsedTime")
     Observable<BaseApiDao> updateElapsedTime(@Header("token") String token,
                                              @FieldMap HashMap<String, String> data);
 }

sample/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "co.astrnt.astrntqasdk"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 3
-        versionName "1.2"
+        versionCode 5
+        versionName "1.4"
     }
 
     flavorDimensions "mode"
@@ -16,14 +16,14 @@ android {
             dimension "mode"
             applicationIdSuffix ".beta"
             buildConfigField "boolean", "BETA", "true"
-            buildConfigField("String", "API_URL", '"http://beta.astrnt.co/api/v2/"')
+            buildConfigField("String", "API_URL", '"http://beta.astrnt.co/api/"')
             buildConfigField("int", "SDK_VERSION", "106")
             resValue "string", "app_name", "BETA Q&A SDK Sample"
         }
         live {
             dimension "mode"
             buildConfigField "boolean", "BETA", "false"
-            buildConfigField("String", "API_URL", '"http://app.astrnt.co/api/v2/"')
+            buildConfigField("String", "API_URL", '"http://app.astrnt.co/api/"')
             buildConfigField("int", "SDK_VERSION", "106")
             resValue "string", "app_name", "Q&A SDK Sample"
         }
@@ -38,9 +38,9 @@ android {
 }
 
 dependencies {
-    implementation project(':qasdk')
-//    implementation 'com.github.astrnt:qa-sdk-android:1.1'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
+//    implementation project(':qasdk')
+    implementation 'com.github.astrnt:qa-sdk-android:1.4'
+//    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:appcompat-v7:27.1.1'