Merge pull request #151 from lovekidan/dev

fix code style
Tencent · Nov 6, 2017 · 865e16a · 865e16a
2 parents 6936720 + 1ad7f39
commit 865e16a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/sonic-android/sample/build.gradle b/sonic-android/sample/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     })
 
     // compile sdk from jcenter
-     compile 'com.tencent.sonic:sdk:2.0.0'
+     compile 'com.tencent.sonic:sdk:2.0.0-alpha'
 
     // compile sonic-sdk from local path
     // compile project(path: ':sdk')

diff --git a/sonic-android/sdk/build.gradle b/sonic-android/sdk/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 25
-        versionCode 1
-        versionName "2.0.0"
+        versionCode 2
+        versionName "2.0.0-alpha"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -36,7 +36,7 @@ dependencies {
 
 
 // sdk info
-version = "2.0.0" // sdk version num
+version = "2.0.0-alpha" // sdk version num
 group = "com.tencent.sonic" // maven group id for the artifact
 def SITE_URL = "https://github.com/Tencent/VasSonic" // web site url
 def GIT_URL = "https://github.com/Tencent/VasSonic.git" // git url

diff --git a/sonic-android/sdk/src/main/java/com/tencent/sonic/sdk/SonicServer.java b/sonic-android/sdk/src/main/java/com/tencent/sonic/sdk/SonicServer.java
@@ -249,6 +249,7 @@ public void disconnect() {
      *  return response headers which contains response headers from server and custom response headers from
      *  {@code com.tencent.sonic.sdk.SonicSessionConfig}
      *  note: server response headers have high priority than custom headers!
+     *  @return a Map of header fields
      */
     public  Map<String, List<String>> getResponseHeaderFields() {
         if (null == cachedResponseHeaders) {

diff --git a/sonic-android/sdk/src/main/java/com/tencent/sonic/sdk/SonicSession.java b/sonic-android/sdk/src/main/java/com/tencent/sonic/sdk/SonicSession.java
@@ -636,6 +636,7 @@ protected void handleFlow_Connection(String cacheHtml) {
 
     /**
      * Handle template update {@link SonicSession#SONIC_RESULT_CODE_TEMPLATE_CHANGE} logic.
+     * @param newHtml new Html string from web-server
      */
     protected abstract void handleFlow_TemplateChange(String newHtml);
 

diff --git a/sonic-android/sdk/src/main/java/com/tencent/sonic/sdk/SonicSessionConnection.java b/sonic-android/sdk/src/main/java/com/tencent/sonic/sdk/SonicSessionConnection.java
@@ -119,29 +119,29 @@ public abstract class SonicSessionConnection {
     public final static String HTTP_HEAD_FILED_SET_COOKIE = "Set-Cookie";
 
     /**
-     * HTTP Header : Cache-Control. <br/>
+     * HTTP Header : Cache-Control. <br>
      * This header represents the strategy of cache control.
      */
     public final static String HTTP_HEAD_FIELD_CACHE_CONTROL = "Cache-Control";
 
     /**
-     * HTTP Header : Expires. <br/>
+     * HTTP Header : Expires. <br>
      */
     public final static String HTTP_HEAD_FIELD_EXPIRES = "Expires";
 
     /**
-     * HTTP 1.0 Header : Pragma. <br/>
+     * HTTP 1.0 Header : Pragma. <br>
      * This old header represents the old strategy of cache control.
      */
     public final static String HTTP_HEAD_FIELD_PRAGMA = "Pragma";    //1.0
 
     /**
-     * HTTP Header : Content-Type. </br>
+     * HTTP Header : Content-Type. <br>
      */
     public final static String HTTP_HEAD_FIELD_CONTENT_TYPE = "Content-Type";
 
     /**
-     * HTTP Request Header : Cookie. </br>
+     * HTTP Request Header : Cookie. <br>
      */
     public final static String HTTP_HEAD_FIELD_COOKIE = "Cookie";