From 828409763d0664919a731c5eef74c5f51f671de2 Mon Sep 17 00:00:00 2001 From: neilyhe <228429803@qq.com> Date: Wed, 23 Oct 2024 15:14:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=E5=BA=93?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- explorer/device-android-demo/build.gradle | 4 ++-- explorer/explorer-device-android/build.gradle | 2 +- .../device/android/http/retrofit/StringRequest.kt | 12 ++++++------ .../retrofit/adapter/StringCallAdapterFactory.kt | 8 ++++---- gradle.properties | 3 ++- hub/hub-device-java/build.gradle | 4 ++-- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/explorer/device-android-demo/build.gradle b/explorer/device-android-demo/build.gradle index 81dffeb00..a15f77a1b 100644 --- a/explorer/device-android-demo/build.gradle +++ b/explorer/device-android-demo/build.gradle @@ -120,8 +120,8 @@ dependencies { implementation 'io.reactivex.rxjava2:rxjava:2.2.10' implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' - implementation 'com.squareup.retrofit2:retrofit:2.6.0' - implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.0' + implementation 'com.squareup.retrofit2:retrofit:2.9.0' + implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0' def room_version = "2.2.5" implementation "androidx.room:room-runtime:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version" diff --git a/explorer/explorer-device-android/build.gradle b/explorer/explorer-device-android/build.gradle index 534d1ca3d..1feb910e0 100644 --- a/explorer/explorer-device-android/build.gradle +++ b/explorer/explorer-device-android/build.gradle @@ -151,7 +151,7 @@ dependencies { api project(path: ':hub:hub-device-android') } implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'com.squareup.retrofit2:retrofit:2.0.2' + implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.alibaba:fastjson:2.0.31' } diff --git a/explorer/explorer-device-android/src/main/java/com/tencent/iot/explorer/device/android/http/retrofit/StringRequest.kt b/explorer/explorer-device-android/src/main/java/com/tencent/iot/explorer/device/android/http/retrofit/StringRequest.kt index 89f98ef2f..c8d72143a 100644 --- a/explorer/explorer-device-android/src/main/java/com/tencent/iot/explorer/device/android/http/retrofit/StringRequest.kt +++ b/explorer/explorer-device-android/src/main/java/com/tencent/iot/explorer/device/android/http/retrofit/StringRequest.kt @@ -96,7 +96,7 @@ class StringRequest private constructor() { callback.success(response.body(), reqCode) } else { TXLog.d(TAG, "请求成功：${response.errorBody()}") - callback.success(response.errorBody().string(), reqCode) + callback.success(response.errorBody()?.string(), reqCode) } } }) @@ -127,7 +127,7 @@ class StringRequest private constructor() { callback.success(response.body(), reqCode) } else { TXLog.d(TAG, "请求成功：${response.errorBody()}") - callback.success(response.errorBody().string(), reqCode) + callback.success(response.errorBody()?.string(), reqCode) } } @@ -159,7 +159,7 @@ class StringRequest private constructor() { callback.success(response.body(), reqCode) } else { TXLog.d(TAG, "请求成功：${response.errorBody()}") - callback.success(response.errorBody().string(), reqCode) + callback.success(response.errorBody()?.string(), reqCode) } } @@ -191,7 +191,7 @@ class StringRequest private constructor() { callback.success(response.body(), reqCode) } else { TXLog.d(TAG, "请求成功：${response.errorBody()}") - callback.success(response.errorBody().string(), reqCode) + callback.success(response.errorBody()?.string(), reqCode) } } @@ -239,7 +239,7 @@ class StringRequest private constructor() { callback.success(response.body(), reqCode) } else { TXLog.d(TAG, "请求成功：${response.errorBody()}") - callback.success(response.errorBody().string(), reqCode) + callback.success(response.errorBody()?.string(), reqCode) } } @@ -280,7 +280,7 @@ class StringRequest private constructor() { callback.success(response.body(), reqCode) } else { TXLog.d(TAG, "请求成功：${response.errorBody()}") - callback.success(response.errorBody().string(), reqCode) + callback.success(response.errorBody()?.string(), reqCode) } } diff --git a/explorer/explorer-device-android/src/main/java/com/tencent/iot/explorer/device/android/http/retrofit/adapter/StringCallAdapterFactory.kt b/explorer/explorer-device-android/src/main/java/com/tencent/iot/explorer/device/android/http/retrofit/adapter/StringCallAdapterFactory.kt index 2f7bf8f60..07dafcee7 100644 --- a/explorer/explorer-device-android/src/main/java/com/tencent/iot/explorer/device/android/http/retrofit/adapter/StringCallAdapterFactory.kt +++ b/explorer/explorer-device-android/src/main/java/com/tencent/iot/explorer/device/android/http/retrofit/adapter/StringCallAdapterFactory.kt @@ -12,16 +12,16 @@ class StringCallAdapterFactory private constructor() : CallAdapter.Factory() { type: Type?, array: Array?, retrofit: Retrofit? - ): CallAdapter<*>? { + ): CallAdapter? { if (type == String::class.java) return StringCallAdapter() return null } - inner class StringCallAdapter : CallAdapter { - override fun adapt(call: Call?): String { + inner class StringCallAdapter : CallAdapter { + override fun adapt(call: Call): String { try { - return call?.execute()?.body().toString() + return call.execute().body().toString() } catch (e: Exception) { e.printStackTrace() } diff --git a/gradle.properties b/gradle.properties index 0e1b21995..2992652b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,4 +19,5 @@ android.injected.testOnly=false org.gradle.jvmargs=-Xmx1536m signing.keyId=MY_KEY_ID signing.password=MY_PASSWORD -signing.secretKeyRingFile=MY_KEY_RING_FILE \ No newline at end of file +signing.secretKeyRingFile=MY_KEY_RING_FILE +android.jetifier.blacklist=bcprov \ No newline at end of file diff --git a/hub/hub-device-java/build.gradle b/hub/hub-device-java/build.gradle index 63f6ffa38..b731ca7b1 100644 --- a/hub/hub-device-java/build.gradle +++ b/hub/hub-device-java/build.gradle @@ -145,8 +145,8 @@ dependencies { api "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.mqttJavaSdkVer}" api "com.squareup.okhttp3:okhttp:3.12.2" api 'org.json:json:20240303' - api 'org.bouncycastle:bcprov-jdk15on:1.65' - api 'org.bouncycastle:bcpkix-jdk15on:1.65' + api 'org.bouncycastle:bcprov-jdk15on:1.70' + api 'org.bouncycastle:bcpkix-jdk15on:1.70' //WebSocket api 'org.java-websocket:Java-WebSocket:1.5.2' testImplementation 'junit:junit:4.13'