tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat:fix network plugin

Browse Source
This commit is contained in:
pengfei.zhou 2019-12-09 21:03:44 +08:00
parent b9307e2def
commit 3127b6fcd7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doric/src/main/java/pub/doric/plugin/NetworkPlugin.java
View File

@ -17,7 +17,6 @@ package pub.doric.plugin;
import android.text.TextUtils; import android.text.TextUtils;
import com.github.pengfeizhou.jscore.JSDecoder;
import com.github.pengfeizhou.jscore.JSONBuilder; import com.github.pengfeizhou.jscore.JSONBuilder;
import com.github.pengfeizhou.jscore.JSObject; import com.github.pengfeizhou.jscore.JSObject;
import com.github.pengfeizhou.jscore.JSValue; import com.github.pengfeizhou.jscore.JSValue;
@ -51,7 +50,8 @@ import pub.doric.extension.bridge.DoricPromise;
*/ */
@DoricPlugin(name = "network") @DoricPlugin(name = "network")
public class NetworkPlugin extends DoricJavaPlugin { public class NetworkPlugin extends DoricJavaPlugin {
private OkHttpClient okHttpClient = new OkHttpClient(); private OkHttpClient okHttpClient = new OkHttpClient.Builder()
.build();
public NetworkPlugin(DoricContext doricContext) { public NetworkPlugin(DoricContext doricContext) {
super(doricContext); super(doricContext);
@ -79,9 +79,10 @@ public class NetworkPlugin extends DoricJavaPlugin {
MediaType mediaType = MediaType.parse(TextUtils.isEmpty(contentType) ? "application/json; charset=utf-8" : contentType); MediaType mediaType = MediaType.parse(TextUtils.isEmpty(contentType) ? "application/json; charset=utf-8" : contentType);
RequestBody requestBody = HttpMethod.permitsRequestBody(method) ? RequestBody.create(mediaType, dataVal.isString() ? dataVal.asString().value() : "") : null; RequestBody requestBody = HttpMethod.permitsRequestBody(method) ? RequestBody.create(mediaType, dataVal.isString() ? dataVal.asString().value() : "") : null;
Request.Builder requestBuilder = new Request.Builder(); Request.Builder requestBuilder = new Request.Builder();
requestBuilder.url(url) requestBuilder = requestBuilder.url(url).headers(headers);
.headers(headers) if (HttpMethod.permitsRequestBody(method.toUpperCase())) {
.method(method, requestBody); requestBuilder = requestBuilder.method(method, requestBody);
}
if (timeoutVal.isNumber() && okHttpClient.connectTimeoutMillis() != timeoutVal.asNumber().toLong()) { if (timeoutVal.isNumber() && okHttpClient.connectTimeoutMillis() != timeoutVal.asNumber().toLong()) {
okHttpClient = okHttpClient.newBuilder().connectTimeout(timeoutVal.asNumber().toLong(), TimeUnit.MILLISECONDS).build(); okHttpClient = okHttpClient.newBuilder().connectTimeout(timeoutVal.asNumber().toLong(), TimeUnit.MILLISECONDS).build();
} }