Commit 4a144830 by 刘鹏

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

feat: 同步咨询师端1.0线路代码

See merge request app_android_lib/YDL-Component!321
parents f47e1d96 07bcfd8c
...@@ -14,7 +14,7 @@ buildscript { ...@@ -14,7 +14,7 @@ buildscript {
ydlrouter_version = '1.2.3' ydlrouter_version = '1.2.3'
constrait_support_version = '1.0.2' constrait_support_version = '1.0.2'
componentVersion = "0.3.0.40-SNAPSHOT" componentVersion = "0.3.0.39"
} }
repositories { repositories {
mavenCentral() mavenCentral()
......
...@@ -183,8 +183,8 @@ public class AVChatActivity extends AVChatBaseUI implements AVChatVideoUI.TouchZ ...@@ -183,8 +183,8 @@ public class AVChatActivity extends AVChatBaseUI implements AVChatVideoUI.TouchZ
@Override @Override
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
// avChatController.pauseVideo(); hasOnPause = true;
// hasOnPause = true;
} }
@Override @Override
......
package com.yidianling.avchatkit.ui; package com.yidianling.avchatkit.ui;
import android.Manifest; import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
...@@ -8,6 +9,7 @@ import android.view.View; ...@@ -8,6 +9,7 @@ import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.Chronometer; import android.widget.Chronometer;
import android.widget.TextView; import android.widget.TextView;
import com.netease.nimlib.sdk.avchat.AVChatCallback; import com.netease.nimlib.sdk.avchat.AVChatCallback;
import com.netease.nimlib.sdk.avchat.AVChatManager; import com.netease.nimlib.sdk.avchat.AVChatManager;
import com.netease.nimlib.sdk.avchat.constant.AVChatControlCommand; import com.netease.nimlib.sdk.avchat.constant.AVChatControlCommand;
...@@ -15,8 +17,8 @@ import com.netease.nimlib.sdk.avchat.constant.AVChatType; ...@@ -15,8 +17,8 @@ import com.netease.nimlib.sdk.avchat.constant.AVChatType;
import com.netease.nimlib.sdk.avchat.model.AVChatData; import com.netease.nimlib.sdk.avchat.model.AVChatData;
import com.tbruyelle.rxpermissions2.Permission; import com.tbruyelle.rxpermissions2.Permission;
import com.tbruyelle.rxpermissions2.RxPermissions; import com.tbruyelle.rxpermissions2.RxPermissions;
import com.ydl.ydlcommon.utils.DeviceTool;
import com.yidianling.avchatkit.AVChatKit; import com.yidianling.avchatkit.AVChatKit;
import com.yidianling.im.R;
import com.yidianling.avchatkit.activity.AVChatActivity; import com.yidianling.avchatkit.activity.AVChatActivity;
import com.yidianling.avchatkit.common.imageview.HeadImageView; import com.yidianling.avchatkit.common.imageview.HeadImageView;
import com.yidianling.avchatkit.common.log.LogUtil; import com.yidianling.avchatkit.common.log.LogUtil;
...@@ -30,7 +32,7 @@ import com.yidianling.avchatkit.controll.AVChatController; ...@@ -30,7 +32,7 @@ import com.yidianling.avchatkit.controll.AVChatController;
import com.yidianling.avchatkit.module.AVChatControllerCallback; import com.yidianling.avchatkit.module.AVChatControllerCallback;
import com.yidianling.avchatkit.module.AVSwitchListener; import com.yidianling.avchatkit.module.AVSwitchListener;
import com.yidianling.common.tools.ToastUtil; import com.yidianling.common.tools.ToastUtil;
import com.ydl.ydlcommon.utils.DeviceTool; import com.yidianling.im.R;
import io.reactivex.functions.Consumer; import io.reactivex.functions.Consumer;
...@@ -379,6 +381,7 @@ public class AVChatAudioUI implements View.OnClickListener, ToggleListener { ...@@ -379,6 +381,7 @@ public class AVChatAudioUI implements View.OnClickListener, ToggleListener {
}); });
} }
@SuppressLint("CheckResult")
private void requestPermission() { private void requestPermission() {
new RxPermissions((Activity) this.context) new RxPermissions((Activity) this.context)
.requestEach(Manifest.permission.RECORD_AUDIO,Manifest.permission.CAMERA) .requestEach(Manifest.permission.RECORD_AUDIO,Manifest.permission.CAMERA)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment