Merge branch 'd/v_xlzx_4.0.50' into 'release'

心理咨询4.0.50

See merge request app_android_lib/YDL-Component!10

config.gradle

@@ -6,12 +6,12 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
             "m-confide"       : "0.0.49.72",
-            "m-consultant"    : "0.0.60.21",
+            "m-consultant"    : "0.0.60.22",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.04",
-            "m-home"          : "0.0.23.44",
-            "m-im"            : "0.0.21.33",
-            "m-dynamic"       : "0.0.7.37",
+            "m-home"          : "0.0.23.47",
+            "m-im"            : "0.0.21.35",
+            "m-dynamic"       : "0.0.7.72",
             "m-article"       : "0.0.0.10",
 
             "m-muse"          : "0.0.28.28",
@@ -33,7 +33,7 @@ ext {
             //-------------- 功能组件 --------------
 
             //mdt 组件
-            "ydl-tuicore"   : "0.0.22",
+            "ydl-tuicore"   : "0.0.23",
             //第一步
             "ydl-platform"    : "0.0.40.97",
 
@@ -92,12 +92,12 @@ ext {
             //第三步 若干
 
             "m-confide"       : "0.0.49.72",
-            "m-consultant"    : "0.0.60.21",
+            "m-consultant"    : "0.0.60.22",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.04",
-            "m-home"          : "0.0.23.41",
-            "m-im"            : "0.0.21.33",
-            "m-dynamic"       : "0.0.7.37",
+            "m-home"          : "0.0.23.47",
+            "m-im"            : "0.0.21.35",
+            "m-dynamic"       : "0.0.7.72",
             "m-article"       : "0.0.0.8",
 
             "m-muse"          : "0.0.28.28",
@@ -117,7 +117,7 @@ ext {
             "m-dynamic-api"   : "0.0.3.71",
             //-------------- 功能组件 --------------
             //mdt组件
-            "ydl-tuicore"   : "0.0.22",
+            "ydl-tuicore"   : "0.0.23",
             //第一步
             "ydl-platform"    : "0.0.40.97",
 

m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt

@@ -242,7 +242,7 @@ class ExpertSearchAdapter(
                             view.tvTag.setTextColor(ContextCompat.getColor(context,R.color.color_EB892C))
                         }else{
                             view.tvTag.setBackgroundResource(R.drawable.consultant_bg_radius_line_gray_1)
-                            view.tvTag.setTextColor(ContextCompat.getColor(context,R.color.platform_color_E0E0E0))
+                            view.tvTag.setTextColor(ContextCompat.getColor(context,R.color.platform_color_666666))
                         }
                         holder.ll_tags.addView(view)
                     }

m-consultant/src/main/res/layout/consultant_item_tag.xml

@@ -8,6 +8,6 @@
     android:gravity="center"
     android:layout_marginEnd="6dp"
     android:padding="3dp"
-    android:textColor="@color/platform_color_999999"
+    android:textColor="@color/platform_color_666666"
     android:textSize="10sp"
     tools:text="恋爱情感" />

m-home/src/main/java/com/yidianling/home/constants/HomeBIConstants.kt

@@ -34,7 +34,7 @@ class HomeBIConstants {
             const val YDL_USER_RADIO_PLAY_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_radio_play_click"//心灵电台play按钮点击
             const val YDL_USER_ARTICLE_MORE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_article_more_click"//文章阅读更多
             const val YDL_USER_ARTICLE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_article_click"//文章标题图区域
-            const val YDL_USER_MAIN_PAGE_VISIT: String = YDL_USER_MAIN_PAGE + "ydl_user_main_page_visit "//首页浏览事件
+            const val YDL_USER_MAIN_PAGE_VISIT: String = YDL_USER_MAIN_PAGE + "ydl_user_main_page_visit"//首页浏览事件
             const val YDL_PRIVATE_CHAT_CLICK: String = YDL_USER_MAIN_PAGE + "private_chat_click"    // 首页咨询分类点击私聊按钮
             const val YDL_HOME_DWELL_TIME: String = YDL_USER_MAIN_PAGE + "ydl_user_main_page_stay_visit"    // 首页停留时长
             const val YDL_HOME_ZHUMIANMINGXIANG: String = YDL_USER_MAIN_PAGE + "ydl_user_sleep_aid_more_click"    // 首页助眠冥想

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

@@ -389,6 +389,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
             }
             mPresenter?.prepareCoupon(mActivity!!)
 
+            ActionCountUtils.count(HomeBIConstants.YDL_USER_MAIN_PAGE_VISIT)
             //走咨询助理浮层展示逻辑，是否展示由内部条件与接口判断
             showConsultAssistantDialog()
         }

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeAssuageGriefItemView.kt

 package com.yidianling.home.ui.view
 
 import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.Drawable
 import android.text.*
-import android.text.style.ForegroundColorSpan
 import android.text.style.ImageSpan
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
-import android.widget.TextView
 import com.ydl.ydl_image.manager.YDLImageCacheManager
 import com.ydl.ydl_router.manager.YDLRouterManager
 import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.ydl.ydlcommon.router.IYDLRouterConstant
 import com.ydl.ydlcommon.utils.MoonUtil
 import com.ydl.ydlcommon.utils.Utils
-import com.yidianling.common.tools.RxDeviceTool
-import com.yidianling.common.tools.RxImageTool
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeAskBean
@@ -77,7 +71,10 @@ class HomeAssuageGriefItemView(
             homeModuleAssuageGriefViewBottomLine.visibility = View.VISIBLE
             homeModuleAssuageGriefViewBottomBtn.visibility = View.GONE
         }
-
+        ll_topic_detail.setOnClickListener {
+            //跳转话题详情
+            homeEvent?.jumpToTopicDetail(bean.topicId.toString())
+        }
 
         /**
          * 点赞

m-home/src/xlzx/res/layout/home_assuage_grief_item_view.xml

@@ -130,6 +130,7 @@
         android:layout_marginTop="@dimen/platform_dp_12"
         android:gravity="center_vertical">
         <LinearLayout
+            android:id="@+id/ll_topic_detail"
             android:layout_width="wrap_content"
             android:layout_height="28dp"
             android:orientation="horizontal"

m-im/src/main/java/com/yidianling/avchatkit/common/permission/MPermission.java

@@ -88,6 +88,8 @@ public class MPermission extends BaseMPermission {
     }
 
     private static void dispatchResult(Object obj, int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        //处理权限异常
+        try {
             List<String> deniedPermissions = new ArrayList<>();
             for (int i = 0; i < grantResults.length; i++) {
                 if (grantResults[i] != PackageManager.PERMISSION_GRANTED) {
@@ -104,6 +106,9 @@ public class MPermission extends BaseMPermission {
             } else {
                 doExecuteSuccess(obj, requestCode);
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     /**

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

@@ -86,10 +86,15 @@ class NewMultiMessageFragment : BaseFragment() {
     override fun onResume() {
         super.onResume()
         getMsgData()
+
+        try {
             NIMClient.getService(MsgService::class.java).setChattingAccount(
                 MsgService.MSG_CHATTING_ACCOUNT_NONE,
                 SessionTypeEnum.None
             )
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
     }
 
     override fun onPause() {

m-user/src/main/java/com/yidianling/user/constants/UserBIConstants.kt

@@ -107,7 +107,7 @@ class UserMyPageEvent{
             const val YDL_USER_RADIO_PLAY_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_radio_play_click"//心灵电台play按钮点击
             const val YDL_USER_ARTICLE_MORE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_article_more_click"//文章阅读更多
             const val YDL_USER_ARTICLE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_article_click"//文章标题图区域
-            const val YDL_USER_MAIN_PAGE_VISIT: String = YDL_USER_MAIN_PAGE + "ydl_user_main_page_visit "//首页浏览事件
+            const val YDL_USER_MAIN_PAGE_VISIT: String = YDL_USER_MAIN_PAGE + "ydl_user_main_page_visit"//首页浏览事件
         }
     }