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

app/src/main/AndroidManifest.xml

@@ -18,6 +18,7 @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
+            android:networkSecurityConfig="@xml/network_config"
             android:theme="@style/platform_CommonTheme"
             tools:ignore="GoogleAppIndexingWarning"
             tools:replace="android:allowBackup, android:icon, android:label">

app/src/main/res/xml/network_config.xml

+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
\ No newline at end of file

config.gradle

@@ -42,7 +42,8 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.22",
+
+            "m-confide"       : "0.0.24",
             "m-consultant"    : "0.0.39",
             "m-course"        : "0.0.26",
             "m-fm"            : "0.0.17",
@@ -50,6 +51,7 @@ ext {
             "m-tests"         : "0.0.11",
             "m-user"          : "0.0.32",
 
+
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.1",
             "m-confide-api"   : "0.0.1",
@@ -64,10 +66,12 @@ ext {
             //第一步
             "ydl-platform"    : "0.0.26",
             //第二步 若干
+
             "ydl-webview"     : "0.0.27",
             "ydl-media"       : "0.0.13",
             "ydl-pay"         : "0.0.10",
-            "m-audioim"       : "0.0.16",
+            "m-audioim"       : "0.0.17",
+
             //以下 几乎不会动
             "router"          : "0.0.1",
             "ydl-net"         : "0.0.2",
@@ -78,7 +82,7 @@ ext {
     ydlCompileVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.15",
+            "m-confide"       : "0.0.23",
             "m-consultant"    : "0.0.26",
             "m-course"        : "0.0.22",
             "m-fm"            : "0.0.15",
@@ -99,10 +103,12 @@ ext {
             //第一步
             "ydl-platform"    : "0.0.26",
             //第二步 若干
+
             "ydl-webview"     : "0.0.27",
             "ydl-media"       : "0.0.13",
             "ydl-pay"         : "0.0.10",
-            "m-audioim"       : "0.0.16",
+            "m-audioim"       : "0.0.17",
+
             //以下 几乎不会动
 
             "router"          : "0.0.1",

m-audioim/src/main/java/com/ydl/audioim/YDLavManager.kt

 package com.ydl.audioim
 
+import android.annotation.SuppressLint
 import android.content.Context
+import android.text.TextUtils
 import com.ydl.ydl_av.messge_service.YDLRTMClient
 import com.ydl.ydl_av.messge_service.bean.RTMMesssage
 import com.ydl.ydl_av.messge_service.callback.InitListener
@@ -32,10 +34,16 @@ class YDLavManager {
         YDLRTMClient.instances.init(context,appId,listener)
     }
 
+    @SuppressLint("CheckResult")
     fun login(userId:String?){
+        if (TextUtils.isEmpty(userId) || userId?:"0" <= "0"){
+            //如果uid为空或小于等于0 ，则不进行登录，因为uid为0也会登录成功，会导致后面uid正确时无法登录
+            LogUtil.e("[agora]login-uid:$userId")
+            return
+        }
         //登录实时消息
         //获取token
-        AudioApiRequestUtil.getAgoraToken(userId)
+        AudioApiRequestUtil.getAgoraToken()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe({

m-audioim/src/main/java/com/ydl/audioim/http/AudioApiRequestUtil.kt

@@ -73,8 +73,8 @@ class AudioApiRequestUtil {
         /**
          * 获取声网登录token
          */
-        fun getAgoraToken(uid:String?): Observable<BaseAPIResponse<AgoraTokenResponse>>{
-            return YDLHttpUtils.obtainApi(AudioNetAPi::class.java).getAgoraToken(uid)
+        fun getAgoraToken(): Observable<BaseAPIResponse<AgoraTokenResponse>>{
+            return YDLHttpUtils.obtainApi(AudioNetAPi::class.java).getAgoraToken()
         }
     }
 }
\ No newline at end of file

m-audioim/src/main/java/com/ydl/audioim/http/AudioNetAPi.kt

@@ -51,5 +51,6 @@ interface AudioNetAPi {
      */
     @Headers( YDL_DOMAIN + YDL_DOMAIN_JAVA,"Content-Type:application/json")
     @GET("im/getAgoraToken")
-    fun getAgoraToken(@Query("uid") uid: String?): Observable<BaseAPIResponse<AgoraTokenResponse>>
+    fun getAgoraToken(): Observable<BaseAPIResponse<AgoraTokenResponse>>
+
 }
\ No newline at end of file

m-fm/src/main/java/com/yidianling/fm/FMDetailActivity.java

@@ -26,6 +26,7 @@ import com.ydl.media.audio.AudioPlayer;
 import com.ydl.media.audio.OnPlayerEventListener;
 import com.ydl.media.audio.model.Music;
 import com.ydl.media.view.PlayerFloatHelper;
+import com.ydl.media.view.PlayerFloatView;
 import com.ydl.ydl_image.module.GlideApp;
 import com.ydl.ydl_image.transform.GlideCircleRingTransform;
 import com.ydl.ydlcommon.base.BaseActivity;
@@ -61,7 +62,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
  * Created by softrice on 15/12/11.
  */
 @Route(path = "/fm/detail")
-public class FMDetailActivity extends BaseActivity implements View.OnClickListener, OnPlayerEventListener {
+public class FMDetailActivity extends BaseActivity implements View.OnClickListener, OnPlayerEventListener, PlayerFloatView.FloatViewPlayListener {
 
     int id;
     boolean isSplash;
@@ -222,11 +223,11 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen
         iv_next.setOnClickListener(this);
         iv_last.setOnClickListener(this);
         iv_share.setOnClickListener(this);
-
         initRefreshAnimate();
         init();
         initSurfaceView();
         initImg();
+        PlayerFloatHelper.Companion.addClickListener(this);
     }
 
     @SuppressLint("WrongConstant")
@@ -590,8 +591,8 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen
         anim.cancel();
 
         EventBus.getDefault().unregister(this);
-
         AudioPlayer.Companion.get().removeOnPlayEventListener(this);
+        PlayerFloatHelper.Companion.removeClickListener(this);
     }
 
     @Override
@@ -639,4 +640,21 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen
         updateAnimateStatus();
         getFMDetail(fmDetail.getNext_id(), true);
     }
+
+    @Override
+    public void onPauseClick() {
+        iv_play.setImageResource(R.drawable.fm_play_2);
+        fmSurfaceView.stopTimer();
+    }
+
+    @Override
+    public void onStartClick() {
+        iv_play.setImageResource(R.drawable.fm_stop_2);
+        fmSurfaceView.playTimer();
+    }
+
+    @Override
+    public void onPlayFinish() {
+
+    }
 }

ydl-media/src/main/java/com/ydl/media/view/PlayerFloatHelper.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.graphics.PixelFormat
 import android.graphics.Point
 import android.os.Bundle
+import android.support.v4.view.ViewCompat
 import android.text.TextUtils
 import android.view.Gravity
 import android.view.View
@@ -141,7 +142,12 @@ class PlayerFloatHelper {
 
         private fun addFloatToWm(context: Context) {
             if (wm != null && !TextUtils.isEmpty(showingPageName)) {
-                wm?.removeViewImmediate(mPlayerFloatView)
+                if (ViewCompat.isAttachedToWindow(mPlayerFloatView)){
+//                    if (context is Activity && !(context.isFinishing)){
+//                      wm?.removeViewImmediate(mPlayerFloatView)
+//                    }
+                    wm?.removeViewImmediate(mPlayerFloatView)
+                }
                 wm = null
             }
             //获取WindowManager