From 2cc9cc2233181fbea9a8ce231886ed8f34c54fdf Mon Sep 17 00:00:00 2001 From: huangjian Date: Fri, 12 Mar 2021 16:29:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=20=E6=88=BF=E9=97=B4=E6=9B=B4=E5=A4=9A=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E7=A7=81=E8=81=8A=E6=B6=88=E6=81=AF=E5=AD=90item=20UI=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 2 +- .../home/activity/HomeMoreRoomActivity.java | 81 ++------- .../home/fragment/ContactsListFragment.kt | 8 +- .../erban/ui/im/chat/MsgViewHolderGift.java | 6 +- .../ui/im/recent/RecentContactsFragment.java | 2 +- .../main/res/drawable/bg_message_input.xml | 9 - .../res/layout/activity_home_more_room.xml | 15 +- .../main/res/layout/fragment_contact_list.xml | 2 +- .../main/res/layout/fragment_game_home.xml | 2 +- .../res/layout/fragment_recent_contacts.xml | 4 +- .../layout/layout_msg_view_holder_gift.xml | 6 +- .../layout/layout_msg_view_holder_hello.xml | 2 +- .../layout_msg_view_holder_in_app_sharing.xml | 4 +- .../layout/layout_msg_view_holder_level.xml | 4 +- .../layout/layout_msg_view_holder_lottery.xml | 2 +- .../layout/layout_msg_view_holder_online.xml | 2 +- .../layout_msg_view_holder_red_packet.xml | 2 +- .../layout_msg_view_holder_sign_in_notice.xml | 6 +- app/src/main/res/layout/main_tab_layout.xml | 20 +- .../dynamic/adapter/CommentReplyAdapter.java | 4 +- .../dynamic/adapter/WorldDynamicAdapter.java | 3 + .../dynamic/view/DynamicDetailActivity.java | 172 ++++++------------ .../widget/DynamicNickDetailWidget.java | 13 ++ .../res/drawable-xhdpi/icon_dy_emoji.png | Bin 509 -> 2768 bytes .../res/drawable/selector_dy_send_btn.xml | 2 +- .../res/layout/activity_dynamic_detail.xml | 13 +- .../res/layout/dy_empty_dynamic_comment.xml | 4 +- .../res/layout/fragment_square.xml | 2 +- .../res/layout/head_dynamic_detail.xml | 23 +-- .../res/layout/item_dy_comment.xml | 10 +- .../res/layout/item_dy_reply.xml | 8 +- .../activity/RoomNewbieActivity.java | 11 +- .../RoomMsgRecentContactsFragment.java | 2 +- .../res/layout/activity_newbie_list.xml | 4 +- .../nim_message_activity_text_layout.xml | 6 +- nim_uikit/res/layout/nim_recent_contacts.xml | 1 + .../session/module/input/InputPanel.java | 46 ++--- 37 files changed, 189 insertions(+), 314 deletions(-) delete mode 100644 app/src/main/res/drawable/bg_message_input.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b8d39752f..d29174b56 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -575,7 +575,7 @@ android:label="音游" android:launchMode="singleTask" android:screenOrientation="portrait" - android:windowSoftInputMode="adjustPan|stateAlwaysHidden"/> + android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> mFragments; - private LimitEnterRoomHelper limitEnterRoomHelper; - private ObjectAnimator roomMinAnim; - private DragLayout avatarLayout; @Override protected void onCreate(Bundle savedInstanceState) { @@ -125,23 +118,9 @@ public class HomeMoreRoomActivity extends BaseMvpActivity 0 && arg[0] instanceof String) { -// ((MainActivity) getActivity()).handleOpenRoomWhenPmLimit((String) arg[0]); -// } - - } - } - - /** - * 处理开房限制时长 - */ - public void handleOpenRoomWhenPmLimit(String error) { - getLimitEnterRoomHelper().handleThisContext(this, error, false, this::handlePmExitRoom); - } - - public LimitEnterRoomHelper getLimitEnterRoomHelper() { - if (limitEnterRoomHelper == null) { - limitEnterRoomHelper = new LimitEnterRoomHelper(); - } - return limitEnterRoomHelper; - } - - private void handlePmExitRoom() { - if (AvRoomDataManager.get().mCurrentRoomInfo != null) { - closeOpenRoomAnimation(); - getMvpPresenter().exitRoom(); - } - } - - private void closeOpenRoomAnimation() { - stopRoomMinAnim(); - avatarLayout.setVisibility(View.GONE); - } - - private void stopRoomMinAnim() { - if (roomMinAnim != null) { - roomMinAnim.cancel(); - roomMinAnim = null; } } @@ -235,8 +175,6 @@ public class HomeMoreRoomActivity extends BaseMvpActivity companion object { const val TAG = "ContactsListFragment" + @JvmStatic fun newInstance(): Fragment { return ContactsListFragment() } } + override fun init() { childFragmentManager.beginTransaction() .add(R.id.fcv, RecentListFragment.newInstance(false)) @@ -42,17 +44,19 @@ class ContactsListFragment : BaseViewBindingFragment EventBus.getDefault().post(ContactTrashEvent()) } }) + } else { + toast("暂无未读消息需要清理") } } binding.tvFans.setOnClickListener { - FansListActivity.start(requireContext(),FansListActivity.TYPE_FANS) + FansListActivity.start(requireContext(), FansListActivity.TYPE_FANS) } binding.tvAttention.setOnClickListener { AttentionListActivity.start(requireContext()) } binding.tvFriend.setOnClickListener { - FansListActivity.start(requireContext(),FansListActivity.TYPE_FRIEND) + FansListActivity.start(requireContext(), FansListActivity.TYPE_FRIEND) } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderGift.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderGift.java index cd9206cf4..9a4267b84 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderGift.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderGift.java @@ -1,6 +1,5 @@ package com.yizhuan.erban.ui.im.chat; -import androidx.core.content.ContextCompat; import android.text.TextUtils; import android.widget.FrameLayout; import android.widget.ImageView; @@ -12,8 +11,8 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLo import com.yizhuan.erban.R; import com.yizhuan.erban.ui.utils.ImageLoadUtils; import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; import com.yizhuan.xchat_android_core.gift.GiftModel; +import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; /** @@ -55,9 +54,6 @@ public class MsgViewHolderGift extends MsgViewHolderBase { GiftModel.get().findGiftInfoById(attachment.getGiftReceiveInfo().getGiftId()) : giftInfo; boolean isSelf = attachment.getGiftReceiveInfo().getUid() == AuthModel.get().getCurrentUid(); - giftName.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.color_333333) : ContextCompat.getColor(context, R.color.color_333333)); - number.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.color_333333) : ContextCompat.getColor(context, R.color.color_333333)); - tvTargetNick.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.color_999999) : ContextCompat.getColor(context, R.color.color_999999)); flGiftImg.setBackgroundResource(isSelf ? R.drawable.bg_msg_gift_img : R.drawable.bg_msg_gift_img_normal); if (giftInfo != null) { diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java index 3d2a02249..a42bc76f3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java @@ -148,7 +148,7 @@ public class RecentContactsFragment extends TFragment { adapter.notifyDataSetChanged(); boolean empty = items.isEmpty() && msgLoaded && !isHaveKFHeadView(); emptyBg.setVisibility(empty ? View.VISIBLE : View.GONE); - emptyHint.setHint("你还没有聊天记录哦!\n快去和好友聊天吧!"); + emptyHint.setText("你还没有聊天记录哦!\n快去和好友聊天吧!"); } @Override diff --git a/app/src/main/res/drawable/bg_message_input.xml b/app/src/main/res/drawable/bg_message_input.xml deleted file mode 100644 index 42aa23395..000000000 --- a/app/src/main/res/drawable/bg_message_input.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home_more_room.xml b/app/src/main/res/layout/activity_home_more_room.xml index 8db0b26b0..2726ab260 100644 --- a/app/src/main/res/layout/activity_home_more_room.xml +++ b/app/src/main/res/layout/activity_home_more_room.xml @@ -3,22 +3,21 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/color_F9F9F9" + android:background="@color/color_1c1b22" android:orientation="vertical"> - @@ -72,7 +71,7 @@ android:id="@+id/view_pager" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/color_F9F9F9" + android:background="@color/color_1c1b22" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> diff --git a/app/src/main/res/layout/fragment_contact_list.xml b/app/src/main/res/layout/fragment_contact_list.xml index ab15972cd..688be7053 100644 --- a/app/src/main/res/layout/fragment_contact_list.xml +++ b/app/src/main/res/layout/fragment_contact_list.xml @@ -9,7 +9,7 @@ + android:layout_marginTop="30dp"> diff --git a/app/src/main/res/layout/fragment_recent_contacts.xml b/app/src/main/res/layout/fragment_recent_contacts.xml index 464d37990..43303a8a6 100644 --- a/app/src/main/res/layout/fragment_recent_contacts.xml +++ b/app/src/main/res/layout/fragment_recent_contacts.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" - android:paddingBottom="60dp" /> + /> diff --git a/app/src/main/res/layout/layout_msg_view_holder_gift.xml b/app/src/main/res/layout/layout_msg_view_holder_gift.xml index 5efaf8588..d53500c81 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_gift.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_gift.xml @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6dp" android:layout_toRightOf="@id/avatar" - android:textColor="@color/color_333333" + android:textColor="@color/white" android:textSize="15dp" tools:text="礼物名称"/> @@ -53,7 +53,7 @@ android:id="@+id/gift_number" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/color_333333" + android:textColor="@color/color_c6c6e9" android:textSize="15dp" tools:text="x1"/> @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="12dp" - android:textColor="@color/color_999999" + android:textColor="@color/color_c6c6e9" tools:text="赠给 xxx"/> diff --git a/app/src/main/res/layout/layout_msg_view_holder_hello.xml b/app/src/main/res/layout/layout_msg_view_holder_hello.xml index 349f2b1a4..b4cb6115a 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_hello.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_hello.xml @@ -12,6 +12,6 @@ android:layout_gravity="center_vertical" android:layout_margin="10dp" android:text="恭喜您，获得抽奖机会，点我抽奖>>" - android:textColor="@color/text_color_primary" + android:textColor="@color/white" android:textSize="14sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_msg_view_holder_in_app_sharing.xml b/app/src/main/res/layout/layout_msg_view_holder_in_app_sharing.xml index 463af3b61..cd290a2b2 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_in_app_sharing.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_in_app_sharing.xml @@ -15,7 +15,7 @@ android:id="@+id/tv_title" android:layout_toStartOf="@+id/iv_avatar" android:textSize="@dimen/dp_14" - android:textColor="@color/text_color_primary" + android:textColor="@color/white" tools:text="我想邀请你加入我的家族：抓皮卡丘回精灵球家族，和我一起在家族里玩耍~" android:layout_width="wrap_content" android:layout_centerHorizontal="true" @@ -42,7 +42,7 @@ tools:text="立即加入" android:gravity="center" android:textSize="@dimen/dp_16" - android:textColor="@color/text_color_primary" + android:textColor="@color/white" android:layout_width="match_parent" android:layout_height="40dp" tools:ignore="SpUsage" /> diff --git a/app/src/main/res/layout/layout_msg_view_holder_level.xml b/app/src/main/res/layout/layout_msg_view_holder_level.xml index 87ea22fc3..fe97e6722 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_level.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_level.xml @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_toRightOf="@id/avatar" android:text="" - android:textColor="@color/text_color_primary" + android:textColor="@color/white" android:textSize="16dp" tools:text="恭喜!您的等级已到达"/> @@ -59,6 +59,6 @@ android:paddingLeft="10dp" android:paddingRight="10dp" android:drawableRight="@drawable/icon_arrow_right_small" - android:textColor="@color/color_999999"/> + android:textColor="@color/color_c6c6e9"/> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_msg_view_holder_lottery.xml b/app/src/main/res/layout/layout_msg_view_holder_lottery.xml index 349f2b1a4..b4cb6115a 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_lottery.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_lottery.xml @@ -12,6 +12,6 @@ android:layout_gravity="center_vertical" android:layout_margin="10dp" android:text="恭喜您，获得抽奖机会，点我抽奖>>" - android:textColor="@color/text_color_primary" + android:textColor="@color/white" android:textSize="14sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_msg_view_holder_online.xml b/app/src/main/res/layout/layout_msg_view_holder_online.xml index 1a4ed7b59..0b5972ef4 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_online.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_online.xml @@ -33,7 +33,7 @@ android:layout_marginTop="6dp" android:layout_toRightOf="@id/avatar" android:text="您关注的TA" - android:textColor="@color/text_color_primary" + android:textColor="@color/white" android:textSize="16dp" /> @@ -39,7 +39,7 @@ + app:tab_text_color="#555574" + app:tab_text_color_select="#248CFE" /> + app:tab_text_color="#555574" + app:tab_text_color_select="#248CFE" /> + app:tab_text_color="#555574" + app:tab_text_color_select="#248CFE" /> + app:tab_text_color="#555574" + app:tab_text_color_select="#248CFE" /> + app:tab_text_color="#555574" + app:tab_text_color_select="#248CFE" /> \ No newline at end of file diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentReplyAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentReplyAdapter.java index 4f4dbbf81..b240b0a46 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentReplyAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentReplyAdapter.java @@ -1,13 +1,11 @@ package com.yizhuan.erban.community.dynamic.adapter; -import android.content.Context; import android.text.style.ForegroundColorSpan; import android.view.View; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.netease.nim.uikit.common.util.log.LogUtil; import com.yizhuan.erban.R; import com.yizhuan.erban.UIHelper; import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; @@ -44,7 +42,7 @@ public class CommentReplyAdapter extends BaseQuickAdapter builder.append("@" + item.getToNick(), new ForegroundColorSpan(mContext.getResources().getColor(R.color.color_7154EE))) .append(" " + item.getContent(), - new ForegroundColorSpan(mContext.getResources().getColor(R.color.color_333333))); + new ForegroundColorSpan(mContext.getResources().getColor(R.color.color_c6c6e9))); helper.setText(R.id.tv_content, builder.build()); diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java index 146734a82..c98e70a4e 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java @@ -4,6 +4,7 @@ package com.yizhuan.erban.community.dynamic.adapter; import android.app.Activity; import android.content.Context; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; @@ -122,6 +123,8 @@ public class WorldDynamicAdapter extends BaseQuickAdapter { + if (hasFocus) { + hideEmojiView(); } }); @@ -363,21 +335,6 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele layoutRootMiniWorld = mHeaderView.findViewById(R.id.layout_root_mini_world); tvMiniWorldName = mHeaderView.findViewById(R.id.tv_mini_world_name); viewLineDetailHeader.setVisibility(View.VISIBLE); - - - } - - - private void resetTvCommentCountTop(int topDp) { - if (tvCommentCount == null) { - return; - } - if (!(tvCommentCount.getLayoutParams() instanceof ViewGroup.MarginLayoutParams)) { - return; - } - ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) tvCommentCount.getLayoutParams(); - params.topMargin = UIUtil.dip2px(context, topDp); - tvCommentCount.setLayoutParams(params); } private boolean currNeedKeyboard = false; @@ -390,32 +347,29 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele adapter = new CommentAdapter(); adapter.setHeaderAndEmpty(true); adapter.setHeaderView(mHeaderView); - adapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { - @Override - public void onLoadMoreRequested() { - if (isLoading || noMoreData) { - return; - } - LogUtil.print("onLoadMoreRequested..."); - rvListComment.postDelayed(new Runnable() { - @Override - public void run() { - if (ListUtils.isListEmpty(adapter.getData())) { - adapter.loadMoreEnd(); + adapter.setOnLoadMoreListener(() -> { + if (isLoading || noMoreData) { + return; + } + LogUtil.print("onLoadMoreRequested..."); + rvListComment.postDelayed(new Runnable() { + @Override + public void run() { + if (ListUtils.isListEmpty(adapter.getData())) { + adapter.loadMoreEnd(); + } else { + if (!isErr) { + //成功获取更多数据 + LogUtil.print("请求加载更多接口"); + loadComment(false, false); } else { - if (!isErr) { - //成功获取更多数据 - LogUtil.print("请求加载更多接口"); - loadComment(false, false); - } else { - //获取更多数据失败 - isErr = true; - adapter.loadMoreFail(); - } + //获取更多数据失败 + isErr = true; + adapter.loadMoreFail(); } } - }, 1000); - } + } + }, 1000); }, rvListComment); @@ -528,14 +482,11 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele }); //刷新 - refreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { - @Override - public void onRefresh() { - if (isLoading) { - return; - } - loadComment(true, true); + refreshLayout.setOnRefreshListener(() -> { + if (isLoading) { + return; } + loadComment(true, true); }); } @@ -737,7 +688,6 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele header_more(); }); - UserInfo.NamePlate namePlate = info.getNameplate(); tvTime.setText(TimeUiUtils.getDynamicUi(bean.getPublishTime())); etvContent.setVisibility(View.GONE); @@ -755,22 +705,17 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele setLikeCount(false); -// if (ListUtils.isListEmpty(bean.getDynamicResList())) { -// resetTvCommentCountTop(22); -// } else { -// resetTvCommentCountTop(15); -// } updateCommentCount(); //头饰 贵族头饰 String headwearEffect = bean.getHeadwearEffect(); String headwearPic = bean.getHeadwearPic(); String micDecorate = bean.getMicDecorate(); - if (!TextUtils.isEmpty(headwearEffect)){ + if (!TextUtils.isEmpty(headwearEffect)) { NobleUtil.loadHeadWear(headwearEffect, ivHeadWear); } else if (!TextUtils.isEmpty(headwearPic)) { NobleUtil.loadHeadWear(headwearPic, ivHeadWear); - } else if (!TextUtils.isEmpty(micDecorate)){ + } else if (!TextUtils.isEmpty(micDecorate)) { NobleUtil.loadResource(micDecorate, ivHeadWear); } else { ivHeadWear.setImageDrawable(null); @@ -964,15 +909,7 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele tvLikeCount.setText(likeCountStr); if (bean.isLike()) { -// if (isAnim) { -// AnimationDrawable drawable = (AnimationDrawable) context.getResources() -// .getDrawable(R.drawable.anim_list_dy_like); -// ivLikePic.setImageDrawable(drawable); -// drawable.stop(); -// drawable.start(); -// } else { ivLikePic.setImageResource(R.drawable.icon_dy_list_like); -// } } else { ivLikePic.setImageResource(R.drawable.icon_dy_list_like_false); } @@ -990,10 +927,6 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele if (bean.getCommentCount() >= 100000) { commentCountStr = "99999+"; } -// builder.append("所有评论(") -// .append(commentCountStr, -// new ForegroundColorSpan(getResources().getColor(R.color.color_333333))) -// .append(")"); String comment = "所有评论(" + commentCountStr + ")"; tvCommentCount.setText(comment); tvCommentCountOption.setText(commentCountStr); @@ -1232,4 +1165,15 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele } return true; } + + @Override + protected boolean needSteepStateBar() { + return true; + } + + @Override + protected void setStatusBar() { + super.setStatusBar(); + StatusBarUtil.transparencyBar(this); + } } diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java b/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java index 82bb090f3..86ffbd7cd 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java @@ -2,6 +2,7 @@ package com.yizhuan.erban.community.widget; import android.content.Context; +import androidx.annotation.ColorInt; import androidx.constraintlayout.widget.ConstraintLayout; import android.text.TextUtils; @@ -69,6 +70,18 @@ public class DynamicNickDetailWidget extends ShapeConstrainLayout { ButterKnife.bind(this); } + public void setNickColor(@ColorInt int color) { + if (tvNick != null) { + tvNick.setTextColor(color); + } + } + + public void setTimeColor(@ColorInt int color) { + if (tvTime != null) { + tvTime.setTextColor(color); + } + } + public void setData(BaseUserInfo info) { tvNick.setText(RegexUtil.getPrintableString(info.getNick())); tvAge.setVisibility(GONE); diff --git a/app/src/module_community/res/drawable-xhdpi/icon_dy_emoji.png b/app/src/module_community/res/drawable-xhdpi/icon_dy_emoji.png index 088f693ef888b1602a07d68c93f98ad66a4703a5..ff5c90c1f0334df35403796dfaa4ae3984290d6e 100644 GIT binary patch literal 2768 zcmV;>3NQ7EP)45875>hBW5*8JoYZf|4S}X=NNE7Ikb2(r*r66krASl?`%(k}f+$-l0Rkl^xW5pQPZ4cTnN`i_oSnJW2= zm^NXc(P-irA!r3a=KyH*xGMl}0V*a0-eMO2a^38jCr$q3)VCZTqh({f;XF>Ir@hzzLpmFJ!YrH+6K( z{ZB0c7W3-q`D~t2b*q_iuJ`UuBAipn!ukdpizSy5(bE8C0QiVmEpKZJ{p~;kEan}H zB~Bs|j{%quU>Cs4qzt~~M+aX(9VdAuGyM*L0r1BD{`yNgJDYa+5m0NI;oE)i34l%q z;1cn*mKA)soSd>i9VdAkGu;7z0o)>`d2czUlkwiRQ!4@dQeRd?yvnkIcaA4_T%bKY z$sfBe>D6+T;$@LYaP4G(@GB!4O+hcOLR60c_dw#mu3h?3>#32%&BbheH~}zA*x5Jf4`Z zl+ZrqRAzPZWZTJ!E~sZ`UjwjL2z5+29Qr8Fa|BSwN&bnM&LiUIEGu~aLSEVH{70IQXu-9^`} z`v5?_5Oj1n+^ql4MFzQH+o{I^TuQ_bSyu4sv6SuV;y`0#>V9UrvZTEtemD>?uUovB zhN=Nv3mJ}+e2|&0B2rIUR_M}wK)bus(+z`r^|wicg{7Qj+fHde^D-X*9+%Qw?t^X= zNiAe}=27qDUe~3T_V(u8xgE9b)I|WE*2mAX%q3$fXxqsMK>Lm*5x>_-fX){} zT^0_9o~Y!g9qP1>le&Z%PiQkkj+3&PVG*IDR>uBNSpe;HFy|bZDA{)U6M&BZ-1*g} z5)Tz%#d>(Y`-cEN*5BwZT_$i{nxPHrp{jH>dd1_P&QYrVzW}ytpgI=>Db2F^qiTd5 z%sHOv9MG1cDxk4gZ>tb=f$P%qkx0;<3^37XQVPN6GxOTEww4}0GK+!cj&6THrswM- z<(SxZO8dnj00}A0mU8s9cyHVL92Va)i;iyPmr?$>Pv()YM&^jis2cNP+o><}Wx@Xb zFB>~M=l9oQ*Glo&vW4r0hSK?(>0T+#!~DoAGB3jp0}(ErU#Gs1iESs>0Cc_g?C$Y=-)g~)T-e0j%;J{eXMCTO!4-b^ zj&SPzhG`>#CQbvypNF5(`%*T4%a7n{X>2?FPk@gep09o=W$5K{yhep-dV=F5|H4e) z7eXx$heJAdH16o?`lz9y;V>PydW{!ur<5&!FE_86_qN^pJ;3Pl=I-wA|I+kx`Hc#^ zH3QpDECU*+@{M~e&+h6VP=ZQ(=i=%c)K}nC^_=D z=Tj-eS(BXGw|Vo9ra)luGXM?DIBKlgMX_?ahXF8jdbB~m6M|QS!@>Lfg78BZk0-BJ ziq?3v{eXM4pTMIaIo6-e*3Z?QEd}Y$;3nc{EGwuJfBW;gUcToY00TtE0?V4CZRNOQ_#)E@ zYyPfBI3xsCw6-=sSnV;^$F-*?eU(zsr=!mMG`38io{sow&?rb?PfzB_KaOATmz! zv+#Pt{!F4;CuKN#g2MT_Mk@qPYi%`kHm~gPU1ZXnsx2E1*HvfS0nktLN3N`9r3r=r z{!J#cYgKWbv(%J|%7&UrVIf#|YgtzC%t{pAygB*xKma!Y^rM0XN53p~1N_Hq7QgQ3 z2X zkNb~tu76fvP{-?|Or)Ly>VDzZYpE8r_P&6j+nL2O&&fG(ZLE1Ey~gAll@hw5mTydc zh6t-G>7VrjS~rjYd?T~CXi^)K3zaL?YEGoq0@;n>@ZsD2fGMWYxmX~ulv!L@&}z=Q z%1*>93wwtu;qUt!Eyc9Nj|W_U-XP)_k$R{2#{)Wj+1Iyo8ZgjQS4Us<0)pe1Ndm09 zyLBO1kAwf?fnwmX*tXe*QGXUQPG=?^eN literal 509 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_>3?$zOPHh5GS^+*GuI>dsX)utUo(^NCrKYCB z*$~ET_jwUOUA!ehe!&c%dUpsIgx*qczqqVYRB7U71_s7bPZ!4!i_^&o3wS?-==MvZMUEQ$cD9cHP=ewsr*mh@c@1r?;%M;B^@0mJGOx&l< zn0hm=9LQR^m&f>x)~xNx3y&2l?qq#-jWwa_oh!SEq}a{b0?Qj@P9}12PDy*nHo-j4 zStN#aH+#}*-5YZ^CL~)NZ2NR?FUPc<)!_^|Us*Pka!FJrBymc7+tB#*=6kjT7lYS# znG{Y|TxWD{W6hC%AFFe+wSgz^a>4F~pLtAeJkpcaUto@Al(SmFAY?T`AT>dVsasPn zp`l$vMXbSZ4#T#n21YsV3o{!&tj>Gq^bSRB!+D zE;jIq2$OH9%z>PO?_tbEtD2U&oO|1JRX8A6>D`rX>!XiPs%BWe77E-cSk8BB^6QUN gL@K<*S1~ZW4c&g_c@C=wFlHD$UHx3vIVCg!07J*niU0rr diff --git a/app/src/module_community/res/drawable/selector_dy_send_btn.xml b/app/src/module_community/res/drawable/selector_dy_send_btn.xml index 785552635..5c1aa485e 100644 --- a/app/src/module_community/res/drawable/selector_dy_send_btn.xml +++ b/app/src/module_community/res/drawable/selector_dy_send_btn.xml @@ -3,7 +3,7 @@ - + diff --git a/app/src/module_community/res/layout/activity_dynamic_detail.xml b/app/src/module_community/res/layout/activity_dynamic_detail.xml index 1ec5a0489..c2c587f25 100644 --- a/app/src/module_community/res/layout/activity_dynamic_detail.xml +++ b/app/src/module_community/res/layout/activity_dynamic_detail.xml @@ -4,7 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white"> + android:background="@color/color_1c1b22" + android:paddingTop="25dp"> + > diff --git a/app/src/module_community/res/layout/fragment_square.xml b/app/src/module_community/res/layout/fragment_square.xml index a899a5784..3f379e712 100644 --- a/app/src/module_community/res/layout/fragment_square.xml +++ b/app/src/module_community/res/layout/fragment_square.xml @@ -10,7 +10,7 @@ + android:layout_marginTop="20dp"> - - - - - - - - - - - @@ -300,7 +289,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_15" android:layout_marginTop="@dimen/dp_15" - android:textColor="@color/color_999999" + android:textColor="@color/white" android:textSize="@dimen/sp_13" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/view_line_detail_header" diff --git a/app/src/module_community/res/layout/item_dy_comment.xml b/app/src/module_community/res/layout/item_dy_comment.xml index dedbc163f..0988e5111 100644 --- a/app/src/module_community/res/layout/item_dy_comment.xml +++ b/app/src/module_community/res/layout/item_dy_comment.xml @@ -23,7 +23,7 @@ android:ellipsize="end" android:maxWidth="180dp" android:singleLine="true" - android:textColor="@color/color_999999" + android:textColor="@color/white" android:textSize="@dimen/sp_13" app:layout_constraintStart_toEndOf="@id/iv_avatar" app:layout_constraintTop_toTopOf="@id/iv_avatar" @@ -35,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:textColor="@color/color_999999" + android:textColor="#4F516A" android:textSize="@dimen/sp_11" android:layout_marginEnd="@dimen/dp_15" app:layout_constraintTop_toTopOf="@id/tv_nick" @@ -51,7 +51,7 @@ android:layout_marginEnd="@dimen/dp_29" android:paddingTop="8dp" android:paddingBottom="@dimen/dp_13" - android:textColor="@color/color_333333" + android:textColor="#C6C6E9" android:textSize="@dimen/sp_15" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/tv_nick" @@ -62,7 +62,7 @@ android:layout_width="0dp" android:layout_height="1px" android:layout_marginEnd="@dimen/dp_15" - android:background="@color/line_color" + android:background="#353548" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/tv_content" @@ -80,7 +80,7 @@ android:id="@+id/line_reply_bottom" android:layout_width="0dp" android:layout_height="1px" - android:background="@color/line_color" + android:background="#353548" app:layout_constraintEnd_toEndOf="@id/line_reply_top" app:layout_constraintStart_toStartOf="@id/line_reply_top" app:layout_constraintTop_toBottomOf="@id/rv_reply" /> diff --git a/app/src/module_community/res/layout/item_dy_reply.xml b/app/src/module_community/res/layout/item_dy_reply.xml index c53638dcd..1fdf1db24 100644 --- a/app/src/module_community/res/layout/item_dy_reply.xml +++ b/app/src/module_community/res/layout/item_dy_reply.xml @@ -24,7 +24,7 @@ android:ellipsize="end" android:maxWidth="180dp" android:singleLine="true" - android:textColor="@color/color_999999" + android:textColor="@color/white" android:textSize="@dimen/sp_13" app:layout_constraintStart_toEndOf="@id/iv_avatar" app:layout_constraintTop_toTopOf="@id/iv_avatar" @@ -36,7 +36,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:textColor="@color/color_999999" + android:textColor="#4F516A" android:textSize="@dimen/sp_11" android:layout_marginEnd="@dimen/dp_15" app:layout_constraintBottom_toBottomOf="@id/tv_nick" @@ -52,7 +52,7 @@ android:paddingTop="10dp" android:paddingBottom="@dimen/sp_13" tools:text="回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复" - android:textColor="@color/color_333333" + android:textColor="@color/color_c6c6e9" android:textSize="@dimen/sp_15" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="@dimen/dp_29" @@ -65,7 +65,7 @@ app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="@dimen/dp_15" app:layout_constraintTop_toBottomOf="@id/tv_content" - android:background="@color/line_color" + android:background="#353548" android:layout_width="0dp" android:layout_height="1px" /> diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieActivity.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieActivity.java index 622cca648..d6c5f46f2 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieActivity.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieActivity.java @@ -23,13 +23,14 @@ import org.greenrobot.eventbus.ThreadMode; import butterknife.ButterKnife; import butterknife.OnClick; -public class RoomNewbieActivity extends BaseActivity{ +public class RoomNewbieActivity extends BaseActivity { private RoomNewbieListFragment newbieListFragment; private boolean mIsInRoom; private ImageView ivBack; - public static void start(Context context,boolean isInRoom) { + + public static void start(Context context, boolean isInRoom) { Intent starter = new Intent(context, RoomNewbieActivity.class); - starter.putExtra("isInRoom",isInRoom); + starter.putExtra("isInRoom", isInRoom); context.startActivity(starter); } @@ -63,8 +64,8 @@ public class RoomNewbieActivity extends BaseActivity{ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mIsInRoom = getIntent().getBooleanExtra("isInRoom",false); - setContentView(mIsInRoom?R.layout.activity_room_newbie_list:R.layout.activity_newbie_list); + mIsInRoom = getIntent().getBooleanExtra("isInRoom", false); + setContentView(mIsInRoom ? R.layout.activity_room_newbie_list : R.layout.activity_newbie_list); ButterKnife.bind(this); init(); diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentContactsFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentContactsFragment.java index f8dbe874e..21aad2ac4 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentContactsFragment.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentContactsFragment.java @@ -117,7 +117,7 @@ public class RoomMsgRecentContactsFragment extends TFragment { adapter.notifyDataSetChanged(); boolean empty = items.isEmpty() && msgLoaded; emptyBg.setVisibility(empty ? View.VISIBLE : View.GONE); - emptyHint.setHint("你还没有聊天记录哦!\n快去和好友聊天吧!"); + emptyHint.setText("你还没有聊天记录哦!\n快去和好友聊天吧!"); } @Override diff --git a/app/src/module_room_chat/res/layout/activity_newbie_list.xml b/app/src/module_room_chat/res/layout/activity_newbie_list.xml index 94448ae76..6133eec31 100644 --- a/app/src/module_room_chat/res/layout/activity_newbie_list.xml +++ b/app/src/module_room_chat/res/layout/activity_newbie_list.xml @@ -6,13 +6,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:paddingTop="27dp" - tools:background="@color/color_666666"> + android:background="@color/white"> + android:textSize="13sp" /> diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/InputPanel.java b/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/InputPanel.java index 0d8ca7ca5..60b99a13e 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/InputPanel.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/InputPanel.java @@ -122,7 +122,6 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba private volatile boolean disable; - private String hintText; private boolean isChat; public InputPanel(Container container, View view, List actions, boolean isTextAudioSwitchShow) { @@ -200,31 +199,31 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba private void initViews() { // input bar - messageActivityBottomLayout = (LinearLayout) view.findViewById(R.id.messageActivityBottomLayout); + messageActivityBottomLayout = view.findViewById(R.id.messageActivityBottomLayout); messageInputBar = view.findViewById(R.id.textMessageLayout); switchToTextButtonInInputBar = view.findViewById(R.id.buttonTextMessage); switchToAudioButtonInInputBar = view.findViewById(R.id.buttonAudioMessage); moreFuntionButtonInInputBar = view.findViewById(R.id.buttonMoreFuntionInText); emojiButtonInInputBar = view.findViewById(R.id.emoji_button); sendMessageButtonInInputBar = view.findViewById(R.id.buttonSendMessage); - messageEditText = (EditText) view.findViewById(R.id.editTextMessage); + messageEditText = view.findViewById(R.id.editTextMessage); // 语音 - audioRecordBtn = (Button) view.findViewById(R.id.audioRecord); + audioRecordBtn = view.findViewById(R.id.audioRecord); audioAnimLayout = view.findViewById(R.id.layoutPlayAudio); - time = (Chronometer) view.findViewById(R.id.timer); - timerTip = (TextView) view.findViewById(R.id.timer_tip); - timerTipContainer = (LinearLayout) view.findViewById(R.id.timer_tip_container); + time = view.findViewById(R.id.timer); + timerTip = view.findViewById(R.id.timer_tip); + timerTipContainer = view.findViewById(R.id.timer_tip_container); // 表情 - emoticonPickerView = (EmoticonPickerView) view.findViewById(R.id.emoticon_picker_view); + emoticonPickerView = view.findViewById(R.id.emoticon_picker_view); // 显示录音按钮 switchToTextButtonInInputBar.setVisibility(View.GONE); switchToAudioButtonInInputBar.setVisibility(View.VISIBLE); // 文本录音按钮切换布局 - textAudioSwitchLayout = (FrameLayout) view.findViewById(R.id.switchLayout); + textAudioSwitchLayout = view.findViewById(R.id.switchLayout); if (isTextAudioSwitchShow) { textAudioSwitchLayout.setVisibility(View.VISIBLE); } else { @@ -278,13 +277,9 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba return false; }); - messageEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() { - - @Override - public void onFocusChange(View v, boolean hasFocus) { - messageEditText.setHint(""); - checkSendButtonEnable(messageEditText); - } + messageEditText.setOnFocusChangeListener((v, hasFocus) -> { + messageEditText.setHint(""); + checkSendButtonEnable(messageEditText); }); messageEditText.addTextChangedListener(new TextWatcher() { @@ -377,7 +372,7 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba * ************************* 键盘布局切换 ******************************* */ - private View.OnClickListener clickListener = new View.OnClickListener() { + private final View.OnClickListener clickListener = new View.OnClickListener() { @Override public void onClick(View v) { @@ -591,21 +586,21 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba actionPanelBottomLayoutHasSetup = true; } - private Runnable showEmojiRunnable = new Runnable() { + private final Runnable showEmojiRunnable = new Runnable() { @Override public void run() { emoticonPickerView.setVisibility(View.VISIBLE); } }; - private Runnable showMoreFuncRunnable = new Runnable() { + private final Runnable showMoreFuncRunnable = new Runnable() { @Override public void run() { actionPanelBottomLayout.setVisibility(View.VISIBLE); } }; - private Runnable showTextRunnable = new Runnable() { + private final Runnable showTextRunnable = new Runnable() { @Override public void run() { showInputMethod(messageEditText); @@ -748,12 +743,8 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba int[] location = new int[2]; view.getLocationOnScreen(location); - if (event.getRawX() < location[0] || event.getRawX() > location[0] + view.getWidth() - || event.getRawY() < location[1] - 40) { - return true; - } - - return false; + return event.getRawX() < location[0] || event.getRawX() > location[0] + view.getWidth() + || event.getRawY() < location[1] - 40; } /** @@ -961,9 +952,8 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba container.proxy.sendMessage(customMessage); } - public void setLimitLevel(boolean isChat,String msg) { + public void setLimitLevel(boolean isChat, String msg) { this.isChat = isChat; - this.hintText = msg; setEditTextState(); }