diff --git a/Android/java/config.gradle b/Android/java/config.gradle index 836180fe31d8c40d2a18696c201327de20f4d87e..a9d17ac3942586fa43698808439340529f81a0fb 100755 --- a/Android/java/config.gradle +++ b/Android/java/config.gradle @@ -12,7 +12,7 @@ ext { // group_id : 'com.didichuxing.doraemonkit', group_id : 'io.github.didi.dokit', // version : '3.4.0-SNAPSHOT' - version : '3.4.0-alpha02' + version : '3.4.0-alpha03' ] android = [compileSdkVersion : 29, diff --git a/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/aop/urlconnection/ObsoleteUrlFactory.java b/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/aop/urlconnection/ObsoleteUrlFactory.java index 89c30d9367345520cf8576b7055bbb03f51b8e45..bb67044a977248480c36dacab2c170ea56471f4b 100644 --- a/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/aop/urlconnection/ObsoleteUrlFactory.java +++ b/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/aop/urlconnection/ObsoleteUrlFactory.java @@ -1,10 +1,15 @@ package com.didichuxing.doraemonkit.aop.urlconnection; import android.os.Build; +import android.util.Log; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; +import com.didichuxing.doraemonkit.kit.network.utils.StreamUtil; +import com.didichuxing.doraemonkit.util.ConvertUtils; +import com.didichuxing.doraemonkit.util.LogHelper; + import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; @@ -453,9 +458,17 @@ final class ObsoleteUrlFactory implements URLStreamHandlerFactory, Cloneable { } Response response = getResponse(false); - if (response.code() >= HTTP_BAD_REQUEST) - throw new FileNotFoundException(url.toString()); - return response.body().byteStream(); + if (response.code() >= HTTP_BAD_REQUEST) { + Log.e("DoKit", "FileNotFoundException:" + url.toString()); + return ConvertUtils.string2InputStream("FileNotFoundException:" + url.toString(), "utf-8"); + } + + if (response.body() != null) { + return response.body().byteStream(); + } else { + return ConvertUtils.string2InputStream("response.body() is null:" + url.toString(), "utf-8"); + } + } @Override diff --git a/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/core/AbsDokitView.java b/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/core/AbsDokitView.java index 4c6047f692e14c61526733047fec6c9a7ea24d9a..2f5d5ca2ad236c078cc3bde624fb8775b9fc1e4c 100644 --- a/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/core/AbsDokitView.java +++ b/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/core/AbsDokitView.java @@ -235,8 +235,7 @@ public abstract class AbsDokitView implements DokitView, TouchProxy.OnTouchEvent } else { onSystemLayoutParamsCreated(mWindowLayoutParams); } - } catch ( - Exception e) { + } catch (Exception e) { LogHelper.e(TAG, "e===>" + e.getMessage()); e.printStackTrace(); } diff --git a/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/lbs/route/RouteKitView.kt b/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/lbs/route/RouteKitView.kt index 5686faa636f629b19643526096642c724f18d42c..cc5578d08287e3e81ffb4ec0f9e665119a22e812 100644 --- a/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/lbs/route/RouteKitView.kt +++ b/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/lbs/route/RouteKitView.kt @@ -50,10 +50,6 @@ class RouteKitView : AbsDokitView() { lateinit var mTvTip: TextView override fun onViewCreated(rootView: FrameLayout?) { rootView?.let { -// val oaY: ObjectAnimator = ObjectAnimator.ofFloat(rootView, "rotationY", 0.0f, 90.0f) -// oaY.duration = 100 -// oaY.start() - val close = it.findViewById(R.id.iv_close) mSeekbar = it.findViewById(R.id.seekbar) mTvTip = it.findViewById(R.id.tv_tip)