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

@@ -44,16 +44,16 @@ ext {
             //第三步 若干
 
             "m-confide"       : "0.0.41.2",
-            "m-consultant"    : "0.0.51.11",
+            "m-consultant"    : "0.0.51.12",
             "m-fm"            : "0.0.23.4",
             "m-user"          : "0.0.41.1",
             "m-home"          : "0.0.6.25",
-
-            "m-muse"          : "0.0.20.4",
-            "m-tests"         : "0.0.15.3",
-            "m-course"        : "0.0.34.4",
             "m-im"            : "0.0.3.8",
-            "m-dynamic"       : "0.0.1.5",
+            "m-dynamic"       : "0.0.1.6",
+
+            "m-muse"          : "0.0.20.6",
+            "m-tests"         : "0.0.15.6",
+            "m-course"        : "0.0.34.6",
 
 
             //-------------- 业务模块 API 层 --------------
@@ -83,7 +83,7 @@ ext {
             "router"          : "0.0.1",
             "ydl-net"         : "0.0.3.1",
             "ydl-utils"       : "0.0.3",
-            "ydl-flutter-base": "0.0.5.17",
+            "ydl-flutter-base": "0.0.5.19",
     ]
 
     ydlCompileVersion = [
@@ -91,7 +91,6 @@ ext {
             //第三步 若干
             "m-confide"       : "0.0.40",
             "m-consultant"    : "0.0.28",
-            "m-course"        : "0.0.22",
             "m-fm"            : "0.0.15",
             "m-user"          : "0.0.25",
             "m-home"          : "0.0.3",
@@ -101,6 +100,7 @@ ext {
             // 以下为接入flutter的模块
             "m-muse"          : "0.0.7",
             "m-tests"         : "0.0.4",
+            "m-course"        : "0.0.22",
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.5",
             "m-confide-api"   : "0.0.1.1",
@@ -129,7 +129,7 @@ ext {
             "router"          : "0.0.1",
             "ydl-net"         : "0.0.3.1",
             "ydl-utils"       : "0.0.3",
-            "ydl-flutter-base": "0.0.5.17",
+            "ydl-flutter-base": "0.0.5.19",
     ]
 
     dependencies = [
@@ -267,7 +267,7 @@ ext {
 
             //flutter功能组件升级===>发布ydl-flutter组件===>引用flutter相关的业务模块
             "ydl-flutter-base"             : "com.ydl:ydl-flutter-base:${ydlCompileVersion["ydl-flutter-base"]}", //组件化项目中的flutter base模块
-            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.16.4@aar", //flutter aar
+            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.16.6@aar", //flutter aar
             "ydl-flutter-sp"               : "com.ydl:ydl-flutter-sp:0.0.2@aar", //flutter 缓存 aar
 
             //基础组件 <<--- 先发这个，发完改这里的版本号

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

@@ -215,9 +215,9 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
                 holder.tvChat.setTextColor(ContextCompat.getColor(context,R.color.platform_color_999999))
                 holder.tvChat.background = ContextCompat.getDrawable(context,R.drawable.consultant_expert_search_chat_rest)
             }
-            //月售时长
+            //服务时长
             val durationStringBuffer = StringBuffer()
-            holder.tvSaleDurationForMonth.text = durationStringBuffer.append(itemBean.saleDurationForMonth.toInt()).append("").toString()
+            holder.tvSaleDurationForMonth.text = durationStringBuffer.append(itemBean.allSaleDuration.toInt()).append("").toString()
             //价格
             val sb = StringBuffer()
             holder.tvPrice.text = sb.append("").append(itemBean.minBookingPrice).toString()
@@ -308,7 +308,7 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
         val tvOrderNum = itemView.tvOrderNum!!
         //帮助人数文案
         val tvOrderNumContent = itemView.tvOrderNumContent
-        //月售时长
+        //服务时长
         val tvSaleDurationForMonth = itemView.tvSaleDurationForMonth!!
         //月售时长文案
         val tvSaleDurationForMonthContent = itemView.tvSaleDurationForMonthContent

m-consultant/src/main/java/com/yidianling/consultant/model/bean/DoctorServiceItem.kt

@@ -10,42 +10,43 @@ import com.yidianling.consultant.bean.ExpertSearchTagsIconBean
  * @Company 壹点灵
  * @date 2018/12/11
  */
-data class DoctorServiceItem(/**
+data class DoctorServiceItem(
+    /**
      * 专家ID
      */
-                             val doctorId : String?,
+    val doctorId: String?,
     /**
      * 专家uid
      */
-                             val uid : String?,
+    val uid: String?,
     /**
      * 专家名称
      */
-                             val name : String?,
+    val name: String?,
     /**
      * 跳转路由地址（正常为专家主页地址）
      */
-                             val linkUrl : String?,
+    val linkUrl: String?,
     /**
      * 专家头像地址
      */
-                             val head : String?,
+    val head: String?,
     /**
      * 专家是否在线 1.在线
      */
-                             val isOnline : Int?,
+    val isOnline: Int?,
     /**
      * 能力等级 1.实习 2.新手 3.精英
      */
-                             val abilityLevel : Int?,
+    val abilityLevel: Int?,
     /**
      * 有免费咨询：1.有，2.无
      */
-                             val hasServiceFree : Int?,
+    val hasServiceFree: Int?,
     /**
      * 活动图标
      */
-                             val activityImg:String?,
+    val activityImg: String?,
     /**
      * 是否参加活动
      */
@@ -53,51 +54,55 @@ data class DoctorServiceItem(/**
     /**
      * 是否新入驻：true:是，false:否
      */
-                             var isNewEnter : Boolean = false,
+    var isNewEnter: Boolean = false,
     /**
      * 好评率(倾诉+咨询)
      */
-                             var feedbackRate : Float = 0f,
+    var feedbackRate: Float = 0f,
     /**
      * 评价数(咨询订单数)
      */
-                             var zixunOrderNum : Int = 0,
+    var zixunOrderNum: Int = 0,
     /**
      * 咨询最低价
      */
-                             val minBookingPrice : String?,
+    val minBookingPrice: String?,
     /**
      * 资质材料
      */
-                             val teamCertifications : String?,
+    val teamCertifications: String?,
     /**
      * 标签分类
      */
-                             val tags : String?,
+    val tags: String?,
     /**
      * 已帮助人数(咨询人数)
      */
-                             val zixunOrderUser : String?,
+    val zixunOrderUser: String?,
     /**
      * 月售时长
      */
-                             var saleDurationForMonth : Float = 0f,
+    var saleDurationForMonth: Float = 0f,
+    /**
+     * 服务时长
+     */
+    var allSaleDuration: Float = 0f,
     /**
      * 服务
      */
-                             val products : MutableList<ExpertSearchProductsBean>?,
+    val products: MutableList<ExpertSearchProductsBean>?,
     /**
      * 标签图片
      */
-                             val tagsIcon : ExpertSearchTagsIconBean?,
+    val tagsIcon: ExpertSearchTagsIconBean?,
     /**
      * 今日是否可约
      */
-                            val isTodayFree : Boolean?,
+    val isTodayFree: Boolean?,
     /**
      * 是否咨询中
      */
-                             var inConsult : Boolean = false,
+    var inConsult: Boolean = false,
     /**
      * 是否聆听中
      */
@@ -109,17 +114,17 @@ data class DoctorServiceItem(/**
     /**
      * 个人铭言
      */
-                            val famousRemark : String?,
+    val famousRemark: String?,
     /**
      * 省
      */
-                             val province : String?,
+    val province: String?,
     /**
      * 市
      */
-                            val city : String?,
+    val city: String?,
     /**
      * 私聊按钮的文案(如果不为空则取这个字段的值，如果为空 则默认为：“私聊”)
      */
-                            val chatBtnText : String?
+    val chatBtnText: String?
 )
\ No newline at end of file

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

@@ -222,7 +222,7 @@
         android:textColor="@color/platform_color_999999"
         tools:ignore="SpUsage"
         android:text="人" />
-    <!--月售时长-->
+    <!--服务时长-->
     <TextView
         android:id="@+id/tvSaleDurationForMonthContent"
         android:layout_toRightOf="@+id/tvOrderNum"
@@ -233,7 +233,7 @@
         android:textSize="@dimen/platform_dp_12"
         android:textColor="@color/platform_color_999999"
         tools:ignore="SpUsage"
-        android:text="月售" />
+        android:text="服务" />
 
     <TextView
         android:id="@+id/tvSaleDurationForMonth"

m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendsListFragment.kt

@@ -103,7 +103,8 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
     //置顶帖Header View
     private val recommendTopHeaderView: View
         get() {
-            val view = LayoutInflater.from(activity).inflate(R.layout.dynamic_item_recommend_top, null)
+            val view =
+                LayoutInflater.from(activity).inflate(R.layout.dynamic_item_recommend_top, null)
             val linearLayoutManager = LinearLayoutManager(activity)
             mRecommendTopAdapter = RecommendTopAdapter<TrendsListBean.ExtData>(activity)
             mRecommendTopRcv = view.findViewById<View>(R.id.recy_top) as RecyclerView
@@ -127,7 +128,8 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
             val view: View
             if (trends_rcv != null) {
                 view =
-                    LayoutInflater.from(activity).inflate(R.layout.dynamic_progress_item, trends_rcv, false)
+                    LayoutInflater.from(activity)
+                        .inflate(R.layout.dynamic_progress_item, trends_rcv, false)
             } else {
                 view = LayoutInflater.from(activity).inflate(R.layout.dynamic_progress_item, null)
             }
@@ -138,9 +140,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
     val isNeedLogin: Boolean
         get() {
             tab = arguments.getInt("tab")
-            return if (tab == 3) {
-                true
-            } else false
+            return tab == 3
         }
 
     private val lastId: Int

m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java

@@ -178,7 +178,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
         //和助理私聊时的常用语逻辑
         rl_common_question_enter = rootView.findViewById(R.id.rl_common_question);
         fl_question_content = rootView.findViewById(R.id.fl_question_content);
-        rl_common_question_enter.setVisibility(ActionHandlerStorage.getL(sessionId).getUserType() == 3 ? View.VISIBLE : View.GONE);
+        rl_common_question_enter.setVisibility(ActionHandlerStorage.getL(sessionId) != null && ActionHandlerStorage.getL(sessionId).getUserType() == 3 ? View.VISIBLE : View.GONE);
 
         if (ActionHandlerStorage.getL(sessionId) != null && ActionHandlerStorage.getL(sessionId).getUserType() == 3) {
             rl_common_question_enter.setOnClickListener(v -> {
@@ -214,14 +214,16 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
                         }
                     });
                     getUserInfoCollect();
+                    if (!getActivity().isFinishing()) {
                         collectInfoPopupWindow.show(top_expert_info_cl);
                     }
+                }
                 ChatStatusCacheHelper.clearDataByKey("collectEvent");
             }
         }
 
         // 初始化顶部专家信息栏
-        if (ActionHandlerStorage.getL(sessionId).getUserType() == 2) {
+        if (ActionHandlerStorage.getL(sessionId) != null && ActionHandlerStorage.getL(sessionId).getUserType() == 2) {
             top_expert_info_cl.setVisibility(View.VISIBLE);
             initTopCustomBar();
         }
@@ -506,7 +508,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
             if (TextUtils.equals(userChatStatus, "true")) {
                 messageListPanel = new MessageListPanelEx(container, rootView, anchor, false, true);
                 SharedPreferencesEditor.putString(chatStatusKey, "true");
-            }else {
+            } else {
                 messageListPanel = new MessageListPanelEx(container, rootView, anchor, false, false);
             }
         } else {
@@ -849,4 +851,5 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
                 .subscribe(resp -> {
                 }, throwable -> {
                 });
-    }}
+    }
+}

m-muse/src/main/java/com/yidianling/muse/handler/MusePlugin.kt

@@ -4,6 +4,8 @@ import android.graphics.drawable.Drawable
 import com.google.gson.Gson
 import com.ydl.media.audio.AudioPlayer
 import com.ydl.media.audio.model.Music
+import com.ydl.media.view.PlayTypeEnum
+import com.ydl.media.view.PlayerFloatHelper
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.view.dialog.YDLShareDialog
 import com.yidianling.common.tools.ToastUtil
@@ -77,6 +79,7 @@ class MusePlugin : MethodChannel.MethodCallHandler {
                         music.artist = ""
                         music.coverPath = ""
                         music.title = ""
+                        PlayerFloatHelper.playingType = PlayTypeEnum.PLAY_TYPE_MUSE
                         AudioPlayer.get().singleCirclePlay(music)
                     }
                 }