Skip to content

Commit 7f22e51

Browse files
committed
feat:适配Android14
1 parent c36b335 commit 7f22e51

4 files changed

Lines changed: 16 additions & 11 deletions

File tree

.idea/sonarlint/securityhotspotstore/index.pb

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FlowHttp/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ plugins {
44
}
55

66
android {
7-
compileSdk 33
7+
compileSdk 34
88

99
defaultConfig {
1010
minSdk 21
11-
targetSdk 33
11+
targetSdk 34
1212
}
1313

1414
buildTypes {

FlowHttp/src/main/java/com/bhm/network/core/RequestManager.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,9 @@ class RequestManager private constructor() {
122122
"ThrowableConsumer-> ",
123123
it.message
124124
) //抛异常
125-
if (System.currentTimeMillis() - httpOptions.currentRequestDateTamp <= httpOptions.delaysProcessLimitTimeMillis) {
126-
delay(httpOptions.delaysProcessLimitTimeMillis)
125+
val requestSpentTime = System.currentTimeMillis() - httpOptions.currentRequestDateTamp
126+
if (requestSpentTime < httpOptions.delaysProcessLimitTimeMillis) {
127+
delay(httpOptions.delaysProcessLimitTimeMillis - requestSpentTime)
127128
doThrowableConsumer(callBack, it)
128129
} else {
129130
doThrowableConsumer(callBack, it)
@@ -139,8 +140,9 @@ class RequestManager private constructor() {
139140
.flowOn(Dispatchers.Main)
140141
.collect {
141142
if (isActive) {
142-
if (System.currentTimeMillis() - httpOptions.currentRequestDateTamp <= httpOptions.delaysProcessLimitTimeMillis) {
143-
delay(httpOptions.delaysProcessLimitTimeMillis)
143+
val requestSpentTime = System.currentTimeMillis() - httpOptions.currentRequestDateTamp
144+
if (requestSpentTime < httpOptions.delaysProcessLimitTimeMillis) {
145+
delay(httpOptions.delaysProcessLimitTimeMillis - requestSpentTime)
144146
doBaseConsumer(callBack, it)
145147
} else {
146148
doBaseConsumer(callBack, it)
@@ -186,8 +188,9 @@ class RequestManager private constructor() {
186188
}
187189
.flowOn(Dispatchers.Main)
188190
.collect {
189-
if (System.currentTimeMillis() - httpOptions.currentRequestDateTamp <= httpOptions.delaysProcessLimitTimeMillis) {
190-
delay(httpOptions.delaysProcessLimitTimeMillis)
191+
val requestSpentTime = System.currentTimeMillis() - httpOptions.currentRequestDateTamp
192+
if (requestSpentTime < httpOptions.delaysProcessLimitTimeMillis) {
193+
delay(httpOptions.delaysProcessLimitTimeMillis - requestSpentTime)
191194
doBaseConsumer(callBack, it)
192195
} else {
193196
doBaseConsumer(callBack, it)

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ plugins {
44
}
55

66
android {
7-
compileSdk 33
7+
compileSdk 34
88

99
defaultConfig {
1010
applicationId "com.bhm.netcore"
1111
minSdk 24
12-
targetSdk 33
12+
targetSdk 34
1313
versionCode 1
1414
versionName "1.0"
1515
}

0 commit comments

Comments
 (0)