Merge branch 'feature/v3' of…

Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3

config.gradle

@@ -52,7 +52,7 @@ ext {
             "m-muse"          : "0.0.20.4",
             "m-tests"         : "0.0.15.3",
             "m-course"        : "0.0.34.4",
-            "m-im"            : "0.0.3.5",
+            "m-im"            : "0.0.3.7",
             "m-dynamic"       : "0.0.1.2",
 
 
@@ -81,7 +81,7 @@ ext {
 
             //以下 几乎不会动
             "router"          : "0.0.1",
-            "ydl-net"         : "0.0.3",
+            "ydl-net"         : "0.0.3.1",
             "ydl-utils"       : "0.0.3",
             "ydl-flutter-base": "0.0.5.17",
     ]
@@ -127,7 +127,7 @@ ext {
             //以下 几乎不会动
 
             "router"          : "0.0.1",
-            "ydl-net"         : "0.0.3",
+            "ydl-net"         : "0.0.3.1",
             "ydl-utils"       : "0.0.3",
             "ydl-flutter-base": "0.0.5.17",
     ]

m-home/src/xlzx/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt

@@ -24,6 +24,7 @@ import com.yidianling.consultant.api.IConsultantService
 import com.yidianling.home.R
 import com.yidianling.home.adapter.YdlHomeAdapter
 import com.yidianling.home.constract.IHomeContract
+import com.yidianling.home.constract.YdlHomeViewHolderConstract
 import com.yidianling.home.dialog.ActivityDialog
 import com.yidianling.home.dialog.ActivityGuideDialog
 import com.yidianling.home.event.HomeImpl
@@ -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_toolbar.*
 
+
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
  * @描述: 壹点灵首页fragment

m-im/src/main/java/com/yidianling/im/ui/page/NewMultiMessageFragment.kt

@@ -59,7 +59,7 @@ class NewMultiMessageFragment : BaseFragment() {
     }
 
     override fun getStatusViewOptions(): StatusBarOptions {
-        return StatusBarOptions(true)
+        return StatusBarOptions(isAddStatusView = true, statusBarDarkMode = true)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {

ydl-net/src/main/java/com/ydl/ydlnet/builder/interceptor/log/RequestLogInterceptor.java

@@ -66,11 +66,11 @@ public class RequestLogInterceptor implements Interceptor {
         String bodyString = null;
         if (responseBody != null && isParseable(responseBody.contentType())) {
             bodyString = printResult(request, originalResponse);
+            if (mRequestHandler != null){
+                mRequestHandler.onHttpResultResponse(bodyString, chain, originalResponse);
+            }
         }
 
-        if (mRequestHandler != null)
-            mRequestHandler.onHttpResultResponse(bodyString, chain, originalResponse);
-
         if(mIsDebug) {
             final List<String> segmentList = request.url().encodedPathSegments();
             final String header = originalResponse.headers().toString();

ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/HttpConfig.kt

@@ -130,18 +130,22 @@ class HttpConfig {
                chain: Interceptor.Chain,
                response: Response
            ): Response {
-               val gson = GsonProvider.getGson()
-               val resultData= gson.fromJson(httpResult, BaseAPIResponse::class.java)
-               when (resultData.code) {
-                   AUTH_INEFFECTIVE_CODE -> {
-                        //签证签名失败
-                        ToastUtil.toastShort(resultData.msg)
-                       //更新动态密钥
-                       if (resultData.data!=null){
-                           var authBean = gson.fromJson<AuthBean>(gson.toJson(resultData.data),AuthBean::class.java)
-                           DYNAMIC_SESSION_KEY = authBean?.appKey.toString()
+               try {
+                   val gson = GsonProvider.getGson()
+                   val resultData= gson.fromJson(httpResult, BaseAPIResponse::class.java)
+                   when (resultData.code) {
+                       AUTH_INEFFECTIVE_CODE -> {
+                            //签证签名失败
+                            ToastUtil.toastShort(resultData.msg)
+                           //更新动态密钥
+                           if (resultData.data!=null){
+                               var authBean = gson.fromJson<AuthBean>(gson.toJson(resultData.data),AuthBean::class.java)
+                               DYNAMIC_SESSION_KEY = authBean?.appKey.toString()
+                           }
                        }
                    }
+               } catch (e: Exception) {
+                   LogUtil.e("getRequestHandler:$e")
                }
                return response
            }