Skip to content

Commit 865e16a

Browse files
authored
Merge pull request #151 from lovekidan/dev
fix code style
2 parents 6936720 + 1ad7f39 commit 865e16a

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

sonic-android/sample/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
})
2727

2828
// compile sdk from jcenter
29-
compile 'com.tencent.sonic:sdk:2.0.0'
29+
compile 'com.tencent.sonic:sdk:2.0.0-alpha'
3030

3131
// compile sonic-sdk from local path
3232
// compile project(path: ':sdk')

sonic-android/sdk/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ android {
1010
defaultConfig {
1111
minSdkVersion 9
1212
targetSdkVersion 25
13-
versionCode 1
14-
versionName "2.0.0"
13+
versionCode 2
14+
versionName "2.0.0-alpha"
1515

1616
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1717

@@ -36,7 +36,7 @@ dependencies {
3636

3737

3838
// sdk info
39-
version = "2.0.0" // sdk version num
39+
version = "2.0.0-alpha" // sdk version num
4040
group = "com.tencent.sonic" // maven group id for the artifact
4141
def SITE_URL = "https://github.com/Tencent/VasSonic" // web site url
4242
def GIT_URL = "https://github.com/Tencent/VasSonic.git" // git url

sonic-android/sdk/src/main/java/com/tencent/sonic/sdk/SonicServer.java

+1
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ public void disconnect() {
249249
* return response headers which contains response headers from server and custom response headers from
250250
* {@code com.tencent.sonic.sdk.SonicSessionConfig}
251251
* note: server response headers have high priority than custom headers!
252+
* @return a Map of header fields
252253
*/
253254
public Map<String, List<String>> getResponseHeaderFields() {
254255
if (null == cachedResponseHeaders) {

sonic-android/sdk/src/main/java/com/tencent/sonic/sdk/SonicSession.java

+1
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,7 @@ protected void handleFlow_Connection(String cacheHtml) {
636636

637637
/**
638638
* Handle template update {@link SonicSession#SONIC_RESULT_CODE_TEMPLATE_CHANGE} logic.
639+
* @param newHtml new Html string from web-server
639640
*/
640641
protected abstract void handleFlow_TemplateChange(String newHtml);
641642

sonic-android/sdk/src/main/java/com/tencent/sonic/sdk/SonicSessionConnection.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -119,29 +119,29 @@ public abstract class SonicSessionConnection {
119119
public final static String HTTP_HEAD_FILED_SET_COOKIE = "Set-Cookie";
120120

121121
/**
122-
* HTTP Header : Cache-Control. <br/>
122+
* HTTP Header : Cache-Control. <br>
123123
* This header represents the strategy of cache control.
124124
*/
125125
public final static String HTTP_HEAD_FIELD_CACHE_CONTROL = "Cache-Control";
126126

127127
/**
128-
* HTTP Header : Expires. <br/>
128+
* HTTP Header : Expires. <br>
129129
*/
130130
public final static String HTTP_HEAD_FIELD_EXPIRES = "Expires";
131131

132132
/**
133-
* HTTP 1.0 Header : Pragma. <br/>
133+
* HTTP 1.0 Header : Pragma. <br>
134134
* This old header represents the old strategy of cache control.
135135
*/
136136
public final static String HTTP_HEAD_FIELD_PRAGMA = "Pragma"; //1.0
137137

138138
/**
139-
* HTTP Header : Content-Type. </br>
139+
* HTTP Header : Content-Type. <br>
140140
*/
141141
public final static String HTTP_HEAD_FIELD_CONTENT_TYPE = "Content-Type";
142142

143143
/**
144-
* HTTP Request Header : Cookie. </br>
144+
* HTTP Request Header : Cookie. <br>
145145
*/
146146
public final static String HTTP_HEAD_FIELD_COOKIE = "Cookie";
147147

0 commit comments

Comments
 (0)