Merge branch 'd/meditation_bugfix' into 'd/v4.3.95'

D/meditation bugfix

See merge request app_android_lib/YDL-Component!136

m-home/src/ydl/java/com/yidianling/home/ui/view/HomeMuseView.kt

@@ -80,6 +80,8 @@ class HomeMuseView(private val mContext: Context, private var homeEvent: IHomeEv
                     //防止连击
                     return@setOnClickListener
                 }
+                //冥想助眠更多点击事件
+                ActionCountUtils.count(HomeBIConstants.YDL_HOME_MEDITATION_MORE_CLICK)
                 if (!moreLink.isNullOrBlank()) {
                     NewH5Activity.start(context, H5Params(moreLink, null))
                 }

m-muse/src/main/java/com/yidianling/muse/activity/PlayMeditationActivity.kt

@@ -153,6 +153,8 @@ class PlayMeditationActivity : BaseActivity() {
                             mBuried = meditation.buried
                             mStatus = meditation.status
 
+                            collected = mStatus == 1
+
                             updateUI()
 
                             initMediaPlayer(

m-muse/src/main/java/com/yidianling/muse/utils/MediaPlayerTimeUtil.kt

@@ -28,7 +28,7 @@ class MediaPlayerTimeUtil {
                         "$minute:$second"
                     }
                 }
-            }else if (time<60){
+            }else if (time in 1..59){
                 second = time
                 return if (second in 0..9){
                     "00:0$second"
@@ -36,7 +36,7 @@ class MediaPlayerTimeUtil {
                     "00:$second"
                 }
             }
-            return null
+            return ""
         }
 
         fun formatTimeOff(finishTime:Long):String{