yutou/test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

6.6.9版本

Browse Source
This commit is contained in:
zlzw
2024-05-21 12:58:06 +08:00
parent 4513d8495f
commit 403b4c2aa3
51 changed files with 2383 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
live/src/main/java/com/yunbao/live/activity/EditNameRemarksActivity.java
View File

@@ -47,7 +47,7 @@ public class EditNameRemarksActivity extends AbsActivity implements View.OnClick
userId = getIntent().getStringExtra(NAMEREMARK);
mEditText = (EditText) findViewById(R.id.edit);
mEditText.setFilters(new InputFilter[]{
new InputFilter.LengthFilter(10)
new InputFilter.LengthFilter(25)
});
findViewById(R.id.btn_save).setOnClickListener(this);
String content = InstructorRemarkManager.get(mContext).getInstructorRemark().get(userId);

28
live/src/main/java/com/yunbao/live/adapter/InteractionMessageAdapter.java
View File

@@ -1,10 +1,13 @@
package com.yunbao.live.adapter;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
@@ -15,7 +18,9 @@ import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R;
import com.yunbao.live.bean.SystemMessageBean;
import com.yunbao.live.views.SystemMessageViewHolder;
@@ -23,6 +28,9 @@ import com.yunbao.live.views.SystemMessageViewHolder;
import java.text.SimpleDateFormat;
import java.util.Date;
import io.rong.imkit.utils.RouteUtils;
import io.rong.imlib.model.Conversation;
/**
* 互動信息
*/
@@ -53,6 +61,7 @@ public class InteractionMessageAdapter extends RefreshAdapter<SystemMessageBean>
LinearLayout toView, lt_content2, lt_reply, lt_img;
ImageView img_content_pic1, img_content_pic2, img_content_pic3, img_content2_pic1, img_content2_pic2, img_item_interaction;
RelativeLayout rt_root;
Button mBtnChat;
public Vh(View itemView) {
super(itemView);
@@ -67,6 +76,7 @@ public class InteractionMessageAdapter extends RefreshAdapter<SystemMessageBean>
img_content_pic3 = itemView.findViewById(R.id.img_content_pic3);
img_content2_pic1 = itemView.findViewById(R.id.img_content2_pic1);
img_content2_pic2 = itemView.findViewById(R.id.img_content2_pic2);
mBtnChat = itemView.findViewById(R.id.btn_chat);
rt_root = itemView.findViewById(R.id.rt_root);
lt_reply = itemView.findViewById(R.id.lt_reply);
lt_img = itemView.findViewById(R.id.lt_img);
@@ -87,13 +97,29 @@ public class InteractionMessageAdapter extends RefreshAdapter<SystemMessageBean>
RouteUtil.forwardUserHome(mContext, bean.getUid(), 2);
}
});
if (IMLoginManager.get(mContext).getAnchorB() == 1) {
mBtnChat.setVisibility(View.VISIBLE);
} else {
mBtnChat.setVisibility(View.GONE);
}
ViewClicksAntiShake.clicksAntiShake(mBtnChat, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
RouteUtils.routeToConversationActivity(
mContext,
Conversation.ConversationType.PRIVATE,
bean.getUid()
);
}
});
if (bean.getDynamic_id() != null && !"0".equals(bean.getDynamic_id())) {
lt_img.setVisibility(View.VISIBLE);
rt_root.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Constants.myIntoIndex = 2;
Constants.chatActionUrl=CommonAppConfig.HOST
Constants.chatActionUrl = CommonAppConfig.HOST
+ "/h5/shequ/index.html#/h5/shequ/details?isDetailsChat=1&dynamic_uid="
+ bean.getUid()
+ "&id=" + bean.getDynamic_id();

14
live/src/main/java/com/yunbao/live/dialog/PDLiveMessageListAdapter.java
View File

@@ -15,11 +15,14 @@ import androidx.annotation.NonNull;
import com.alibaba.fastjson.JSON;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.dialog.DebugDialog;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.message.content.MessageChatTipsContent;
import com.yunbao.common.utils.DateFormatUtil;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R;
import com.yunbao.live.event.InputPanelViewHolderEvent;
@@ -73,7 +76,7 @@ public class PDLiveMessageListAdapter extends MessageListAdapter {
}
holder.getConvertView().setBackgroundColor(Color.parseColor("#00000000"));
holder.itemView.setBackgroundColor(Color.parseColor("#00000000"));
ImageView readReceiptNew = holder.getConvertView().findViewById(R.id.rc_read_receipt_new);
TextView readReceiptNew = holder.getConvertView().findViewById(R.id.rc_read_receipt_new);
if (messageDirection == Message.MessageDirection.RECEIVE) {
RongIMClient.getInstance().syncConversationReadStatus(mDataList.get(position).getConversationType(),
@@ -99,9 +102,11 @@ public class PDLiveMessageListAdapter extends MessageListAdapter {
readReceiptNew.setVisibility(View.GONE);
}
if (readReceipt.getVisibility() == View.VISIBLE) {
readReceiptNew.setBackgroundResource(R.mipmap.icon_message_read);
readReceiptNew.setText(WordUtil.getNewString(R.string.message_chat_msg_read_tip));
readReceiptNew.setTextColor(Color.parseColor("#777777"));
} else {
readReceiptNew.setBackgroundResource(R.mipmap.icon_message_unread);
readReceiptNew.setText(WordUtil.getNewString(R.string.message_chat_msg_unread_tip));
readReceiptNew.setTextColor(Color.parseColor("#FF4874"));
}
if (readReceipt != null) {
readReceipt.setVisibility(View.GONE);
@@ -109,7 +114,6 @@ public class PDLiveMessageListAdapter extends MessageListAdapter {
if (content instanceof MessageChatTipsContent) {
readReceiptNew.setVisibility(View.GONE);
}
readReceiptNew.setVisibility(View.GONE);
}
holder.getConvertView().setOnTouchListener(new View.OnTouchListener() {
@@ -163,6 +167,8 @@ public class PDLiveMessageListAdapter extends MessageListAdapter {
holder.getView(R.id.right_liveStatus).setVisibility(View.GONE);
}
}
tv.setVisibility(View.VISIBLE);
ImgLoader.displayAvatarCircleCrop(holder.getContext(), IMLoginManager.get(holder.getContext()).getUserInfo().getAvatar(),holder.getView(R.id.rc_right_portrait));
/* if (messageDirection == Message.MessageDirection.RECEIVE) {
holder.setText(R.id.left_time, DateFormatUtil.formatDate(new Date(mDataList.get(position).getSentTime()), "MM-dd hh:mm:ss"));
holder.getView(R.id.left_time).setVisibility(View.VISIBLE);

5
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@@ -691,6 +691,11 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
} else if (pkInfo != null && pkInfo.getIntValue("drpk_status") == 1) {
if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.initPkRank(null);
String pkUid = pkInfo.getString("pkuid");
if (!StringUtil.isEmpty(pkUid)) {
//初始化天梯赛信息
mLiveRoomViewHolder.initRankPKInfo(String.valueOf(data.getLiveInfo().getUid()), pkUid);
}
}
if (mLivePlayViewHolder != null) {
mLivePlayViewHolder.setViewUP(4);

24
live/src/main/res/layout/fragment_main_message_chat_list.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="50dp" />
<LinearLayout
android:id="@+id/lt_nodata_msg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:visibility="gone">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/img_no_new" />
</LinearLayout>
</LinearLayout>

59
live/src/main/res/layout/item_interaction_msg.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -30,8 +31,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginRight="3dp"
android:layout_weight="1"
android:orientation="vertical">
<TextView
@@ -54,6 +55,28 @@
android:textColor="@color/black1"
android:textSize="13sp" />
<LinearLayout
android:id="@+id/lt_img"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:visibility="visible">
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginRight="12dp"
app:cardCornerRadius="8dp">
<ImageView
android:id="@+id/img_item_interaction"
android:layout_width="60dp"
android:layout_height="60dp"
android:scaleType="centerCrop" />
</androidx.cardview.widget.CardView>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -92,29 +115,21 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/lt_img"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:visibility="visible">
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginRight="12dp"
app:cardCornerRadius="8dp">
<ImageView
android:id="@+id/img_item_interaction"
android:layout_width="60dp"
android:layout_height="60dp"
android:scaleType="centerCrop" />
</androidx.cardview.widget.CardView>
</LinearLayout>
</LinearLayout>
<Button
android:id="@+id/btn_chat"
android:layout_width="68dp"
android:layout_height="37dp"
android:layout_alignParentEnd="true"
android:layout_centerInParent="true"
android:layout_marginEnd="10dp"
android:background="@drawable/bg_msg_address_book_user_btn_fan"
android:text="@string/message_interactive_chat"
android:textColor="#FFF"
android:textSize="13sp"
android:visibility="gone"
tools:visibility="visible" />
</RelativeLayout>
</LinearLayout>

104
live/src/main/res/layout/rc_conversationlist_item.xml
View File

@@ -53,35 +53,71 @@
</RelativeLayout>
</RelativeLayout>
<TextView
android:id="@+id/rc_conversation_title"
style="@style/TextStyle.Alignment"
<LinearLayout
android:id="@+id/rc_conversation_title_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/rc_margin_size_12"
android:layout_marginTop="@dimen/rc_margin_size_16"
android:layout_marginEnd="@dimen/rc_margin_size_12"
android:text="张三"
android:textColor="@color/rc_text_main_color"
android:textSize="@dimen/rc_font_secondary_size"
app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait_rl"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/rc_conversation_status"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/rc_margin_size_12"
android:layout_marginTop="@dimen/rc_margin_size_16"
android:layout_marginEnd="@dimen/rc_margin_size_12"
android:ellipsize="end"
android:singleLine="true"
android:textSize="8sp"
app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_title"
android:orientation="horizontal"
app:autoTextEllipsize="@+id/rc_conversation_title"
app:layout_constraintEnd_toStartOf="@+id/rc_conversation_date"
app:layout_constraintStart_toEndOf="@+id/rc_conversation_title"
app:layout_constraintTop_toTopOf="parent"
tools:text="在线" />
app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait_rl"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/rc_conversation_title"
style="@style/TextStyle.Alignment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/rc_margin_size_16"
android:ellipsize="end"
android:maxWidth="120dp"
android:maxLines="1"
android:textColor="@color/rc_text_main_color"
android:textSize="@dimen/rc_font_secondary_size"
app:layout_constrainedWidth="true"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait_rl"
app:layout_constraintTop_toTopOf="parent"
tools:text="张三11111111111111111111111" />
<TextView
android:id="@+id/rc_conversation_live_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginEnd="@dimen/rc_margin_size_12"
android:background="@drawable/bg_main_message_chat_list_live_timer"
android:paddingStart="5dp"
android:paddingTop="2dp"
android:paddingEnd="3dp"
android:paddingBottom="3dp"
android:singleLine="true"
android:textColor="#EC70FD"
android:textSize="10sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_title"
app:layout_constraintStart_toEndOf="@+id/rc_conversation_title"
app:layout_constraintTop_toTopOf="parent"
tools:text="看直播10min"
tools:visibility="visible" />
<TextView
android:id="@+id/rc_conversation_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/rc_margin_size_12"
android:layout_marginTop="@dimen/rc_margin_size_16"
android:singleLine="true"
android:textSize="8sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_title"
app:layout_constraintStart_toEndOf="@+id/rc_conversation_live_status"
app:layout_constraintTop_toTopOf="parent"
tools:text="在线" />
</LinearLayout>
<TextView
android:id="@+id/rc_conversation_content"
@@ -91,15 +127,15 @@
android:layout_marginStart="12dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="60dp"
android:text="你好，朋友！11111111111111111111111111111111111111111"
android:maxLines="1"
android:ellipsize="end"
android:maxLines="1"
android:text="你好，朋友！11111111111111111111111111111111111111111"
android:textColor="@color/rc_secondary_color"
android:textSize="@dimen/rc_font_text_third_size"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait_rl"
app:layout_constraintTop_toBottomOf="@+id/rc_conversation_title" />
app:layout_constraintTop_toBottomOf="@+id/rc_conversation_title_layout" />
<TextView
android:id="@+id/rc_conversation_date"
@@ -116,14 +152,14 @@
<ImageView
android:id="@+id/rc_conversation_no_disturb"
android:layout_width="wrap_content"
android:visibility="gone"
tools:visibility="visible"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/rc_margin_size_12"
android:layout_marginBottom="@dimen/rc_margin_size_12"
android:src="@drawable/rc_no_disturb"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/rc_no_disturb" />
tools:visibility="visible" />
<ImageView
android:id="@+id/rc_conversation_read_receipt"
@@ -131,18 +167,18 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/rc_margin_size_2"
android:layout_marginBottom="@dimen/rc_margin_size_12"
android:src="@drawable/rc_read_receipt"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/rc_conversation_no_disturb"
app:layout_goneMarginRight="@dimen/rc_margin_size_12"
android:src="@drawable/rc_read_receipt" />
app:layout_goneMarginRight="@dimen/rc_margin_size_12" />
<View
android:layout_width="wrap_content"
android:layout_height="0.5dp"
android:layout_marginTop="71.5dp"
android:background="@color/rc_divider_color"
app:layout_constraintStart_toStartOf="@id/rc_conversation_title"
app:layout_constraintStart_toStartOf="@id/rc_conversation_title_layout"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

16
live/src/main/res/layout/rc_message_item.xml
View File

@@ -142,12 +142,6 @@
android:src="@drawable/rc_read_receipt"
android:visibility="gone" />
<ImageView
android:id="@+id/rc_read_receipt_new"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginEnd="4dp" />
<TextView
android:id="@+id/rc_read_receipt_request"
@@ -182,6 +176,16 @@
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/rc_read_receipt_new"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="[已读]"
android:visibility="gone"
android:text="11sp"
app:layout_constraintEnd_toEndOf="@+id/ll_content"
app:layout_constraintTop_toBottomOf="@+id/ll_content"
tools:visibility="visible" />
<View
android:id="@+id/rc_v_edit"
android:layout_width="0dp"

7
live/src/main/res/values-en/strings.xml
View File

@@ -117,4 +117,11 @@
<string name="live_fans_group_send_gift_tips">Fan group level Of Lv%s Can send this gift</string>
<string name="live_rad_pack_join_fans_group_tip">Join the fan group can be opened [Join]</string>
<string name="live_rad_pack_join_fans_group_click_tip">Join the fan group to open</string>
<string name="message_chat_msg_all">全部聊天</string>
<string name="message_chat_msg_system">系統匹配</string>
<string name="message_chat_msg_user">對方主動</string>
<string name="message_chat_msg_look_live">看直播%dmin</string>
<string name="message_chat_msg_read_tip">[Read]</string>
<string name="message_chat_msg_unread_tip">[Unread]</string>
<string name="message_interactive_chat">發起聊天</string>
</resources>

8
live/src/main/res/values/strings.xml
View File

@@ -115,4 +115,12 @@
<string name="live_fans_group_send_gift_tips">粉絲團等級達到 Lv%s 可送出該禮物</string>
<string name="live_rad_pack_join_fans_group_tip">加入粉絲團可開啟【加入】</string>
<string name="live_rad_pack_join_fans_group_click_tip">加入粉絲團可開啟</string>
<string name="message_chat_msg_all">全部聊天</string>
<string name="message_chat_msg_system">系統匹配</string>
<string name="message_chat_msg_user">對方主動</string>
<string name="message_chat_msg_look_live">看直播%dmin</string>
<string name="message_chat_msg_read_tip">[已讀]</string>
<string name="message_chat_msg_unread_tip">[未讀]</string>
<string name="message_interactive_chat">發起聊天</string>
</resources>