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

 ext {
     kotlin_version = "1.3.21"
-    dev_mode = false
+    dev_mode = true
 
     ydl_app = [
             appName      : "心理咨询壹点灵",
@@ -53,7 +53,7 @@ ext {
 
             "m-muse"          : "0.0.20.8",
             "m-tests"         : "0.0.15.8",
-            "m-course"        : "0.0.34.10",
+            "m-course"        : "0.0.34.12",
 
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.5",
@@ -100,7 +100,7 @@ ext {
 
             "m-muse"          : "0.0.20.7",
             "m-tests"         : "0.0.15.7",
-            "m-course"        : "0.0.34.7",
+            "m-course"        : "0.0.34.10",
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.5",
             "m-confide-api"   : "0.0.1.1",
@@ -225,7 +225,7 @@ ext {
             "systembartint"                : "com.readystatesoftware.systembartint:systembartint:1.0.3",
             "cube"                         : "in.srain.cube:cube-sdk:1.0.44@aar",
             "support-multidex"             : "com.android.support:multidex:1.0.2",
-            "ydl-ijkplayer-jjdxm"          : "com.ydl:jjdxm-ijkplayer:0.0.3",
+            "ydl-ijkplayer-jjdxm"          : "com.ydl:jjdxm-ijkplayer:0.0.4",
             "robust"                       : "com.meituan.robust:robust:0.4.87",
             "walle"                        : "com.meituan.android.walle:library:1.1.5",
             "jpush"                        : "cn.jiguang.sdk:jpush:3.3.6",

m-course/src/main/java/com/yidianling/course/coursePlay/CoursePlayItemViewAudio.kt

@@ -106,7 +106,8 @@ class CoursePlayItemViewAudio : RelativeLayout, PlayViewInterface {
         index: Int,
         list: ArrayList<CourseMediaBean>,
         courseExtra: CourseExtraBean,
-        from: Int
+        from: Int,
+        isAutoPlay: Boolean
     ) {
 
         if (list.isEmpty()) return
@@ -135,10 +136,14 @@ class CoursePlayItemViewAudio : RelativeLayout, PlayViewInterface {
                 if (TextUtils.equals(playView?.getCurrentUrl(), list[currentIndex].url)) {
                     playView?.updateView(currentIndex)
                 } else {
+                    if (isAutoPlay){
                         playView?.play(currentIndex)
                     }
+                }
             } else {
-                playView?.play(index)
+                if (isAutoPlay){
+                    playView?.play(currentIndex)
+                }
             }
         } else {
             if (hasEnsureNetStatus) {
@@ -146,11 +151,15 @@ class CoursePlayItemViewAudio : RelativeLayout, PlayViewInterface {
                     if (TextUtils.equals(playView?.getCurrentUrl(), list[currentIndex].url)) {
                         playView?.updateView(currentIndex)
                     } else {
+                        if (isAutoPlay){
                             playView?.play(currentIndex)
                         }
+                    }
                 } else {
+                    if (isAutoPlay){
                         playView?.play(currentIndex)
                     }
+                }
             } else {
                 playView?.showNetNotice {
                     hasEnsureNetStatus = true
@@ -158,15 +167,19 @@ class CoursePlayItemViewAudio : RelativeLayout, PlayViewInterface {
                         if (TextUtils.equals(playView?.getCurrentUrl(), list[currentIndex].url)) {
                             playView?.updateView(currentIndex)
                         } else {
+                            if (isAutoPlay){
                                 playView?.play(currentIndex)
                             }
+                        }
                     } else {
+                        if (isAutoPlay){
                             playView?.play(currentIndex)
                         }
                     }
                 }
             }
         }
+    }
 
     //将列表转为播放器可用列表
     private fun stringToMusicPlayerList(list: List<CourseMediaBean>): ArrayList<Music> {

m-course/src/main/java/com/yidianling/course/coursePlay/CoursePlayItemViewVideo.kt

@@ -61,7 +61,10 @@ class CoursePlayItemViewVideo : RelativeLayout, PlayViewInterface {
         initView()
 
         wakeLock = (activity!!.getSystemService(Context.POWER_SERVICE) as PowerManager)
-                .newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK or PowerManager.ON_AFTER_RELEASE, "CoursePlayItemViewVideo")
+            .newWakeLock(
+                PowerManager.SCREEN_BRIGHT_WAKE_LOCK or PowerManager.ON_AFTER_RELEASE,
+                "CoursePlayItemViewVideo"
+            )
     }
 
     override fun onNewIntent() {
@@ -153,16 +156,17 @@ class CoursePlayItemViewVideo : RelativeLayout, PlayViewInterface {
             }
         }
         if (canPlay) {
-            PlayerFloatHelper.playingType=PlayTypeEnum.PLAY_TYPE_COURSE
+            PlayerFloatHelper.playingType = PlayTypeEnum.PLAY_TYPE_COURSE
 
 
             var url = playList[index].url
-            url = url.replace("https", "http")
+//            url = url.replace("https", "http")
 
             videoUrl = url
 
             var hisTime = PlayProgressUtil.getProgress(context, url)
             try {
+
                 activity?.videoView = PlayerView(activity)
                     .setScaleType(PlayStateParams.fitparent)
                     .hideMenu(true)
@@ -175,14 +179,21 @@ class CoursePlayItemViewVideo : RelativeLayout, PlayViewInterface {
                     .setOnInfoListener(object : IMediaPlayer.OnInfoListener {
                         override fun onInfo(mp: IMediaPlayer, what: Int, extra: Int): Boolean {
                             LogUtil.e("课程播放--状态-$what")
+                            if (what == PlayStateParams.MEDIA_INFO_VIDEO_INTERRUPT) {
+                                activity?.videoView?.startPlay()
+                            }
+
                             if (what == PlayStateParams.STATE_PAUSED) {
-                                    this@CoursePlayItemViewVideo.findViewById<View>(R.id.rl_play_pause_layout).visibility = View.VISIBLE
+                                this@CoursePlayItemViewVideo.findViewById<View>(R.id.rl_play_pause_layout)
+                                    .visibility = View.VISIBLE
                             } else {
-                                    this@CoursePlayItemViewVideo.findViewById<View>(R.id.rl_play_pause_layout).visibility = View.GONE
+                                this@CoursePlayItemViewVideo.findViewById<View>(R.id.rl_play_pause_layout)
+                                    .visibility = View.GONE
                             }
 
                             if (what == PlayStateParams.STATE_PLAYING) {
-                                    this@CoursePlayItemViewVideo.findViewById<View>(R.id.app_video_loading).visibility = View.GONE
+                                this@CoursePlayItemViewVideo.findViewById<View>(R.id.app_video_loading)
+                                    .visibility = View.GONE
                             }
                             if (what == PlayStateParams.MEDIA_INFO_BUFFERING_END
                                 || what == PlayStateParams.MEDIA_INFO_AUDIO_RENDERING_START
@@ -191,18 +202,31 @@ class CoursePlayItemViewVideo : RelativeLayout, PlayViewInterface {
                                 || what == IMediaPlayer.MEDIA_INFO_VIDEO_SEEK_RENDERING_START
                             ) {
                                 activity?.isVideoPlay = true
-                                    this@CoursePlayItemViewVideo.findViewById<View>(R.id.ll_bg).visibility = View.GONE
-                                    this@CoursePlayItemViewVideo.findViewById<View>(R.id.ll_loading).visibility = View.GONE
-                                    this@CoursePlayItemViewVideo.findViewById<View>(R.id.app_video_loading).visibility = View.GONE
+                                this@CoursePlayItemViewVideo.findViewById<View>(R.id.ll_bg)
+                                    .visibility = View.GONE
+                                this@CoursePlayItemViewVideo.findViewById<View>(R.id.ll_loading)
+                                    .visibility = View.GONE
+                                this@CoursePlayItemViewVideo.findViewById<View>(R.id.app_video_loading)
+                                    .visibility = View.GONE
                             }
 
                             if (what == PlayStateParams.STATE_COMPLETED) {
                                 isVideoPlaying = false
-                                    PlayProgressUtil.saveProgress(this@CoursePlayItemViewVideo.activity, videoUrl, 0)
+                                PlayProgressUtil.saveProgress(
+                                    this@CoursePlayItemViewVideo.activity,
+                                    videoUrl,
+                                    0
+                                )
                                 if (playList.size - 1 > this@CoursePlayItemViewVideo.index) {
                                     //播放下一曲
-                                        play(this@CoursePlayItemViewVideo.index + 1)
+//                                        play(this@CoursePlayItemViewVideo.index + 1)
+                                    this@CoursePlayItemViewVideo.index =
+                                        this@CoursePlayItemViewVideo.index + 1
                                     activity!!.updatePlayingListStatus(this@CoursePlayItemViewVideo.index)
+                                    this@CoursePlayItemViewVideo.findViewById<View>(R.id.ll_loading)
+                                        .visibility = View.VISIBLE
+                                    this@CoursePlayItemViewVideo.findViewById<View>(R.id.app_video_loading)
+                                        .visibility = View.VISIBLE
                                 }
                             } else {
                                 isVideoPlaying = true
@@ -221,6 +245,28 @@ class CoursePlayItemViewVideo : RelativeLayout, PlayViewInterface {
                     .setPlaySource(url)
                     .startPlay()
                     .seekTo(hisTime)
+//                try {
+//                    var videoViewField =
+//                        activity?.videoView.run { javaClass.getDeclaredField("videoView") }
+//                    videoViewField.isAccessible = true
+//
+//                    var ijkVideoView = videoViewField.get(activity?.videoView) as IjkVideoView
+//                    var mMediaPlayerField = ijkVideoView.javaClass.getDeclaredField("mMediaPlayer")
+//
+//                    var mMediaPlayerObject = mMediaPlayerField.get(ijkVideoView)
+//                    if (mMediaPlayerObject is IjkMediaPlayer) {
+//                        mMediaPlayerObject.setOption(
+//                            IjkMediaPlayer.OPT_CATEGORY_FORMAT,
+//                            "dns_cache_clear",
+//                            1
+//                        )
+//                    }
+//                } catch (e: java.lang.Exception) {
+//
+//                }
+//
+//                activity?.videoView?.startPlay()?.seekTo(hisTime)
+
                 val layout = activity?.window?.attributes
                 layout?.screenBrightness = -1f
                 activity?.window?.attributes = layout
@@ -234,14 +280,22 @@ class CoursePlayItemViewVideo : RelativeLayout, PlayViewInterface {
     /**
      * 设置显示数据
      */
-    override fun setData(index: Int, list: ArrayList<CourseMediaBean>, courseExtra: CourseExtraBean, from: Int) {
+    override fun setData(
+        index: Int,
+        list: ArrayList<CourseMediaBean>,
+        courseExtra: CourseExtraBean,
+        from: Int,
+        isAutoPlay: Boolean
+    ) {
 
         if (list.isEmpty()) return
         playList.clear()
         playList.addAll(list)
         this.courseExtra = courseExtra
+        if (isAutoPlay) {
             play(index)
         }
+    }
 
     override fun onDestroy() {
         timer.cancel()

m-course/src/main/java/com/yidianling/course/coursePlay/PlayViewInterface.kt

@@ -18,7 +18,13 @@ interface PlayViewInterface {
     fun onDestroy()
 
     //from 1表示通知栏进来，2表示悬浮按钮进来  index:播放下标
-    fun setData(index: Int, list: ArrayList<CourseMediaBean>, courseExtra: CourseExtraBean, from: Int)
+    fun setData(
+        index: Int,
+        list: ArrayList<CourseMediaBean>,
+        courseExtra: CourseExtraBean,
+        from: Int,
+        isAutoPlay: Boolean = true
+    )
 
     fun onNewIntent()
 

m-course/src/main/java/com/yidianling/course/widget/HPlayView.kt

@@ -40,7 +40,7 @@ class HPlayView : RelativeLayout, OnPlayerEventListener {
         View.inflate(context, R.layout.course_play_music_view, this)
         AudioPlayer.get().addOnPlayEventListener(this)
 
-        play_icon.setOnClickListener {
+        course_audio_play_icon.setOnClickListener {
             AudioPlayer.get().playPause()
         }
         img_gif.setOnClickListener {
@@ -91,9 +91,6 @@ class HPlayView : RelativeLayout, OnPlayerEventListener {
         return this
     }
 
-    /**
-     * 后台进入前台view
-     */
     fun updateView(index: Int) {
         if (AudioPlayer.get().isPlaying) {
             mHandler?.postDelayed({
@@ -139,7 +136,7 @@ class HPlayView : RelativeLayout, OnPlayerEventListener {
         if (mContext != null) {
             Glide.with(mContext).asGif().load(R.drawable.course_loading5).into(img_gif)
         }
-        play_icon.setImageResource(R.drawable.course_ico_course_play)
+        course_audio_play_icon.setImageResource(R.drawable.course_ico_course_play)
 
         pro_progress.progress = 0
         text_start_time.text = "00:00"
@@ -195,13 +192,13 @@ class HPlayView : RelativeLayout, OnPlayerEventListener {
                     if (mContext != null) {
                         Glide.with(mContext).asGif().load(R.drawable.course_loading5).into(img_gif)
                     }
-                    play_icon.setImageResource(R.drawable.course_ico_course_play)
+                    course_audio_play_icon.setImageResource(R.drawable.course_ico_course_play)
                 }
             } else {
                 if (mContext != null) {
                     Glide.with(mContext).asGif().load(R.drawable.course_audio_play).into(img_gif)
                 }
-                play_icon.setImageResource(R.drawable.course_ico_course_pause)
+                course_audio_play_icon.setImageResource(R.drawable.course_ico_course_pause)
             }
         }, 0)
     }
@@ -212,11 +209,11 @@ class HPlayView : RelativeLayout, OnPlayerEventListener {
         mHandler?.postDelayed({
             if (show) {
                 Glide.with(mContext).asGif().load(R.drawable.course_audio_play).into(img_gif)
-                play_icon.setImageResource(R.drawable.course_ico_course_pause)
+                course_audio_play_icon.setImageResource(R.drawable.course_ico_course_pause)
             } else {
                 Glide.with(mContext).asBitmap().load(R.drawable.course_ico_course_bg_pause)
                     .into(img_gif)
-                play_icon.setImageResource(R.drawable.course_ico_course_play)
+                course_audio_play_icon.setImageResource(R.drawable.course_ico_course_play)
             }
         }, 0)
     }

m-course/src/main/res/layout/activity_course_play.xml

@@ -37,7 +37,22 @@
         android:id="@+id/frame_play"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/transparent" />
+        android:background="@color/transparent">
+
+        <FrameLayout
+            android:id="@+id/frame_audio_play"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/transparent"
+            android:visibility="visible" />
+
+        <FrameLayout
+            android:id="@+id/frame_video_play"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/transparent"
+            android:visibility="visible" />
+    </FrameLayout>
 
     <RelativeLayout
         android:id="@+id/title_bar_layout"

m-course/src/main/res/layout/course_play_music_view.xml

@@ -38,7 +38,7 @@
             android:layout_marginBottom="15dp">
 
             <ImageView
-                android:id="@+id/play_icon"
+                android:id="@+id/course_audio_play_icon"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_centerVertical="true"
@@ -54,7 +54,7 @@
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="-3dp"
                 android:layout_toLeftOf="@+id/text_start_time"
-                android:layout_toRightOf="@+id/play_icon"
+                android:layout_toRightOf="@+id/course_audio_play_icon"
                 android:maxHeight="2dp"
                 android:minHeight="2dp"
                 android:progressDrawable="@drawable/course_layer_progress"

m-course/src/main/res/layout/course_videoplay_view.xml

@@ -149,7 +149,7 @@
             android:layout_height="40dp"
             android:layout_centerVertical="true"
             android:layout_marginLeft="3dp"
-            android:padding="1dp"
+            android:padding="3dp"
             android:scaleType="centerCrop"
             android:src="@drawable/course_ico_course_play" />
 

ydl-media/src/main/java/com/ydl/media/audio/AudioPlayer.kt

@@ -13,6 +13,7 @@ import com.ydl.media.audio.manager.NotifyManager
 import com.ydl.media.audio.model.Music
 import com.ydl.media.audio.receiver.NoisyAudioStreamReceiver
 import com.ydl.media.audio.utils.PlayProgressUtil
+import com.ydl.ydlcommon.utils.LogUtil
 import com.yidianling.common.tools.ToastUtil
 import tv.danmaku.ijk.media.player.IMediaPlayer
 import tv.danmaku.ijk.media.player.IjkMediaPlayer
@@ -45,7 +46,11 @@ class AudioPlayer private constructor() {
                 var percent = (current * 100 / du).toInt()
                 //保存进度
                 if (autoSaveProgress) {
-                    PlayProgressUtil.saveProgress(context, playMusic!!.path, (if (percent == 99 || percent == 100) 0 else current.toInt()))
+                    PlayProgressUtil.saveProgress(
+                        context,
+                        playMusic!!.path,
+                        (if (percent == 99 || percent == 100) 0 else current.toInt())
+                    )
                 }
                 for (listener in listeners) {
                     listener.onPublish(percent, current.toLong())
@@ -115,6 +120,16 @@ class AudioPlayer private constructor() {
         this.context = context.applicationContext
         audioFocusManager = AudioFocusManager(context)
         mediaPlayer = IjkMediaPlayer()
+        try {
+            (mediaPlayer as IjkMediaPlayer).setOption(
+                IjkMediaPlayer.OPT_CATEGORY_FORMAT,
+                "dns_cache_clear",
+                1
+            )
+        } catch (e: Exception) {
+            LogUtil.e(e.message)
+        }
+
         mediaPlayer!!.setOnPreparedListener { mp ->
             if (isPreparing) {
                 if (autoSaveProgress) {
@@ -340,7 +355,7 @@ class AudioPlayer private constructor() {
         mediaPlayer!!.pause()
         state = STATE_PAUSE
         handler!!.removeCallbacks(mPublishRunnable)
-        if(isShowNotify){
+        if (isShowNotify) {
             NotifyManager.get().showPause(playMusic)
             MediaSessionManager.get().updatePlaybackState()
         }
@@ -425,7 +440,11 @@ class AudioPlayer private constructor() {
             mediaPlayer!!.seekTo(currentPosition)
             MediaSessionManager.get().updatePlaybackState()
             if (autoSaveProgress) {
-                PlayProgressUtil.saveProgress(context, musicList[playPosition].coverPath, currentPosition.toInt())
+                PlayProgressUtil.saveProgress(
+                    context,
+                    musicList[playPosition].coverPath,
+                    currentPosition.toInt()
+                )
             }
             for (listener in listeners) {
                 listener.onPublish(currentPercent, currentPosition)