xuhuixiang/yuliao_and
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

第N+6次提交专属红包

Browse Source
This commit is contained in:
xuhuixiang
2025-05-13 16:22:51 +08:00
parent 4df5ff4605
commit b6bd7ed0af
92 changed files with 2324 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/normal/viewholder/ConversationBaseViewHolder.java
View File

@@ -66,8 +66,8 @@ public class ConversationBaseViewHolder extends BaseViewHolder<ConversationBean>
}
viewBinding.contentLayout.setOnClickListener(v -> itemListener.onClick(v, data, position));
// viewBinding.contentLayout.setOnLongClickListener(
// v -> itemListener.onLongClick(v, data, position));
viewBinding.contentLayout.setOnLongClickListener(
v -> itemListener.onLongClick(v, data, position));
viewBinding.avatarLayout.setOnClickListener(v -> itemListener.onAvatarClick(v, data, position));
viewBinding.avatarLayout.setOnLongClickListener(
v -> itemListener.onAvatarLongClick(v, data, position));

30
conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/page/ConversationBaseFragment.java
View File

@@ -26,6 +26,7 @@ import com.netease.yunxin.kit.chatkit.model.ConversationInfo;
import com.netease.yunxin.kit.common.ui.action.ActionItem;
import com.netease.yunxin.kit.common.ui.dialog.ListAlertDialog;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.common.ui.viewholder.BaseBean;
import com.netease.yunxin.kit.common.ui.viewholder.ViewHolderClickListener;
import com.netease.yunxin.kit.common.ui.viewmodel.FetchResult;
@@ -161,6 +162,7 @@ public abstract class ConversationBaseFragment extends BaseFragment implements I
new ViewHolderClickListener() {
@Override
public boolean onClick(View v, BaseBean data, int position) {
// ToastX.showShortToast("111111111");
boolean result = false;
if (ConversationKitClient.getConversationUIConfig() != null
&& ConversationKitClient.getConversationUIConfig().itemClickListener != null
@@ -184,6 +186,8 @@ public abstract class ConversationBaseFragment extends BaseFragment implements I
@Override
public boolean onAvatarClick(View v, BaseBean data, int position) {
// ToastX.showShortToast("222222222222");
boolean result = false;
if (ConversationKitClient.getConversationUIConfig() != null
&& ConversationKitClient.getConversationUIConfig().itemClickListener != null
@@ -207,6 +211,8 @@ public abstract class ConversationBaseFragment extends BaseFragment implements I
@Override
public boolean onLongClick(View v, BaseBean data, int position) {
// ToastX.showShortToast("333333333333");
boolean result = false;
if (ConversationKitClient.getConversationUIConfig() != null
&& ConversationKitClient.getConversationUIConfig().itemClickListener != null
@@ -227,6 +233,8 @@ public abstract class ConversationBaseFragment extends BaseFragment implements I
@Override
public boolean onAvatarLongClick(View v, BaseBean data, int position) {
// ToastX.showShortToast("444444444444");
boolean result = false;
if (ConversationKitClient.getConversationUIConfig() != null
&& ConversationKitClient.getConversationUIConfig().itemClickListener != null
@@ -456,11 +464,12 @@ public abstract class ConversationBaseFragment extends BaseFragment implements I
viewModel.deleteConversation(2, dataBean);
} else if (TextUtils.equals(action, ConversationConstant.Action.ACTION_HIDE)) {
viewModel.deleteConversation(1, dataBean);
// if (dataBean.infoData.isStickTop()) {
// viewModel.removeStick((ConversationBean) data);
// } else {
// viewModel.addStickTop((ConversationBean) data);
// }
} else if(TextUtils.equals(action,ConversationConstant.Action.ACTION_STICK)){
if (dataBean.infoData.isStickTop()) {
viewModel.removeStick((ConversationBean) data);
} else {
viewModel.addStickTop((ConversationBean) data);
}
}
alertDialog.dismiss();
});
@@ -488,15 +497,16 @@ public abstract class ConversationBaseFragment extends BaseFragment implements I
protected List<ActionItem> generateDialogContent(boolean isStick) {
List<ActionItem> contentList = new ArrayList<>();
// ActionItem stick =
// new ActionItem(
// ConversationConstant.Action.ACTION_STICK,
// 0,
// (isStick ? R.string.cancel_stick_title : R.string.stick_title));
ActionItem stick =
new ActionItem(
ConversationConstant.Action.ACTION_STICK,
0,
(isStick ? R.string.cancel_stick_title : R.string.stick_title));
ActionItem hide =
new ActionItem(ConversationConstant.Action.ACTION_HIDE, 0, R.string.hide_title);
ActionItem delete =
new ActionItem(ConversationConstant.Action.ACTION_DELETE, 0, R.string.delete_title);
contentList.add(stick);
contentList.add(hide);
contentList.add(delete);
return contentList;

4
conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/page/viewmodel/ConversationViewModel.java
View File

@@ -435,7 +435,7 @@ public class ConversationViewModel extends BaseViewModel {
}
public void addStickTop(ConversationBean data) {
LogUtils.i("LAILIAOLIAO","数据是啥："+ data.infoData.getContactId()+";"+data.infoData.getSessionType());
ConversationRepoAll.addStickTop(
data.infoData.getContactId(),
data.infoData.getSessionType(),
@@ -470,6 +470,8 @@ public class ConversationViewModel extends BaseViewModel {
}
public void removeStick(ConversationBean data) {
LogUtils.i("LAILIAOLIAO","数据是啥removeStick："+ data.infoData.getContactId()+";"+data.infoData.getSessionType());
ConversationRepoAll.removeStickTop(
data.infoData.getContactId(),
data.infoData.getSessionType(),

2
conversationkit-ui/src/main/res-fun/drawable/fun_conversation_view_holder_selector.xml
View File

@@ -7,7 +7,7 @@
<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="MissingDefaultResource">
<item android:drawable="@color/fun_conversation_item_bg_color" android:state_pressed="false" />
<item android:drawable="@color/title_transfer" android:state_pressed="false" />
<item android:drawable="@color/fun_conversation_item_stick_bg_color" android:state_pressed="true" />
<item android:drawable="@color/fun_conversation_item_bg_color"/>
</selector>

6
conversationkit-ui/src/main/res-fun/layout/fun_conversation_view_holder.xml
View File

@@ -73,7 +73,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="middle"
android:maxWidth="@dimen/dimen_120_dp"
android:maxWidth="180dp"
android:singleLine="true"
android:textColor="@color/fun_conversation_item_title_text_color"
android:textSize="@dimen/text_size_16" />
@@ -225,7 +225,9 @@
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="#EDE3E3"
android:background="#E0E0E0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

2
conversationkit-ui/src/main/res-fun/values/colors.xml
View File

@@ -10,7 +10,7 @@
<color name="fun_conversation_item_divide_line_color">#d8d8d8</color>
<!-- 置顶会话背景色 -->
<color name="fun_conversation_item_stick_bg_color">#ededef</color>
<color name="fun_conversation_item_stick_bg_color">#EEEEEE</color>
<!-- 创建群聊和添加好友PopupWindow 字体颜色 -->
<color name="fun_conversation_add_pop_text_color">#ffffff</color>

2
conversationkit-ui/src/main/res-normal/layout/conversation_fragment.xml
View File

@@ -10,6 +10,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FFFBFB"
android:orientation="vertical">
<LinearLayout
@@ -17,6 +18,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"
tools:ignore="MissingConstraints">
<com.netease.yunxin.kit.common.ui.widgets.TitleBarView

8
conversationkit-ui/src/main/res-normal/layout/p2p_view_holder_layout.xml
View File

@@ -7,13 +7,15 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/root_view"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_62_dp">
android:background="@drawable/fun_conversation_view_holder_selector"
android:layout_height="76dp">
<FrameLayout
android:id="@+id/conversation_avatar_fl"
android:layout_width="@dimen/dimen_52_dp"
android:layout_height="@dimen/dimen_42_dp"
android:layout_marginVertical="@dimen/dimen_10_dp"
android:layout_marginVertical="17dp"
android:layout_marginStart="@dimen/dimen_20_dp">
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
@@ -46,7 +48,7 @@
android:id="@+id/conversation_name_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen_10_dp"
android:layout_marginTop="17dp"
android:layout_marginEnd="@dimen/dimen_100_dp"
android:ellipsize="end"
android:maxLines="1"

7
conversationkit-ui/src/main/res-normal/layout/team_view_holder_layout.xml
View File

@@ -7,13 +7,14 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/root_view"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_62_dp">
android:background="@drawable/fun_conversation_view_holder_selector"
android:layout_height="76dp">
<FrameLayout
android:id="@+id/conversation_avatar_fl"
android:layout_width="@dimen/dimen_52_dp"
android:layout_height="@dimen/dimen_42_dp"
android:layout_marginVertical="@dimen/dimen_10_dp"
android:layout_marginVertical="17dp"
android:layout_marginStart="@dimen/dimen_20_dp">
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
@@ -46,7 +47,7 @@
android:id="@+id/conversation_name_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen_10_dp"
android:layout_marginTop="17dp"
android:layout_marginEnd="@dimen/dimen_100_dp"
android:ellipsize="end"
android:maxLines="1"