Commit 60639b0d authored by 快乐石头111's avatar 快乐石头111

修改fetch库context获取路径导致的anr问题&v1.0.5发布

parents c0cb7b48 b77be41d
...@@ -63,7 +63,7 @@ repositories { ...@@ -63,7 +63,7 @@ repositories {
mavenCentral() mavenCentral()
} }
group 'com.qmai.android.fetch' group 'com.qmai.android.fetch'
version '1.0.2' version '1.0.5'
gradlePublish { gradlePublish {
......
...@@ -227,7 +227,7 @@ class KotlinCoroutinesCallAdapterFactory( ...@@ -227,7 +227,7 @@ class KotlinCoroutinesCallAdapterFactory(
charset = contentType.charset(Charset.forName("UTF-8")) charset = contentType.charset(Charset.forName("UTF-8"))
} }
if (isPlaintext(buffer)) { if (isPlaintext(buffer)) {
Log.d(TAG, "getRequestInfo: requestMessage = $requestMessage requestMessage size = ${requestMessage.length} bytes buffer size = ${buffer.size()}") // Log.d(TAG, "getRequestInfo: requestMessage = $requestMessage requestMessage size = ${requestMessage.length} bytes buffer size = ${buffer.size()}")
requestMessage.append(buffer.readString(charset)) requestMessage.append(buffer.readString(charset))
buffer.clear() buffer.clear()
requestMessage.append( requestMessage.append(
......
...@@ -190,12 +190,12 @@ class OkHttpConfig private constructor(builder: Builder) { ...@@ -190,12 +190,12 @@ class OkHttpConfig private constructor(builder: Builder) {
* 配置缓存 * 配置缓存
*/ */
private fun setCacheConfig() { private fun setCacheConfig() {
val externalCacheDir = HolderContext.getContext().externalCacheDir ?: return
defaultCachePath = externalCacheDir.path + "/RxHttpCacheData"
if (isCache) { if (isCache) {
val cache: Cache = if (!TextUtils.isEmpty(cachePath) && cacheMaxSize > 0) { val cache: Cache = if (!TextUtils.isEmpty(cachePath) && cacheMaxSize > 0) {
Cache(File(cachePath!!), cacheMaxSize) Cache(File(cachePath!!), cacheMaxSize)
} else { } else {
val externalCacheDir = HolderContext.getContext().externalCacheDir ?: return
defaultCachePath = externalCacheDir.path + "/RxHttpCacheData"
Cache(File(defaultCachePath!!), defaultCacheSize) Cache(File(defaultCachePath!!), defaultCacheSize)
} }
......
...@@ -96,7 +96,7 @@ fun <T> ViewModel.flowSafeCall(request: () -> T) = liveData<Resource<T>> { ...@@ -96,7 +96,7 @@ fun <T> ViewModel.flowSafeCall(request: () -> T) = liveData<Resource<T>> {
} }
fun <T> handleResponseError(throwable: Throwable?): Resource<T> { fun <T> handleResponseError(throwable: Throwable?): Resource<T> {
Log.d(TAG, "handleResponseError: throwable= $throwable") // Log.d(TAG, "handleResponseError: throwable= $throwable")
return when (throwable) { return when (throwable) {
null -> Resource.error("程序出错", ErrorData(originThrowable = throwable)) null -> Resource.error("程序出错", ErrorData(originThrowable = throwable))
is HttpException -> when (throwable.code()) { is HttpException -> when (throwable.code()) {
......
...@@ -15,7 +15,7 @@ import android.net.ConnectivityManager ...@@ -15,7 +15,7 @@ import android.net.ConnectivityManager
**/ **/
fun isNetworkConnected(context: Context): Boolean { fun isNetworkConnected(context: Context): Boolean {
val mConnectivityManager = val mConnectivityManager =
context!!.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
val mNetworkInfo = mConnectivityManager.activeNetworkInfo val mNetworkInfo = mConnectivityManager.activeNetworkInfo
if (mNetworkInfo != null) { if (mNetworkInfo != null) {
return mNetworkInfo.isAvailable return mNetworkInfo.isAvailable
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment