Merge branch 'fix/lp/lp_fix_back_audio' into 'd/v4.4.08'

feat: 解决锁屏后无声音问题

See merge request app_android_lib/YDL-Component!319

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         ydlrouter_version = '1.2.3'
         constrait_support_version = '1.0.2'
 
-        componentVersion = "0.3.0.38"
+        componentVersion = "0.3.0.39-SNAPSHOT"
     }
     repositories {
         mavenCentral()

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

@@ -33,6 +33,7 @@ import com.ydl.audioim.http.command.ConnectExceptionCommand
 import com.ydl.audioim.http.command.NoticePushCommand
 import com.ydl.audioim.http.command.PayLoad
 import com.ydl.audioim.listener.IntentConstants
+import com.ydl.audioim.notification.FloatService
 import com.ydl.audioim.player.AudioPlayer
 import com.ydl.audioim.presenter.AudioHomePresenterImpl
 import com.ydl.audioim.router.AudioImIn
@@ -233,7 +234,7 @@ class AudioHomeActivity :
     private var canChangeRoute: Boolean = false
 
     private var hasHandleRefused = false
-
+    private var mServiceIntent: Intent? = null
     private val notificationCallback = object : IMRegisterObserverCustomNotificationCallBack {
         override fun onObserverCustomNotification(fromUid: String, toUid: String, content: String) {
             if (fromUid == listenerUid) {
@@ -521,6 +522,12 @@ class AudioHomeActivity :
     override fun initDataAndEvent() {
         //状态栏颜色
         setWindowStatusBarColor()
+        mServiceIntent = Intent(this@AudioHomeActivity, FloatService::class.java)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            startForegroundService(mServiceIntent)
+        } else {
+            startService(mServiceIntent)
+        }
         //初始化传感器
         initSensorManager()
         //页面传递数据初始化
@@ -529,7 +536,10 @@ class AudioHomeActivity :
 
         writeAgoraLog("通话页面打开的时候，RTM登录状态码：${YDLavManager.sdkStatus}")
         AliYunRichLogsHelper.getInstance()
-            .sendRichLog(AliYunLogConfig.RTM, "通话页面打开的时候，RTM登录状态码：${YDLavManager.sdkStatus}   channelId:${channelId}")
+            .sendRichLog(
+                AliYunLogConfig.RTM,
+                "通话页面打开的时候，RTM登录状态码：${YDLavManager.sdkStatus}   channelId:${channelId}"
+            )
         if (YDLavManager.sdkStatus != Constants.CONNECTION_STATE_CONNECTED) {
             //再次登录声网，确保声网登录状态
             reLoginRTM()
@@ -1597,6 +1607,7 @@ class AudioHomeActivity :
 
     override fun onDestroy() {
         super.onDestroy()
+        stopService(mServiceIntent)
         findRouteService(IImService::class.java).unregisterObserveCustomNotification(notificationCallback)
         uploadLog()
         phoneHandler?.removeCallbacksAndMessages(null)

m-audioim/src/main/java/com/ydl/audioim/notification/FloatService.kt

+package com.ydl.audioim.notification
+
+import android.app.*
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.IBinder
+import com.ydl.audioim.R
+
+class FloatService : Service() {
+
+    var notificationManager: NotificationManager? = null;
+    var notificationId = "audio_av";
+    var notificationName = "正在通话中";
+
+    override fun onBind(intent: Intent?): IBinder? {
+        return null
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        //创建NotificationChannel
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            var channel = NotificationChannel(
+                notificationId,
+                notificationName,
+                NotificationManager.IMPORTANCE_HIGH
+            );
+            //不震动
+            channel.enableVibration(false);
+            //静音
+            channel.setSound(null, null);
+            notificationManager?.createNotificationChannel(channel);
+        }
+        //创建服务后,五秒内调用该方法
+        startForeground(1, getNotification());
+
+    }
+
+    /**
+     * 获取通知(Android8.0后需要)
+     * @return
+     */
+    fun getNotification(): Notification {
+        var builder = Notification.Builder(this)
+            .setSmallIcon(R.drawable.dialog_list_bg)
+            .setContentTitle("壹点灵")
+            .setContentIntent(getIntent())
+            .setContentText("正在通话中");
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            builder.setChannelId(notificationId);
+        }
+        return builder.build();
+    }
+
+    /**
+     * 点击后,直接打开app(之前的页面),不跳转特定activity
+     * @return
+     */
+    fun getIntent(): PendingIntent {
+        var msgIntent =
+            applicationContext.packageManager.getLaunchIntentForPackage(packageName);//获取启动Activity
+        var pendingIntent = PendingIntent.getActivity(
+            applicationContext,
+            1,
+            msgIntent,
+            PendingIntent.FLAG_UPDATE_CURRENT
+        );
+        return pendingIntent;
+    }
+}
\ No newline at end of file

m-audioim/src/main/java/com/ydl/consultantim/ConsultantAudioHomeActivity.kt

@@ -11,6 +11,7 @@ import android.hardware.SensorEvent
 import android.hardware.SensorEventListener
 import android.hardware.SensorManager
 import android.net.Uri
+import android.os.Build
 import android.os.PowerManager
 import android.provider.Settings
 import android.text.TextUtils
@@ -26,6 +27,7 @@ import com.ydl.audioim.R
 import com.ydl.audioim.YDLavManager
 import com.ydl.audioim.http.command.ConnectExceptionCommand
 import com.ydl.audioim.http.command.PayLoad
+import com.ydl.audioim.notification.FloatService
 import com.ydl.audioim.player.AudioPlayer
 import com.ydl.audioim.utils.AudioLogUtils
 import com.ydl.audioim.utils.DateUtils
@@ -118,6 +120,7 @@ class ConsultantAudioHomeActivity :
      * 是否连接成功
      */
     private var isConnectSuccess: Boolean = false
+    private var mServiceIntent: Intent? = null
 
     companion object {
         const val PARAM: String = "param"
@@ -498,7 +501,12 @@ class ConsultantAudioHomeActivity :
     override fun initDataAndEvent() {
         EventBus.getDefault().register(this)
         callEventSave("30", "进入接听界面")
-
+        mServiceIntent = Intent(this@ConsultantAudioHomeActivity, FloatService::class.java)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            startForegroundService(mServiceIntent)
+        } else {
+            startService(mServiceIntent)
+        }
         //状态栏颜色
         setWindowStatusBarColor()
         //点亮屏幕 并解锁
@@ -1115,6 +1123,7 @@ class ConsultantAudioHomeActivity :
     }
 
     override fun onDestroy() {
+        stopService(mServiceIntent)
         LogUtil.e("http-------------onDestory")
         AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.AGORA, "咨询用户端：onDestroy channelId:${mAudioMessageBean?.channelId}")