diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java index 5f5d39279..73089a492 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java @@ -698,11 +698,12 @@ public class ChatMessageFragment extends AbsConversationFragment { boolean isTextMessage = data.getMessage().getContent() instanceof TextMessage; String[] list; if (isTextMessage) { - if (isMy) { + /* if (isMy) { list = new String[]{WordUtil.getNewString(R.string.copy), WordUtil.getNewString(R.string.delete)}; } else { list = new String[]{WordUtil.getNewString(R.string.copy)}; - } + }*/ + list = new String[]{WordUtil.getNewString(R.string.copy), WordUtil.getNewString(R.string.delete)}; } else { if (isMy) { list = new String[]{WordUtil.getNewString(R.string.delete)}; diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java index 9df1ec117..f976eaff9 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java @@ -13,6 +13,9 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + +import io.rong.callkit.util.CallRingingUtil; +import io.rong.callkit.util.RingingMode; import io.rong.imlib.RongIMClient; import com.alibaba.android.arouter.facade.annotation.Route; @@ -121,12 +124,17 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis CallClientManager.getManager().callAudio(targetId); callMsg.setTag(true); callMsg.setImageResource(R.mipmap.ic_call_audio_msg); + CallRingingUtil.getInstance().startRinging(this, RingingMode.Outgoing); + }else if(model.equals(CallClientManager.AUDIO_RECEIVED_CALL)){ + CallRingingUtil.getInstance().startRinging(this, RingingMode.Incoming); + close.setVisibility(View.INVISIBLE); } } @Override protected void onDestroy() { super.onDestroy(); + CallRingingUtil.getInstance().stopRinging(); CallClientManager.getManager().removeOnVoIPCallListener(CallAudioActivity.class); } @@ -195,6 +203,7 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis } private void accept() { + close.setVisibility(View.VISIBLE); CallClientManager.getManager().acceptCall(targetId); } @@ -279,7 +288,6 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis icon.setTag(getIntent().getExtras()); icon.setImageResource(io.rong.callkit.R.drawable.rc_voip_audio_answer_selector_new); icon.setLayoutParams(new ViewGroup.LayoutParams(DpUtil.dp2px(40), DpUtil.dp2px(40))); - finish(); EasyFloat.with(this) .setLayout(icon) .setShowPattern(ShowPattern.FOREGROUND) @@ -333,6 +341,7 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis } }).show(); + finish(); if (toPay) { Log.e(TAG, "调起支付界面"); // RouteManager.forwardWebViewActivity(null, "https://www.baidu.com"); @@ -354,6 +363,7 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis @Override public void onCallStart(String userId, SurfaceView surfaceView) { + CallRingingUtil.getInstance().stopRinging(); if (model.equals(CallClientManager.AUDIO_RECEIVED_CALL)) { gift.setVisibility(View.INVISIBLE); money.setVisibility(View.INVISIBLE); @@ -454,7 +464,7 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis @Override public void onCallStart(String userId, SurfaceView surfaceView) { - + CallRingingUtil.getInstance().stopRinging(); } @Override diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java index e3088cd48..67ab90b9f 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java @@ -55,6 +55,8 @@ import com.yunbao.common.views.weight.ViewClicksAntiShake; import java.util.Objects; +import io.rong.callkit.util.CallRingingUtil; +import io.rong.callkit.util.RingingMode; import io.rong.calllib.RongCallClient; import io.rong.calllib.StartIncomingPreviewCallback; @@ -154,6 +156,12 @@ public class CallVideoActivity extends AbsOTOActivity { CallClientManager.getManager().callVideo(targetId); initWaitView(); } + if(model.equals(CallClientManager.VIDEO_RECEIVED_CALL)){ + CallRingingUtil.getInstance().startRinging(this,RingingMode.Incoming); + close.setVisibility(View.GONE); + }else if(model.equals(CallClientManager.VIDEO_CALL)){ + CallRingingUtil.getInstance().startRinging(this, RingingMode.Outgoing); + } } @Override @@ -329,6 +337,7 @@ public class CallVideoActivity extends AbsOTOActivity { private void accept() { callLayout.setVisibility(View.GONE); + close.setVisibility(View.VISIBLE); CallClientManager.getManager().acceptCall(callId); } @@ -499,6 +508,7 @@ public class CallVideoActivity extends AbsOTOActivity { if (id == R.id.rc_voip_call_answer_btn) { accept(); } else if (id == R.id.call_stop || id == R.id.rc_voip_call_hang_up) { + CallRingingUtil.getInstance().stopRinging(); CallClientManager.getManager().endCall(); } else if (id == R.id.gift) { new GiftDialog(mContext) @@ -536,6 +546,7 @@ public class CallVideoActivity extends AbsOTOActivity { @Override public void onCallStart(String userId, SurfaceView surfaceView) { + CallRingingUtil.getInstance().stopRinging(); closeWait.setVisibility(View.GONE); initView(); initButton(buttonView); @@ -660,6 +671,7 @@ public class CallVideoActivity extends AbsOTOActivity { @Override public void onCallStart(String userId, SurfaceView surfaceView) { + CallRingingUtil.getInstance().stopRinging(); Object tag = rootView.getTag(); ViewGroup parent = (ViewGroup) rootView.getParent(); parent.removeView(rootView); @@ -691,6 +703,7 @@ public class CallVideoActivity extends AbsOTOActivity { protected void onDestroy() { super.onDestroy(); CallClientManager.getManager().removeOnVoIPCallListener(CallVideoActivity.class); + CallRingingUtil.getInstance().stopRinging(); } @Override diff --git a/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRecommendListAdapter.java b/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRecommendListAdapter.java index 8a5fb7aba..acb8786c8 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRecommendListAdapter.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRecommendListAdapter.java @@ -76,6 +76,7 @@ public class HomeRecommendListAdapter extends RecyclerView.Adapter @@ -74,6 +75,35 @@ android:layout_height="match_parent" android:layout_gravity="center" android:src="@mipmap/ic_home_auth" /> + + + + + + +