Commit c5e2b42b by 徐健

Merge branch 'feature/v3' of…

Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
parents 2b733d9f ef4cbfd7
...@@ -52,7 +52,7 @@ ext { ...@@ -52,7 +52,7 @@ ext {
"m-muse" : "0.0.20.4", "m-muse" : "0.0.20.4",
"m-tests" : "0.0.15.3", "m-tests" : "0.0.15.3",
"m-course" : "0.0.34.4", "m-course" : "0.0.34.4",
"m-im" : "0.0.3.5", "m-im" : "0.0.3.7",
"m-dynamic" : "0.0.1.2", "m-dynamic" : "0.0.1.2",
...@@ -81,7 +81,7 @@ ext { ...@@ -81,7 +81,7 @@ ext {
//以下 几乎不会动 //以下 几乎不会动
"router" : "0.0.1", "router" : "0.0.1",
"ydl-net" : "0.0.3", "ydl-net" : "0.0.3.1",
"ydl-utils" : "0.0.3", "ydl-utils" : "0.0.3",
"ydl-flutter-base": "0.0.5.17", "ydl-flutter-base": "0.0.5.17",
] ]
...@@ -127,7 +127,7 @@ ext { ...@@ -127,7 +127,7 @@ ext {
//以下 几乎不会动 //以下 几乎不会动
"router" : "0.0.1", "router" : "0.0.1",
"ydl-net" : "0.0.3", "ydl-net" : "0.0.3.1",
"ydl-utils" : "0.0.3", "ydl-utils" : "0.0.3",
"ydl-flutter-base": "0.0.5.17", "ydl-flutter-base": "0.0.5.17",
] ]
......
...@@ -24,6 +24,7 @@ import com.yidianling.consultant.api.IConsultantService ...@@ -24,6 +24,7 @@ import com.yidianling.consultant.api.IConsultantService
import com.yidianling.home.R import com.yidianling.home.R
import com.yidianling.home.adapter.YdlHomeAdapter import com.yidianling.home.adapter.YdlHomeAdapter
import com.yidianling.home.constract.IHomeContract import com.yidianling.home.constract.IHomeContract
import com.yidianling.home.constract.YdlHomeViewHolderConstract
import com.yidianling.home.dialog.ActivityDialog import com.yidianling.home.dialog.ActivityDialog
import com.yidianling.home.dialog.ActivityGuideDialog import com.yidianling.home.dialog.ActivityGuideDialog
import com.yidianling.home.event.HomeImpl import com.yidianling.home.event.HomeImpl
...@@ -39,6 +40,7 @@ import kotlinx.android.synthetic.xlzx.home_layout_home_module_head_bg.* ...@@ -39,6 +40,7 @@ import kotlinx.android.synthetic.xlzx.home_layout_home_module_head_bg.*
import kotlinx.android.synthetic.xlzx.home_layout_home_module_input.* import kotlinx.android.synthetic.xlzx.home_layout_home_module_input.*
import kotlinx.android.synthetic.xlzx.home_layout_home_module_toolbar.* import kotlinx.android.synthetic.xlzx.home_layout_home_module_toolbar.*
/** /**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a> * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
* @描述: 壹点灵首页fragment * @描述: 壹点灵首页fragment
......
...@@ -59,7 +59,7 @@ class NewMultiMessageFragment : BaseFragment() { ...@@ -59,7 +59,7 @@ class NewMultiMessageFragment : BaseFragment() {
} }
override fun getStatusViewOptions(): StatusBarOptions { override fun getStatusViewOptions(): StatusBarOptions {
return StatusBarOptions(true) return StatusBarOptions(isAddStatusView = true, statusBarDarkMode = true)
} }
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
......
...@@ -66,10 +66,10 @@ public class RequestLogInterceptor implements Interceptor { ...@@ -66,10 +66,10 @@ public class RequestLogInterceptor implements Interceptor {
String bodyString = null; String bodyString = null;
if (responseBody != null && isParseable(responseBody.contentType())) { if (responseBody != null && isParseable(responseBody.contentType())) {
bodyString = printResult(request, originalResponse); bodyString = printResult(request, originalResponse);
} if (mRequestHandler != null){
if (mRequestHandler != null)
mRequestHandler.onHttpResultResponse(bodyString, chain, originalResponse); mRequestHandler.onHttpResultResponse(bodyString, chain, originalResponse);
}
}
if(mIsDebug) { if(mIsDebug) {
final List<String> segmentList = request.url().encodedPathSegments(); final List<String> segmentList = request.url().encodedPathSegments();
......
...@@ -130,6 +130,7 @@ class HttpConfig { ...@@ -130,6 +130,7 @@ class HttpConfig {
chain: Interceptor.Chain, chain: Interceptor.Chain,
response: Response response: Response
): Response { ): Response {
try {
val gson = GsonProvider.getGson() val gson = GsonProvider.getGson()
val resultData= gson.fromJson(httpResult, BaseAPIResponse::class.java) val resultData= gson.fromJson(httpResult, BaseAPIResponse::class.java)
when (resultData.code) { when (resultData.code) {
...@@ -143,6 +144,9 @@ class HttpConfig { ...@@ -143,6 +144,9 @@ class HttpConfig {
} }
} }
} }
} catch (e: Exception) {
LogUtil.e("getRequestHandler:$e")
}
return response return response
} }
......
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