修复测试反馈问题

callkit/src/main/java/io/rong/callkit/SingleCallActivity.java

@@ -1,6 +1,7 @@
 package io.rong.callkit;
 
 import android.annotation.TargetApi;
+import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.media.AudioManager;
@@ -23,7 +24,10 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.lzf.easyfloat.interfaces.OnPermissionResult;
+import com.lzf.easyfloat.permission.PermissionUtils;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
 
 import cn.rongcloud.rtc.api.RCRTCEngine;
 import cn.rongcloud.rtc.audioroute.RCAudioRouteType;
@@ -49,6 +53,7 @@ import io.rong.imkit.userinfo.RongUserInfoManager;
 import io.rong.imlib.RongIMClient;
 import io.rong.imlib.model.Conversation;
 import io.rong.imlib.model.UserInfo;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -294,7 +299,8 @@ public class SingleCallActivity extends BaseCallActivity implements Handler.Call
                                 }
 
                                 @Override
-                                public void onError(int errorCode) {}
+                                public void onError(int errorCode) {
+                                }
                             });
         } else if (callAction.equals(RongCallAction.ACTION_OUTGOING_CALL)) {
             if (intent.getAction().equals(RongVoIPIntent.RONG_INTENT_ACTION_VOIP_SINGLEAUDIO)) {
@@ -401,11 +407,28 @@ public class SingleCallActivity extends BaseCallActivity implements Handler.Call
     protected void onPause() {
         super.onPause();
         RLog.d(TAG, "---single activity onPause---");
+        if (isCalling()) {
+            if (!PermissionUtils.checkPermission(this)) {
+                PermissionUtils.requestPermission(SingleCallActivity.this, new OnPermissionResult() {
+                    @Override
+                    public void permissionResult(boolean b) {
+                        if (b) {
+                            setShouldShowFloat(true);
+                        }
+                    }
+                });
+                return;
+            }
+        }
         if (pickupDetector != null) {
             pickupDetector.unRegister();
         }
     }
 
+    public boolean isCalling() {
+        return RongCallClient.getInstance() != null && RongCallClient.getInstance().getCallSession() != null && RongCallClient.getInstance().getCallSession().getSessionId() != null;
+    }
+
     private void initView(RongCallCommon.CallMediaType mediaType, RongCallAction callAction) {
         RelativeLayout buttonLayout =
                 (RelativeLayout)
@@ -622,7 +645,9 @@ public class SingleCallActivity extends BaseCallActivity implements Handler.Call
     int userType;
     SurfaceView remoteVideo;
     String remoteUserId;
-    /** 远端首帧是否到来, 音频帧跟视频帧其中一个到来就更改该标记, 从而更新连接状态 */
+    /**
+     * 远端首帧是否到来, 音频帧跟视频帧其中一个到来就更改该标记, 从而更新连接状态
+     */
     boolean isFirstRemoteFrame = false;
 
     @Override
@@ -794,9 +819,9 @@ public class SingleCallActivity extends BaseCallActivity implements Handler.Call
     /**
      * 当通话中的某一个参与者切换通话类型，例如由 audio 切换至 video，回调 onMediaTypeChanged。
      *
-     * @param userId 切换者的 userId。
+     * @param userId    切换者的 userId。
      * @param mediaType 切换者，切换后的媒体类型。
-     * @param video 切换着，切换后的 camera 信息，如果由 video 切换至 audio，则为 null。
+     * @param video     切换着，切换后的 camera 信息，如果由 video 切换至 audio，则为 null。
      */
     @Override
     public void onMediaTypeChanged(
@@ -855,7 +880,9 @@ public class SingleCallActivity extends BaseCallActivity implements Handler.Call
         }
     }
 
-    /** 视频转语音 * */
+    /**
+     * 视频转语音 *
+     */
     private void initAudioCallView() {
         mLPreviewContainer.removeAllViews();
         mLPreviewContainer.setVisibility(View.GONE);
@@ -995,7 +1022,7 @@ public class SingleCallActivity extends BaseCallActivity implements Handler.Call
         mButtonContainer.removeAllViews();
         mButtonContainer.addView(btnLayout);
         View view = findViewById(R.id.rc_voip_audio_chat);
-       // view.setVisibility(View.VISIBLE);
+        // view.setVisibility(View.VISIBLE);
         view.setVisibility(View.GONE); // 隐藏语音聊天按钮
         view.setOnClickListener(
                 new View.OnClickListener() {
@@ -1003,7 +1030,7 @@ public class SingleCallActivity extends BaseCallActivity implements Handler.Call
                     public void onClick(View v) {
                         if (RongIMClient.getInstance().getCurrentConnectionStatus()
                                 == RongIMClient.ConnectionStatusListener.ConnectionStatus
-                                        .CONNECTED) {
+                                .CONNECTED) {
                             RongCallClient.getInstance()
                                     .changeCallMediaType(RongCallCommon.CallMediaType.AUDIO);
                             callSession.setMediaType(RongCallCommon.CallMediaType.AUDIO);