From cb50c00a064d56f7ad5a37697b8f3a0ad96caba4 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Tue, 6 Sep 2022 14:35:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=81=E8=81=8A=E9=A1=B5=E9=9D=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=9B=B4=E6=92=AD=E9=A3=9E=E6=9C=BA=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/shayu/phonelive/AppContext.java | 17 +- .../common/bean/RecommendLiveRoomModel.java | 58 +++++ .../imrongcloud/InstructorSendReward.java | 30 +++ .../InstructorSendRewardProvider.java | 84 +++++++ .../imrongcloud/RecommendLiveRoom.java | 115 +++++++++ .../imrongcloud/RongcloudIMManager.java | 6 + .../res/layout/view_recommend_live_room.xml | 52 ++++ .../src/main/res/mipmap-xxhdpi/btn_golive.png | Bin 0 -> 8851 bytes .../main/res/mipmap-xxhdpi/tab_recommend.png | Bin 0 -> 18190 bytes common/src/main/res/values-en/strings.xml | 1 + common/src/main/res/values/strings.xml | 1 + .../live/activity/LiveAudienceActivity.java | 4 + .../live/activity/PDLIiveChatActivity.java | 42 +++- .../java/com/yunbao/live/bean/ImUserBean.java | 12 + .../PDLIiveChatConversationFragment.java | 222 ++++++++++++++++++ .../yunbao/live/event/LiveAudienceEvent.java | 1 + .../live/event/RecommendLiveRoomEvent.java | 21 ++ .../live/views/RecommendLiveRoomProvider.java | 78 ++++++ .../res/layout/fragment_chat_conversation.xml | 45 ++++ .../res/layout/rc_conversationlist_item.xml | 14 +- live/src/main/res/layout/view_input_panel.xml | 1 + .../yunbao/main/activity/MainActivity.java | 30 +-- .../PDLiveConversationListActivity.java | 34 ++- .../ConversationIMListManager.java | 15 +- .../PDLiveCustomConversationProvider.java | 2 +- 25 files changed, 846 insertions(+), 39 deletions(-) create mode 100644 common/src/main/java/com/yunbao/common/bean/RecommendLiveRoomModel.java create mode 100644 common/src/main/java/com/yunbao/common/manager/imrongcloud/InstructorSendReward.java create mode 100644 common/src/main/java/com/yunbao/common/manager/imrongcloud/InstructorSendRewardProvider.java create mode 100644 common/src/main/java/com/yunbao/common/manager/imrongcloud/RecommendLiveRoom.java create mode 100644 common/src/main/res/layout/view_recommend_live_room.xml create mode 100644 common/src/main/res/mipmap-xxhdpi/btn_golive.png create mode 100644 common/src/main/res/mipmap-xxhdpi/tab_recommend.png create mode 100644 live/src/main/java/com/yunbao/live/dialog/PDLIiveChatConversationFragment.java create mode 100644 live/src/main/java/com/yunbao/live/event/RecommendLiveRoomEvent.java create mode 100644 live/src/main/java/com/yunbao/live/views/RecommendLiveRoomProvider.java create mode 100644 live/src/main/res/layout/fragment_chat_conversation.xml diff --git a/app/src/main/java/com/shayu/phonelive/AppContext.java b/app/src/main/java/com/shayu/phonelive/AppContext.java index 33f2e91c7..c4ed7dc61 100644 --- a/app/src/main/java/com/shayu/phonelive/AppContext.java +++ b/app/src/main/java/com/shayu/phonelive/AppContext.java @@ -29,7 +29,11 @@ import com.yunbao.common.CommonAppContext; import com.yunbao.common.Constants; import com.yunbao.common.http.CommonHttpUtil; import com.yunbao.common.http.HttpCallback; +import com.yunbao.common.manager.imrongcloud.InstructorSendReward; +import com.yunbao.common.manager.imrongcloud.InstructorSendRewardProvider; import com.yunbao.common.manager.imrongcloud.MessageIMManager; +import com.yunbao.common.manager.imrongcloud.RecommendLiveRoom; +import com.yunbao.live.views.RecommendLiveRoomProvider; import com.yunbao.common.manager.imrongcloud.RongcloudIMManager; import com.yunbao.common.utils.L; import com.yunbao.common.utils.SpUtil; @@ -40,12 +44,13 @@ import com.yunbao.main.activity.MsgSettActivity; import java.io.File; import java.io.IOException; +import java.util.ArrayList; +import io.rong.imkit.config.RongConfigCenter; import io.rong.imlib.RongIMClient; import io.rong.imlib.model.Conversation; +import io.rong.imlib.model.MessageContent; import io.rong.message.TextMessage; -import io.rong.push.RongPushClient; -import io.rong.push.pushconfig.PushConfig; import static com.yunbao.live.socket.SocketClient.mSocketHandler; @@ -166,6 +171,14 @@ public class AppContext extends CommonAppContext { //初始化融云 RongcloudIMManager.initRongIM(this); + ArrayList> myMessages = new ArrayList<>(); + myMessages.add(RecommendLiveRoom.class); + myMessages.add(InstructorSendReward.class); + + RongIMClient.registerMessageType(myMessages); + // 注册自定义消息模板 + RongConfigCenter.conversationConfig().addMessageProvider(new InstructorSendRewardProvider()); + RongConfigCenter.conversationConfig().addMessageProvider(new RecommendLiveRoomProvider(getApplicationContext())); RongcloudIMManager.addRongcloudIMOnReceiveMessageListener(new RongIMClient.OnReceiveMessageWrapperListener() { @Override diff --git a/common/src/main/java/com/yunbao/common/bean/RecommendLiveRoomModel.java b/common/src/main/java/com/yunbao/common/bean/RecommendLiveRoomModel.java new file mode 100644 index 000000000..f8cdf1b07 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/bean/RecommendLiveRoomModel.java @@ -0,0 +1,58 @@ +package com.yunbao.common.bean; + +import com.google.gson.annotations.SerializedName; + +public class RecommendLiveRoomModel extends BaseModel { + + /** + * liveuid : 97714 + * user_nicename : rongyun004 + * avatar : https://downs.yaoulive.com/20220329113227_c661f791c5fc878c2ef357ee022f9fbc?imageView2/2/w/600/h/600 + * title : + */ + + @SerializedName("liveuid") + private String liveuid; + @SerializedName("user_nicename") + private String userNicename; + @SerializedName("avatar") + private String avatar; + @SerializedName("title") + private String title; + + public String getLiveuid() { + return liveuid; + } + + public RecommendLiveRoomModel setLiveuid(String liveuid) { + this.liveuid = liveuid; + return this; + } + + public String getUserNicename() { + return userNicename; + } + + public RecommendLiveRoomModel setUserNicename(String userNicename) { + this.userNicename = userNicename; + return this; + } + + public String getAvatar() { + return avatar; + } + + public RecommendLiveRoomModel setAvatar(String avatar) { + this.avatar = avatar; + return this; + } + + public String getTitle() { + return title; + } + + public RecommendLiveRoomModel setTitle(String title) { + this.title = title; + return this; + } +} diff --git a/common/src/main/java/com/yunbao/common/manager/imrongcloud/InstructorSendReward.java b/common/src/main/java/com/yunbao/common/manager/imrongcloud/InstructorSendReward.java new file mode 100644 index 000000000..98a8d2f78 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/manager/imrongcloud/InstructorSendReward.java @@ -0,0 +1,30 @@ +package com.yunbao.common.manager.imrongcloud; + +import android.annotation.SuppressLint; +import android.os.Parcel; + +import io.rong.imlib.MessageTag; +import io.rong.imlib.model.MessageContent; + +@SuppressLint("ParcelCreator") +@MessageTag(value = "InstructorSendReward", flag = MessageTag.ISCOUNTED) +public class InstructorSendReward extends MessageContent { + public InstructorSendReward(byte[] data) { + super(data); + } + + @Override + public byte[] encode() { + return new byte[0]; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + + } +} diff --git a/common/src/main/java/com/yunbao/common/manager/imrongcloud/InstructorSendRewardProvider.java b/common/src/main/java/com/yunbao/common/manager/imrongcloud/InstructorSendRewardProvider.java new file mode 100644 index 000000000..3fd1c0c85 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/manager/imrongcloud/InstructorSendRewardProvider.java @@ -0,0 +1,84 @@ +package com.yunbao.common.manager.imrongcloud; + +import android.content.Context; +import android.text.Spannable; +import android.view.ViewGroup; + +import java.util.List; + +import io.rong.imkit.conversation.messgelist.provider.BaseMessageItemProvider; +import io.rong.imkit.model.UiMessage; +import io.rong.imkit.widget.adapter.IViewProviderListener; +import io.rong.imkit.widget.adapter.ViewHolder; +import io.rong.imlib.model.MessageContent; + +/** + * 自定义消息模板 + */ +public class InstructorSendRewardProvider extends BaseMessageItemProvider { + /** + * 创建 ViewHolder + * + * @param viewGroup 父 ViewGroup + * @param viewType 视图类型 + * @return ViewHolder + */ + @Override + protected ViewHolder onCreateMessageContentViewHolder(ViewGroup viewGroup, int viewType) { + return null; + } + + /** + * 设置消息视图里各 view 的值 + * + * @param holder ViewHolder + * @param parentHolder 父布局的 ViewHolder + * @param instructorSendReward 此展示模板对应的消息 + * @param uiMessage {@link UiMessage} + * @param position 消息位置 + * @param list 列表 + * @param listener ViewModel 的点击事件监听器。如果某个子 view 的点击事件需要 ViewModel 处理，可通过此监听器回调。 + */ + @Override + protected void bindMessageContentViewHolder(ViewHolder holder, ViewHolder parentHolder, InstructorSendReward instructorSendReward, UiMessage uiMessage, int position, List list, IViewProviderListener listener) { + + } + + /** + * @param holder ViewHolder + * @param instructorSendReward 自定义消息 + * @param uiMessage {@link UiMessage} + * @param position 位置 + * @param list 列表数据 + * @param listener ViewModel 的点击事件监听器。如果某个子 view 的点击事件需要 ViewModel 处理，可通过此监听器回调。 + * @return 点击事件是否被消费 + */ + @Override + protected boolean onItemClick(ViewHolder holder, InstructorSendReward instructorSendReward, UiMessage uiMessage, int position, List list, IViewProviderListener listener) { + return false; + } + + /** + * 根据消息内容，判断是否为本模板需要展示的消息类型 + * + * @param messageContent 消息内容 + * @return 本模板是否处理。 + */ + @Override + protected boolean isMessageViewType(MessageContent messageContent) { + return messageContent instanceof InstructorSendReward; + } + + /** + * 在会话列表页某条会话最后一条消息为该类型消息时，会话里需要展示的内容。 + * 比如: 图片消息在会话里需要展示为"图片"，那返回对应的字符串资源即可。 + * + * @param context 上下文 + * @param instructorSendReward 消息内容 + * @return 会话里需要展示的字符串资源 + */ + @Override + public Spannable getSummarySpannable(Context context, InstructorSendReward instructorSendReward) { + return null; + } +} diff --git a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RecommendLiveRoom.java b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RecommendLiveRoom.java new file mode 100644 index 000000000..e699e9094 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RecommendLiveRoom.java @@ -0,0 +1,115 @@ +package com.yunbao.common.manager.imrongcloud; + +import android.annotation.SuppressLint; +import android.os.Parcel; +import android.os.Parcelable; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.UnsupportedEncodingException; + +import io.rong.common.ParcelUtils; +import io.rong.imlib.MessageTag; +import io.rong.imlib.model.MessageContent; + +@MessageTag(value = "RecommendLiveRoom", flag = MessageTag.ISCOUNTED) +public class RecommendLiveRoom extends MessageContent implements Parcelable { + // 自定义消息变量，可以有多个 + private String content; + + public RecommendLiveRoom setContent(String content) { + this.content = content; + return this; + } + + public String getContent() { + return content; + } + + public RecommendLiveRoom(byte[] data) { + if (data == null) { + return; + } + String jsonStr = null; + try { + jsonStr = new String(data, "UTF-8"); + } catch (UnsupportedEncodingException e) { + } + if (jsonStr == null) { + return; + } + + try { + JSONObject jsonObj = new JSONObject(jsonStr); + // 消息携带用户信息时, 自定义消息需添加下面代码 + if (jsonObj.has("user")) { + setUserInfo(parseJsonToUserInfo(jsonObj.getJSONObject("user"))); + } + // 用于群组聊天, 消息携带 @ 人信息时, 自定义消息需添加下面代码 + if (jsonObj.has("mentionedInfo")) { + setMentionedInfo(parseJsonToMentionInfo(jsonObj.getJSONObject("mentionedInfo"))); + } + // 将所有自定义变量从收到的 json 解析并赋值 + if (jsonObj.has("content")) { + content = jsonObj.optString("content"); + } + } catch (JSONException e) { + } + } + + /** + * 将本地消息对象序列化为消息数据。 + * + * @return 消息数据。 + */ + @Override + public byte[] encode() { + JSONObject jsonObj = new JSONObject(); + try { + // 消息携带用户信息时, 自定义消息需添加下面代码 + if (getJSONUserInfo() != null) { + jsonObj.putOpt("user", getJSONUserInfo()); + } + // 用于群组聊天, 消息携带 @ 人信息时, 自定义消息需添加下面代码 + if (getJsonMentionInfo() != null) { + jsonObj.putOpt("mentionedInfo", getJsonMentionInfo()); + } + // 将所有自定义消息的内容，都序列化至 json 对象中 + jsonObj.put("content", this.content); + } catch (JSONException e) { + } + + try { + return jsonObj.toString().getBytes("UTF-8"); + } catch (UnsupportedEncodingException e) { + } + return null; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + ParcelUtils.writeToParcel(dest, getExtra()); + ParcelUtils.writeToParcel(dest, content); + } + public static final Creator CREATOR = new Creator() { + @Override + public RecommendLiveRoom createFromParcel(Parcel source) { + return new RecommendLiveRoom(source); + } + + @Override + public RecommendLiveRoom[] newArray(int size) { + return new RecommendLiveRoom[size]; + } + }; + public RecommendLiveRoom(Parcel in) { + setExtra(ParcelUtils.readFromParcel(in)); + setContent(ParcelUtils.readFromParcel(in)); + } +} diff --git a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java index d7f055a1e..0bc787c92 100644 --- a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java +++ b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java @@ -16,6 +16,8 @@ import com.yunbao.common.manager.IMLoginManager; import org.greenrobot.eventbus.EventBus; +import java.util.ArrayList; + import io.rong.imkit.GlideKitImageEngine; import io.rong.imkit.IMCenter; import io.rong.imkit.RongIM; @@ -23,6 +25,7 @@ import io.rong.imkit.config.RongConfigCenter; import io.rong.imlib.RongIMClient; import io.rong.imlib.model.Conversation; import io.rong.imlib.model.Message; +import io.rong.imlib.model.MessageContent; import static com.yunbao.common.CommonAppContext.isReady; @@ -46,8 +49,11 @@ public class RongcloudIMManager { public static void initRongIM(Application application) { //第三个参数代表是否开启推送 RongIM.init(application, RONG_IM_KEY, true); + + Log.e(CLASSNAME, "initRongIM:"); initPhotoGlide(); + } private static RongIMClient.OnReceiveMessageWrapperListener mListener; diff --git a/common/src/main/res/layout/view_recommend_live_room.xml b/common/src/main/res/layout/view_recommend_live_room.xml new file mode 100644 index 000000000..19955dcef --- /dev/null +++ b/common/src/main/res/layout/view_recommend_live_room.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/mipmap-xxhdpi/btn_golive.png b/common/src/main/res/mipmap-xxhdpi/btn_golive.png new file mode 100644 index 0000000000000000000000000000000000000000..4b890a52cbb3cf8aaa75c1eb5fe7ba756059441e GIT binary patch literal 8851 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%0A6NdVS`wd+Y4V4R5LkY`@;?#DNzHZFvT79~RU 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 Shield gift effect Shield car effect You are in the current live room + has recommended an anchor to you! diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 814fe5ca2..4309ba804 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -884,6 +884,7 @@ 屏蔽座駕特效 您已在當前直播間 是否清空未讀消息 + 向您推薦了一名主播！ 人氣票 系統通知 在線客服 diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 3d9f643d2..aa3d405a1 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -51,6 +51,7 @@ import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.L; import com.yunbao.common.utils.ProcessResultUtil; +import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.weight.VerticalViewPager; import com.yunbao.live.R; @@ -67,6 +68,7 @@ import com.yunbao.live.dialog.SidebarLiveAudience; import com.yunbao.live.event.LinkMicTxAccEvent; import com.yunbao.live.event.LiveAudienceEvent; import com.yunbao.live.event.LiveRoomChangeEvent; +import com.yunbao.live.event.RecommendLiveRoomEvent; import com.yunbao.live.http.ImHttpUtil; import com.yunbao.live.http.LiveHttpConsts; import com.yunbao.live.http.LiveHttpUtil; @@ -848,6 +850,8 @@ public class LiveAudienceActivity extends LiveActivity { } }); } + + @Override public boolean canBackPressed() { return super.canBackPressed(); diff --git a/live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java b/live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java index 11a236b47..348f1033d 100644 --- a/live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java @@ -25,13 +25,22 @@ import com.yunbao.common.http.HttpCallback; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.InstructorRemarkManager; import com.yunbao.common.manager.imrongcloud.MessageIMManager; +import com.yunbao.common.utils.Bus; +import com.yunbao.common.utils.RouteUtil; import com.yunbao.live.R; import com.yunbao.live.adapter.SystemChatMessageAdapter; import com.yunbao.live.bean.ImUserBean; +import com.yunbao.live.bean.LiveBean; import com.yunbao.live.bean.SearchUserBean; -import com.yunbao.live.http.ImHttpUtil; +import com.yunbao.live.event.LiveRoomChangeEvent; +import com.yunbao.live.event.RecommendLiveRoomEvent; +import com.yunbao.live.http.LiveHttpUtil; +import com.yunbao.live.presenter.LiveRoomCheckLivePresenter; + +import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -56,6 +65,7 @@ public class PDLIiveChatActivity extends FragmentActivity { windowColor(); initView(); initData(); + Bus.getOn(this); } @@ -181,4 +191,32 @@ public class PDLIiveChatActivity extends FragmentActivity { }, true); } + + @Override + protected void onDestroy() { + super.onDestroy(); + Bus.getOff(this); + } + + @Subscribe(threadMode = ThreadMode.MAIN) + public void onRecommendLiveRoomEvent(RecommendLiveRoomEvent event) { + LiveHttpUtil.getLiveInfo(event.getLiveuid(), new HttpCallback() { + @Override + public void onSuccess(int code, String msg, String[] info) { + if (code == 0 && info.length > 0) { + LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class); + LiveRoomCheckLivePresenter mCheckLivePresenter = new LiveRoomCheckLivePresenter(mContext, (liveBean1, liveType, liveTypeVal, liveSdk) -> { + if (liveBean1 == null) { + return; + } + EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, liveTypeVal)); + finish(); + }); + mCheckLivePresenter.checkLive(liveBean); + } else { + RouteUtil.forwardUserHome(mContext, event.getLiveuid(), 0); + } + } + }); + } } diff --git a/live/src/main/java/com/yunbao/live/bean/ImUserBean.java b/live/src/main/java/com/yunbao/live/bean/ImUserBean.java index 4877313c1..d83fea755 100644 --- a/live/src/main/java/com/yunbao/live/bean/ImUserBean.java +++ b/live/src/main/java/com/yunbao/live/bean/ImUserBean.java @@ -2,6 +2,7 @@ package com.yunbao.live.bean; import android.text.TextUtils; +import com.google.gson.annotations.SerializedName; import com.yunbao.common.bean.BaseModel; import java.text.SimpleDateFormat; @@ -27,6 +28,17 @@ public class ImUserBean extends BaseModel { String is_admin; String isDelet; String _method_ = "";//融雲消息類型 + @SerializedName("new_image") + private String newImage; + + public String getNewImage() { + return newImage; + } + + public ImUserBean setNewImage(String newImage) { + this.newImage = newImage; + return this; + } public String getTitle() { return title; diff --git a/live/src/main/java/com/yunbao/live/dialog/PDLIiveChatConversationFragment.java b/live/src/main/java/com/yunbao/live/dialog/PDLIiveChatConversationFragment.java new file mode 100644 index 000000000..2a56793f9 --- /dev/null +++ b/live/src/main/java/com/yunbao/live/dialog/PDLIiveChatConversationFragment.java @@ -0,0 +1,222 @@ +package com.yunbao.live.dialog; + +import android.Manifest; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Bundle; +import android.text.TextUtils; +import android.util.Log; +import android.view.Gravity; +import android.view.View; +import android.view.Window; +import android.view.WindowManager; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; + +import com.adjust.sdk.Adjust; +import com.adjust.sdk.AdjustEvent; +import com.blankj.utilcode.util.GsonUtils; +import com.facebook.appevents.AppEventsLogger; +import com.google.firebase.analytics.FirebaseAnalytics; +import com.yunbao.common.activity.SelectImageActivity; +import com.yunbao.common.bean.IMLoginModel; +import com.yunbao.common.bean.ImageEntity; +import com.yunbao.common.bean.NoviceInstructorModel; +import com.yunbao.common.dialog.AbsDialogFragment; +import com.yunbao.common.http.CommonHttpUtil; +import com.yunbao.common.http.HttpCallback; +import com.yunbao.common.manager.IMLoginManager; +import com.yunbao.common.manager.NoviceInstructorManager; +import com.yunbao.live.R; +import com.yunbao.live.bean.SearchUserBean; +import com.yunbao.live.views.InputPanelViewHolder; +import com.yunbao.live.views.PDLiveConversationFragment; + +import java.util.ArrayList; + +import io.rong.imkit.userinfo.RongUserInfoManager; +import io.rong.imlib.RongIMClient; +import io.rong.imlib.model.Conversation; +import io.rong.imlib.model.UserInfo; + +/** + * 半屏聊天框 + */ +public class PDLIiveChatConversationFragment extends AbsDialogFragment implements View.OnClickListener { + private PDLiveConversationFragment conversationFragment; + private InputPanelViewHolder inputPanel; + private TextView titleView; + private ImageView imgMore, imBack; + private String targetId = ""; + private final int PERMISSION_REQUEST_CODE = 0; + private final int SELECT_VIDEO_REQUEST = 0x0002; + private final int SELECT_IMAGE_REQUEST = 0x0001; + private ArrayList mSelectImages = new ArrayList<>(); + private boolean isAdmin = false; + @Override + protected int getLayoutId() { + return R.layout.fragment_chat_conversation; + } + + @Override + protected int getDialogStyle() { + return R.style.dialog; + } + + @Override + protected boolean canCancel() { + return false; + } + + @Override + protected void setWindowAttributes(Window window) { + window.setWindowAnimations(R.style.bottomToTopAnim); + WindowManager.LayoutParams params = window.getAttributes(); + params.width = WindowManager.LayoutParams.MATCH_PARENT; + params.height = WindowManager.LayoutParams.WRAP_CONTENT; + params.gravity = Gravity.BOTTOM; + window.setAttributes(params); + } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + + initView(); + initData(); + } + + /** + * 初始化 + */ + private void initView() { + // 添加会话界面 + targetId = getArguments().getString("targetId"); + conversationFragment = new PDLiveConversationFragment(); + conversationFragment.initConversation(targetId, Conversation.ConversationType.PRIVATE, null); + FragmentManager manager = getChildFragmentManager(); + FragmentTransaction transaction = manager.beginTransaction(); + transaction.replace(R.id.container, conversationFragment); + transaction.commit(); + inputPanel = (InputPanelViewHolder) findViewById(R.id.input_panel); + titleView = (TextView) findViewById(R.id.titleView); + imgMore = (ImageView) findViewById(R.id.img_more); + imBack = (ImageView) findViewById(R.id.btn_back); + + imgMore.setOnClickListener(this); + imBack.setOnClickListener(this); + + inputPanel.addMediaMessageCallback(new InputPanelViewHolder.MediaMessageCallback() { + @Override + public void choosePic(int intoIndex) { + jumpPic(intoIndex); + } + }); + } + + /** + * 数据的设置 + */ + private void initData() { + NoviceInstructorModel model = NoviceInstructorManager.get(getActivity()).getNoviceInstructor(); + if (model != null && !TextUtils.isEmpty(model.getMsgZdySendText())) { + inputPanel.setPresetInformation(model.getMsgZdySendText()); + } + //绑定聊天用户id + inputPanel.setTargetId(targetId); + //获取用户信息 + UserInfo userInfo = RongUserInfoManager.getInstance().getUserInfo(targetId); + if (null != userInfo) { + titleView.setText(userInfo.getName()); + if (!TextUtils.isEmpty(userInfo.getExtra())) { + SearchUserBean userBean = GsonUtils.fromJson(userInfo.getExtra(), SearchUserBean.class); + //新手指导员 + if (!TextUtils.isEmpty(userBean.getIs_admin()) && TextUtils.equals(userBean.getIs_admin(), "1")) { + isAdmin = true; + imgMore.setVisibility(View.GONE); + AdjustEvent adjustEvent1 = new AdjustEvent("exlgn3"); + Adjust.trackEvent(adjustEvent1); + CommonHttpUtil.setAdvertisingChannels("exlgn3", new HttpCallback() { + @Override + public void onSuccess(int code, String msg, String[] info) { + if (code == 0) { + FirebaseAnalytics.getInstance(mContext).logEvent("FS_director_read", null); + AppEventsLogger.newLogger(mContext).logEvent("FB_director_read"); + } + } + }); + + } else {//非指导员 + isAdmin = false; + imgMore.setVisibility(View.VISIBLE); + } + inputPanel.setAdmin(isAdmin); + Log.e("PDLiveConversation", userInfo.getExtra()); + } + } else { + titleView.setText("系統消息"); + inputPanel.setVisibility(View.GONE); + } + getDraft(); + } + + @Override + public void onClick(View v) { + int id = v.getId(); + //菜单 + if (id == R.id.img_more) { + IMLoginModel model = IMLoginManager.get(mContext).getUserInfo(); + new MenuPopuwWindow(getActivity()).setIsAdmin(model.getIsAdmin(), targetId).show(imgMore); + } else if (id == R.id.btn_back) {//返回 + dismiss(); + } + } + + //intoIndex 1=调用相机,2=照片选取,3=视频选取 + public void jumpPic(int intoIndex) { + //选择图片 + int isPermission1 = ContextCompat.checkSelfPermission(mContext, Manifest.permission.READ_EXTERNAL_STORAGE); + int isPermission2 = ContextCompat.checkSelfPermission(mContext, Manifest.permission.WRITE_EXTERNAL_STORAGE); + if (isPermission1 == PackageManager.PERMISSION_GRANTED && isPermission2 == PackageManager.PERMISSION_GRANTED) { + startActivity(intoIndex); + } else { + //申请权限 + ActivityCompat.requestPermissions(getActivity(), new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE); + } + } + + private void startActivity(int intoIndex) { + mSelectImages.clear(); + Intent intent = new Intent(mContext, SelectImageActivity.class); + intent.putParcelableArrayListExtra("selected_images", mSelectImages); + intent.putExtra("intoIndex", intoIndex); + if (intoIndex == 3) { + startActivityForResult(intent, SELECT_VIDEO_REQUEST); + } else { + startActivityForResult(intent, SELECT_IMAGE_REQUEST); + } + } + /** + * 获取草稿箱信息系 + */ + private void getDraft() { + RongIMClient.getInstance().getTextMessageDraft(Conversation.ConversationType.PRIVATE, targetId, new RongIMClient.ResultCallback() { + @Override + public void onSuccess(String s) { + if (!TextUtils.isEmpty(inputPanel.getPresetInformation())) + inputPanel.setPresetInformation(s); + } + + @Override + public void onError(RongIMClient.ErrorCode errorCode) { + + } + }); + } +} diff --git a/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java b/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java index 7492bfb7e..df87443dc 100644 --- a/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java +++ b/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java @@ -17,6 +17,7 @@ public class LiveAudienceEvent extends BaseModel { private int liveType; private int liveTypeVal; + public int getLiveType() { return liveType; } diff --git a/live/src/main/java/com/yunbao/live/event/RecommendLiveRoomEvent.java b/live/src/main/java/com/yunbao/live/event/RecommendLiveRoomEvent.java new file mode 100644 index 000000000..06517d722 --- /dev/null +++ b/live/src/main/java/com/yunbao/live/event/RecommendLiveRoomEvent.java @@ -0,0 +1,21 @@ +package com.yunbao.live.event; + +import com.google.gson.annotations.SerializedName; +import com.yunbao.common.bean.BaseModel; + +/** + * 聊天界面跳转直播间 + */ +public class RecommendLiveRoomEvent extends BaseModel { + @SerializedName("liveuid") + private String liveuid; + + public String getLiveuid() { + return liveuid; + } + + public RecommendLiveRoomEvent setLiveuid(String liveuid) { + this.liveuid = liveuid; + return this; + } +} diff --git a/live/src/main/java/com/yunbao/live/views/RecommendLiveRoomProvider.java b/live/src/main/java/com/yunbao/live/views/RecommendLiveRoomProvider.java new file mode 100644 index 000000000..056add0b7 --- /dev/null +++ b/live/src/main/java/com/yunbao/live/views/RecommendLiveRoomProvider.java @@ -0,0 +1,78 @@ +package com.yunbao.live.views; + +import android.content.Context; +import android.net.Uri; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.TextUtils; +import android.view.ViewGroup; + +import com.google.gson.Gson; +import com.yunbao.common.R; +import com.yunbao.common.bean.RecommendLiveRoomModel; +import com.yunbao.common.manager.imrongcloud.RecommendLiveRoom; +import com.yunbao.common.utils.Bus; +import com.yunbao.live.event.RecommendLiveRoomEvent; + +import org.greenrobot.eventbus.EventBus; + +import java.util.List; + +import io.rong.imkit.conversation.messgelist.provider.BaseMessageItemProvider; +import io.rong.imkit.model.UiMessage; +import io.rong.imkit.widget.adapter.IViewProviderListener; +import io.rong.imkit.widget.adapter.ViewHolder; +import io.rong.imlib.model.MessageContent; + +/** + * 自定义消息模板 + */ +public class RecommendLiveRoomProvider extends BaseMessageItemProvider { + private Context mContext; + + public RecommendLiveRoomProvider(Context context) { + this.mContext = context; + } + + @Override + protected ViewHolder onCreateMessageContentViewHolder(ViewGroup viewGroup, int i) { + + return ViewHolder.createViewHolder(mContext, viewGroup, R.layout.view_recommend_live_room); + } + + @Override + protected void bindMessageContentViewHolder(ViewHolder viewHolder, ViewHolder viewHolder1, RecommendLiveRoom recommendLiveRoom, UiMessage uiMessage, int i, List list, IViewProviderListener iViewProviderListener) { + if (uiMessage.getMessage().getContent() instanceof RecommendLiveRoom) { + + RecommendLiveRoom liveRoom = (RecommendLiveRoom) uiMessage.getMessage().getContent(); + RecommendLiveRoomModel model = new Gson().fromJson(liveRoom.getContent(), RecommendLiveRoomModel.class); + viewHolder.setImageUri(R.id.live_bg, Uri.parse(model.getAvatar())); + viewHolder.setText(R.id.host_name, model.getUserNicename()); + } + } + + @Override + protected boolean onItemClick(ViewHolder viewHolder, RecommendLiveRoom recommendLiveRoom, UiMessage uiMessage, int i, List list, IViewProviderListener iViewProviderListener) { + if (uiMessage.getMessage().getContent() instanceof RecommendLiveRoom) { + RecommendLiveRoom liveRoom = (RecommendLiveRoom) uiMessage.getMessage().getContent(); + RecommendLiveRoomModel model = new Gson().fromJson(liveRoom.getContent(), RecommendLiveRoomModel.class); + Bus.get().post(new RecommendLiveRoomEvent().setLiveuid(model.getLiveuid())); + EventBus.getDefault().post(new RecommendLiveRoomEvent().setLiveuid(model.getLiveuid())); + } + return true; + } + + @Override + protected boolean isMessageViewType(MessageContent messageContent) { + return messageContent instanceof RecommendLiveRoom; + } + + @Override + public Spannable getSummarySpannable(Context context, RecommendLiveRoom recommendLiveRoom) { + String politicalInstructor = ""; + if (recommendLiveRoom != null && !TextUtils.isEmpty(recommendLiveRoom.getContent())) { + RecommendLiveRoomModel model = new Gson().fromJson(recommendLiveRoom.getContent(), RecommendLiveRoomModel.class); + } + return new SpannableString(politicalInstructor + mContext.getString(R.string.live_room_air_ticket)); + } +} diff --git a/live/src/main/res/layout/fragment_chat_conversation.xml b/live/src/main/res/layout/fragment_chat_conversation.xml new file mode 100644 index 000000000..8c8ad3e10 --- /dev/null +++ b/live/src/main/res/layout/fragment_chat_conversation.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/rc_conversationlist_item.xml b/live/src/main/res/layout/rc_conversationlist_item.xml index 93ebf0431..331e14de7 100644 --- a/live/src/main/res/layout/rc_conversationlist_item.xml +++ b/live/src/main/res/layout/rc_conversationlist_item.xml @@ -10,9 +10,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="8dp" - android:visibility="gone" android:layout_marginTop="5dp" - android:layout_marginEnd="8dp"> + android:layout_marginEnd="8dp" + android:visibility="gone"> diff --git a/live/src/main/res/layout/view_input_panel.xml b/live/src/main/res/layout/view_input_panel.xml index 39edf6596..9a979e213 100644 --- a/live/src/main/res/layout/view_input_panel.xml +++ b/live/src/main/res/layout/view_input_panel.xml @@ -35,6 +35,7 @@ android:layout_marginEnd="5dp" android:layout_marginBottom="6.5dp" android:layout_weight="1" + android:textColor="#161616" android:background="@drawable/rc_ext_panel_editbox_background" android:maxLines="4" /> diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java index d46603ece..1db750513 100644 --- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java @@ -23,24 +23,16 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.viewpager.widget.ViewPager; -import com.adjust.sdk.Adjust; -import com.adjust.sdk.AdjustEvent; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.android.billingclient.api.BillingResult; import com.android.billingclient.api.Purchase; -import com.android.billingclient.api.PurchaseHistoryRecord; -import com.android.billingclient.api.PurchaseHistoryResponseListener; import com.android.billingclient.api.SkuDetails; -import com.facebook.appevents.AppEventsConstants; import com.google.android.gms.tasks.OnCompleteListener; import com.google.android.gms.tasks.Task; import com.google.firebase.messaging.FirebaseMessaging; @@ -53,7 +45,6 @@ import com.tencent.imsdk.v2.V2TIMSDKConfig; import com.tencent.imsdk.v2.V2TIMSDKListener; import com.tencent.imsdk.v2.V2TIMUserFullInfo; import com.yunbao.common.CommonAppConfig; -import com.yunbao.common.CommonAppContext; import com.yunbao.common.Constants; import com.yunbao.common.activity.AbsActivity; import com.yunbao.common.activity.WebViewActivity; @@ -140,17 +131,12 @@ import io.reactivex.disposables.Disposable; import io.rong.imkit.config.RongConfigCenter; import io.rong.imkit.notification.NotificationConfig; import io.rong.imlib.RongIMClient; -import kotlin.Unit; - -import static com.yunbao.common.CommonAppContext.isReady; -import static com.yunbao.common.CommonAppContext.logger; -import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics; -import static com.yunbao.live.activity.SystemMessageActivity.type; - import io.rong.imlib.model.Message; import io.rong.push.PushManager; import io.rong.push.PushType; -import kotlin.*; +import kotlin.Unit; + +import static com.yunbao.common.CommonAppContext.isReady; @Route(path = RouteUtil.PATH_MAIN) public class MainActivity extends AbsActivity implements MainAppBarLayoutListener { @@ -242,9 +228,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene @Override public boolean onRecheck(@NonNull String skuType, @NonNull Purchase purchase, boolean isSelf) { - Log.e(TAG,purchase.getSku()+"s"+purchase.getOrderId()+"sds"+purchase.getPurchaseToken()); + Log.e(TAG, purchase.getSku() + "s" + purchase.getOrderId() + "sds" + purchase.getPurchaseToken()); //谷歌掉单处理 - CommonHttpUtil.Google_sec_pay(purchase.getPurchaseToken(),purchase.getOrderId(),purchase.getSku(),new HttpCallback() { + CommonHttpUtil.Google_sec_pay(purchase.getPurchaseToken(), purchase.getOrderId(), purchase.getSku(), new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { @@ -341,7 +327,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene RCRTCConfig.Builder config = RCRTCConfig.Builder.create(); RCRTCEngine.getInstance().init(MainActivity.this, config.build()); //推送跳直播间 - if(getIntent().getStringExtra("liveid")!=null){ + if (getIntent().getStringExtra("liveid") != null) { LiveHttpUtil.getLiveInfo(getIntent().getStringExtra("liveid") + "", new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { @@ -365,13 +351,13 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene } } }); - }else if(getIntent().getStringExtra("type")!=null&&getIntent().getStringExtra("type").equals("2")){ + } else if (getIntent().getStringExtra("type") != null && getIntent().getStringExtra("type").equals("2")) { //跳转消息列表 Bundle bundle = new Bundle(); bundle.putInt(PDLiveConversationListActivity.MESSAGENUMBER, messageNumber); bundle.putInt(PDLiveConversationListActivity.NUMBERME, numberMe); ConversationIMListManager.get(this).jumpConversationList(bundle); - }else if(getIntent().getStringExtra("type")!=null&&getIntent().getStringExtra("type").equals("8")){ + } else if (getIntent().getStringExtra("type") != null && getIntent().getStringExtra("type").equals("8")) { WebViewActivity.forward(mContext, getIntent().getStringExtra("activityUrl"), true); } FirebaseMessaging.getInstance().getToken() diff --git a/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java b/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java index ff86667ae..00eeb2ed8 100644 --- a/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java @@ -44,11 +44,17 @@ import com.yunbao.common.manager.imrongcloud.MessageIMManager; import com.yunbao.common.utils.DeviceUtils; import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.ProcessResultUtil; +import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; +import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.live.activity.SystemMessageActivity; import com.yunbao.live.bean.ImUserBean; +import com.yunbao.live.bean.LiveBean; +import com.yunbao.live.event.RecommendLiveRoomEvent; import com.yunbao.live.http.ImHttpUtil; +import com.yunbao.live.http.LiveHttpUtil; +import com.yunbao.live.presenter.LiveRoomCheckLivePresenter; import com.yunbao.main.R; import com.yunbao.main.adapter.SystemMessageAdapter; import com.yunbao.main.dialog.MainStartDialogFragment; @@ -193,7 +199,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View. container.post(new Runnable() { @Override public void run() { - showGuideView(); +// showGuideView(); } }); } @@ -261,7 +267,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View. textNewsNotice.setVisibility(View.VISIBLE); textNewsNotice.setText(userBean.getNum()); } - ImgLoader.display(mContext, userBean.getImage(), imgNewsNotice); + ImgLoader.display(mContext, userBean.getNewImage(), imgNewsNotice); ViewClicksAntiShake.clicksAntiShake(imgNewsNotice, () -> { type = userBean.getType(); netHandler.post(systemNumberRunnable); @@ -280,7 +286,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View. textNewsInteraction.setVisibility(View.VISIBLE); textNewsInteraction.setText(userBean.getNum()); } - ImgLoader.display(mContext, userBean.getImage(), imgNewsInteraction); + ImgLoader.display(mContext, userBean.getNewImage(), imgNewsInteraction); ViewClicksAntiShake.clicksAntiShake(imgNewsInteraction, () -> { type = userBean.getType(); netHandler.post(systemNumberRunnable); @@ -299,7 +305,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View. textNewsOnline.setVisibility(View.VISIBLE); textNewsOnline.setText(userBean.getNum()); } - ImgLoader.display(mContext, userBean.getImage(), imgNewsOnline); + ImgLoader.display(mContext, userBean.getNewImage(), imgNewsOnline); ViewClicksAntiShake.clicksAntiShake(imgNewsOnline, () -> { type = userBean.getType(); netHandler.post(systemNumberRunnable); @@ -585,4 +591,24 @@ public class PDLiveConversationListActivity extends AbsActivity implements View. MessageIMManager.get(mContext).setSystemNumber(systemNumber); } + @Subscribe(threadMode = ThreadMode.MAIN) + public void onRecommendLiveRoomEvent(RecommendLiveRoomEvent event) { + LiveHttpUtil.getLiveInfo(event.getLiveuid(), new HttpCallback() { + @Override + public void onSuccess(int code, String msg, String[] info) { + if (code == 0 && info.length > 0) { + LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class); + LiveRoomCheckLivePresenter mCheckLivePresenter = new LiveRoomCheckLivePresenter(mContext, (liveBean1, liveType, liveTypeVal, liveSdk) -> { + if (liveBean1 == null) { + return; + } + LiveAudienceActivity.forward(mContext, liveBean1, liveType, liveTypeVal, "", 0, liveSdk); + }); + mCheckLivePresenter.checkLive(liveBean); + } else { + RouteUtil.forwardUserHome(mContext, event.getLiveuid(), 0); + } + } + }); + } } diff --git a/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java b/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java index 9bba5a866..845713d7a 100644 --- a/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java +++ b/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java @@ -22,12 +22,14 @@ import com.yunbao.common.utils.RouteUtil; import com.yunbao.live.activity.PDLIiveChatActivity; import com.yunbao.live.activity.PDLiveConversationActivity; import com.yunbao.live.bean.SearchUserBean; +import com.yunbao.live.dialog.PDLIiveChatConversationFragment; import com.yunbao.main.activity.PDLiveConversationListActivity; import com.yunbao.main.dialog.ConversationPopuwWindow; import com.yunbao.main.utils.PDLiveCustomConversationProvider; import com.yunbao.main.utils.PDLiveMessageProcessor; import com.yunbao.main.utils.PDSightMessageItemProvider; +import java.util.ArrayList; import java.util.List; import io.rong.imkit.IMCenter; @@ -43,6 +45,7 @@ import io.rong.imkit.utils.RouteUtils; import io.rong.imkit.widget.adapter.ProviderManager; import io.rong.imlib.RongIMClient; import io.rong.imlib.model.Conversation; +import io.rong.imlib.model.MessageContent; import io.rong.imlib.model.UserInfo; import io.rong.sight.SightExtensionModule; @@ -71,6 +74,7 @@ public class ConversationIMListManager { RongExtensionManager.getInstance().registerExtensionModule(new SightExtensionModule()); //自定义小视频消息模板 RongConfigCenter.conversationConfig().replaceMessageProvider(SightMessageItemProvider.class, new PDSightMessageItemProvider()); + //会话列表监听事件 RongIM.setConversationListBehaviorListener(listener); } @@ -275,7 +279,16 @@ public class ConversationIMListManager { */ @Override public boolean onConversationClick(Context context, View view, BaseUiConversation baseUiConversation) { - jumpConversation((Activity) context, baseUiConversation.mCore.getTargetId()); + if (context instanceof PDLIiveChatActivity) { + Bundle bundle = new Bundle(); + bundle.putString("targetId", baseUiConversation.mCore.getTargetId()); + PDLIiveChatActivity activity = (PDLIiveChatActivity) context; + PDLIiveChatConversationFragment fragment = new PDLIiveChatConversationFragment(); + fragment.setArguments(bundle); + fragment.show(activity.getSupportFragmentManager(), "PDLIiveChatConversationFragment"); + } else { + jumpConversation((Activity) context, baseUiConversation.mCore.getTargetId()); + } return true; } }; diff --git a/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java b/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java index cd34f10ba..6142d3e55 100644 --- a/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java +++ b/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java @@ -64,7 +64,7 @@ public class PDLiveCustomConversationProvider extends BaseConversationProvider { holder.setText(R.id.conversation_title, userInfo.getName()); if (uiConversation.mCore.getLatestMessage() instanceof TextMessage) { TextMessage message = (TextMessage) uiConversation.mCore.getLatestMessage(); - holder.setText(R.id.rc_conversation_content, message.getContent()); + holder.setText(R.id.conversation_content, message.getContent()); } if (uiConversation.mCore.getUnreadMessageCount() == 0) { holder.setVisible(R.id.conversation_unread, false);