优化设备配置提交菜品页面数据刷新和显示位置、未配置调料增加提示
This commit is contained in:
@@ -1,21 +1,15 @@
|
||||
package com.shuwei.dish.match.http
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import android.util.Log
|
||||
import com.google.gson.reflect.TypeToken
|
||||
import com.shuwei.dish.match.base.BaseApp
|
||||
import com.shuwei.dish.match.base.BaseReq
|
||||
import com.shuwei.dish.match.http.HttpUtil.runMainThread
|
||||
import com.shuwei.dish.match.utils.SpTool
|
||||
import com.shuwei.dish.match.utils.ext.put
|
||||
import com.shuwei.dish.match.utils.ext.toType
|
||||
import com.shuwei.dish.match.utils.ext.toast
|
||||
import kotlinx.coroutines.Runnable
|
||||
import okhttp3.Call
|
||||
import okhttp3.Callback
|
||||
import okhttp3.HttpUrl
|
||||
import okhttp3.MediaType.Companion.toMediaTypeOrNull
|
||||
import okhttp3.Request
|
||||
import okhttp3.RequestBody.Companion.toRequestBody
|
||||
@@ -41,7 +35,7 @@ object HttpUtil {
|
||||
doFailure: (code: Int?, msg: String?) -> Unit
|
||||
) {
|
||||
val request = Request.Builder()
|
||||
.url(url)
|
||||
.url(if (url.isHttpApi()) url else UrlConfig.BASE_URL + url)
|
||||
.apply {
|
||||
if (header != null) {
|
||||
header.forEach {
|
||||
@@ -111,7 +105,7 @@ object HttpUtil {
|
||||
.toRequestBody("application/json; charset=utf-8".toMediaTypeOrNull())
|
||||
val token = getToken()
|
||||
Request.Builder()
|
||||
.url(url)
|
||||
.url(if (url.isHttpApi()) url else UrlConfig.BASE_URL + url)
|
||||
.apply {
|
||||
if (token.isNotBlank()) {
|
||||
addHeader("X-Access-Token", token)
|
||||
@@ -197,4 +191,6 @@ object HttpUtil {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
fun String.isHttpApi() = this.startsWith("http://") || this.startsWith("https://")
|
||||
|
||||
Reference in New Issue
Block a user