From bd14980c1461712ee20fe4a7b0660dfc99dcc28d Mon Sep 17 00:00:00 2001 From: huangjian Date: Tue, 21 Mar 2023 19:27:41 +0800 Subject: [PATCH] =?UTF-8?q?UI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/home/adapter/HomePlayAdapter.kt | 2 +- .../app/home/fragment/RecommendFragment.kt | 18 +++++++++ .../ui/im/avtivity/NimP2PMessageActivity.java | 9 +++-- .../app/ui/im/chat/MsgViewHolderContent.java | 10 +++++ .../ui/im/recent/holder/RecentViewHolder.java | 4 +- .../app/ui/webview/DialogWebViewActivity.java | 11 +++++- .../com/nnbc123/app/ui/widget/GiftDialog.java | 2 +- .../app/ui/widget/PrivateChatGiftDialog.java | 2 +- app/src/main/res/drawable/bg_msg_page.xml | 10 +++++ app/src/main/res/layout/activity_main.xml | 17 ++++++--- .../res/layout/activity_patriarch_mode.xml | 2 +- .../main/res/layout/activity_user_info.xml | 1 - .../main/res/layout/dialog_bottom_gift.xml | 38 +++++++++---------- app/src/main/res/layout/fragment_msg.xml | 4 +- app/src/main/res/layout/fragment_party.xml | 1 + app/src/main/res/layout/item_home_play.xml | 1 + .../layout/layout_msg_view_holder_content.xml | 4 ++ .../layout/nim_recent_contact_list_item.xml | 2 +- .../app/community/square/SquareFragment.java | 10 ++++- .../res/layout/fragment_square.xml | 24 +++++++++--- .../activity/TreasureBoxActivity.java | 5 ++- .../bg_nim_water_drop_other_no_padding.xml | 13 +++++++ .../bg_nim_water_drop_self_no_padding.xml | 13 +++++++ .../ui/draggablebubbles/BubbleView.java | 27 +++---------- 24 files changed, 162 insertions(+), 68 deletions(-) create mode 100644 app/src/main/res/drawable/bg_msg_page.xml create mode 100644 nim_uikit/res/drawable/bg_nim_water_drop_other_no_padding.xml create mode 100644 nim_uikit/res/drawable/bg_nim_water_drop_self_no_padding.xml diff --git a/app/src/main/java/com/nnbc123/app/home/adapter/HomePlayAdapter.kt b/app/src/main/java/com/nnbc123/app/home/adapter/HomePlayAdapter.kt index c1c119d15..da5eda828 100644 --- a/app/src/main/java/com/nnbc123/app/home/adapter/HomePlayAdapter.kt +++ b/app/src/main/java/com/nnbc123/app/home/adapter/HomePlayAdapter.kt @@ -33,7 +33,7 @@ class HomePlayAdapter : BaseMultiItemQuickAdapter( item.itemType == HomeRoomInfo.TYPE_BROADCAST ) { helper.setText(R.id.tv_room_title, item.title) - helper.setVisible(R.id.iv_room_tag, !TextUtils.isEmptyText(item.tagPict)) + helper.setGone(R.id.iv_room_tag, !TextUtils.isEmptyText(item.tagPict)) ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_room_tag), item.tagPict) helper.setText(R.id.tv_online_number, "${item.onlineNum}") val tvMgName = helper.getView(R.id.tv_mg_name) diff --git a/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt b/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt index 0ae0c8b88..3425bdbe7 100644 --- a/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt +++ b/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt @@ -14,6 +14,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager +import androidx.viewpager.widget.ViewPager import com.nnbc123.app.R import com.nnbc123.app.avroom.activity.AVRoomActivity import com.nnbc123.app.avroom.adapter.RoomVPAdapter @@ -263,6 +264,23 @@ class RecommendFragment : BaseFragment(), mBinding.viewPager.adapter = RoomVPAdapter(childFragmentManager, mFragmentsBottom) ViewPagerHelper.bind(mBinding.magicIndicator, mBinding.viewPager) + mBinding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + override fun onPageScrolled( + position: Int, + positionOffset: Float, + positionOffsetPixels: Int + ) { + } + + override fun onPageSelected(position: Int) { + mBinding.tvNewRefresh.isVisible = position == 0 + mBinding.tvNewFilter.isVisible = position == 0 + } + + override fun onPageScrollStateChanged(state: Int) { + } + + }) } private fun initSingleAnchor() { diff --git a/app/src/main/java/com/nnbc123/app/ui/im/avtivity/NimP2PMessageActivity.java b/app/src/main/java/com/nnbc123/app/ui/im/avtivity/NimP2PMessageActivity.java index 65f7684ac..3fd22d063 100644 --- a/app/src/main/java/com/nnbc123/app/ui/im/avtivity/NimP2PMessageActivity.java +++ b/app/src/main/java/com/nnbc123/app/ui/im/avtivity/NimP2PMessageActivity.java @@ -167,6 +167,7 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity { IMFriendModel.get().addCloseTipsAccount(sessionId); tipsLayout.setVisibility(View.GONE); }); + ivAttention = (ImageView) findViewById(R.id.iv_attention); // 单聊特例话数据，包括个人信息，黑名单 addBlackList(); requestBuddyInfo(); @@ -254,6 +255,10 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity { @SuppressLint("CheckResult") private void requestBuddyInfo() { + + if (SystemUidUtil.isSystemUid(sessionId)){ + ivAttention.setVisibility(View.GONE); + } getNickFromSession(); // 如果有个人信息可以获取 UserModel.get().getUserInfo(Long.valueOf(sessionId)).subscribe(new Consumer() { @@ -277,9 +282,7 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity { } tvToolbarTitle.setText(builder); tvToolbarTitle.setVisibility(View.VISIBLE); - - ivAttention = (ImageView) findViewById(R.id.iv_attention); - if (AuthModel.get().getCurrentUid() != userInfo.getUid()) { + if (AuthModel.get().getCurrentUid() != userInfo.getUid() && !SystemUidUtil.isSystemUid(sessionId)) { PraiseModel.get().isPraised(AuthModel.get().getCurrentUid(), userInfo.getUid()).subscribe(); } buddyUserInfo = userInfo; diff --git a/app/src/main/java/com/nnbc123/app/ui/im/chat/MsgViewHolderContent.java b/app/src/main/java/com/nnbc123/app/ui/im/chat/MsgViewHolderContent.java index c725c718b..816a21522 100644 --- a/app/src/main/java/com/nnbc123/app/ui/im/chat/MsgViewHolderContent.java +++ b/app/src/main/java/com/nnbc123/app/ui/im/chat/MsgViewHolderContent.java @@ -51,6 +51,16 @@ public class MsgViewHolderContent extends MsgViewHolderBase implements View.OnCl ivNewTag = findViewById(R.id.iv_new_tag); } + @Override + protected int leftBackground() { + return com.netease.nim.uikit.R.drawable.bg_nim_water_drop_other_no_padding; + } + + @Override + protected int rightBackground() { + return com.netease.nim.uikit.R.drawable.bg_nim_water_drop_self_no_padding; + } + @Override protected void bindContentView() { NoticeAttachment attachment = (NoticeAttachment) message.getAttachment(); diff --git a/app/src/main/java/com/nnbc123/app/ui/im/recent/holder/RecentViewHolder.java b/app/src/main/java/com/nnbc123/app/ui/im/recent/holder/RecentViewHolder.java index 46ab2d06c..48cf2abdc 100644 --- a/app/src/main/java/com/nnbc123/app/ui/im/recent/holder/RecentViewHolder.java +++ b/app/src/main/java/com/nnbc123/app/ui/im/recent/holder/RecentViewHolder.java @@ -78,9 +78,9 @@ public abstract class RecentViewHolder extends RecyclerViewHolder + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 748899ec4..aa5858c7e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,9 +10,17 @@ android:id="@+id/main_fragment" android:layout_width="match_parent" android:layout_height="0dp" - app:layout_constraintBottom_toTopOf="@id/main_tab_layout" + app:layout_constraintBottom_toTopOf="@id/view_line" app:layout_constraintTop_toTopOf="parent" /> + + android:src="@color/black" + app:riv_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index 0206bb1b8..412f610e6 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -137,7 +137,6 @@ android:maxLines="1" android:textColor="@color/text_normal_282828" android:textSize="18dp" - android:textStyle="bold" app:layout_constraintStart_toEndOf="@id/iv_vip_icon" app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginStart="0dp" diff --git a/app/src/main/res/layout/dialog_bottom_gift.xml b/app/src/main/res/layout/dialog_bottom_gift.xml index 302f6d563..535f9df69 100644 --- a/app/src/main/res/layout/dialog_bottom_gift.xml +++ b/app/src/main/res/layout/dialog_bottom_gift.xml @@ -200,11 +200,28 @@ + + + + + + @@ -337,8 +352,7 @@ + android:layout_height="35dp"> - - diff --git a/app/src/main/res/layout/fragment_msg.xml b/app/src/main/res/layout/fragment_msg.xml index 6120d791b..38534aece 100644 --- a/app/src/main/res/layout/fragment_msg.xml +++ b/app/src/main/res/layout/fragment_msg.xml @@ -3,14 +3,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/bg_normal_1c1b22" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/layout_msg_view_holder_content.xml b/app/src/main/res/layout/layout_msg_view_holder_content.xml index fb696cd95..562c410c0 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_content.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_content.xml @@ -8,6 +8,10 @@ android:id="@+id/layout" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingLeft="15dp" + android:paddingTop="13dp" + android:paddingRight="15dp" + android:paddingBottom="13dp" android:orientation="vertical"> { mRecommendTopicAdapter.setNewData(miniWorldInfos); }); + tvTitleTopic.setOnClickListener(v -> { + AllTopicActivity.start(getActivity(), 0); + }); + } @Override diff --git a/app/src/module_community/res/layout/fragment_square.xml b/app/src/module_community/res/layout/fragment_square.xml index d51a0aec8..24879e97d 100644 --- a/app/src/module_community/res/layout/fragment_square.xml +++ b/app/src/module_community/res/layout/fragment_square.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/bg_normal_1c1b22" + android:background="@color/white" android:paddingTop="54dp"> + android:layout_height="wrap_content" + android:layout_marginBottom="15dp"> + + + app:layout_constraintTop_toBottomOf="@id/tv_title_topic" /> @@ -75,8 +89,8 @@ android:id="@+id/msg_number" android:layout_width="8dp" android:layout_height="8dp" - android:background="@drawable/shape_red_ff7162_corner" android:layout_marginStart="@dimen/dp_12" + android:background="@drawable/shape_red_ff7162_corner" android:gravity="center" android:visibility="gone" tools:text="123" diff --git a/app/src/module_treasure_box/java/com/nnbc123/app/treasure_box/activity/TreasureBoxActivity.java b/app/src/module_treasure_box/java/com/nnbc123/app/treasure_box/activity/TreasureBoxActivity.java index 212f2fd32..3c33849c0 100644 --- a/app/src/module_treasure_box/java/com/nnbc123/app/treasure_box/activity/TreasureBoxActivity.java +++ b/app/src/module_treasure_box/java/com/nnbc123/app/treasure_box/activity/TreasureBoxActivity.java @@ -178,7 +178,10 @@ public class TreasureBoxActivity extends BaseBindingActivity + + + + + + + + \ No newline at end of file diff --git a/nim_uikit/res/drawable/bg_nim_water_drop_self_no_padding.xml b/nim_uikit/res/drawable/bg_nim_water_drop_self_no_padding.xml new file mode 100644 index 000000000..ca99cc7d9 --- /dev/null +++ b/nim_uikit/res/drawable/bg_nim_water_drop_self_no_padding.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java index c33fad135..b46912ea3 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java @@ -49,12 +49,11 @@ public class BubbleView extends AppCompatTextView { setTextColor(ContextCompat.getColor(getContext(), R.color.white)); setTextSize(10); GradientDrawable gradientDrawable = new GradientDrawable(); - gradientDrawable.setShape(GradientDrawable.RECTANGLE); + gradientDrawable.setShape(GradientDrawable.OVAL); // gradientDrawable.setShape(GradientDrawable.RECTANGLE); gradientDrawable.setCornerRadius(ScreenUtil.dip2px(20)); gradientDrawable.setColor(Color.parseColor("#FF3B30")); setBackground(gradientDrawable); - setPadding(ScreenUtil.dip2px(4), ScreenUtil.dip2px(1), ScreenUtil.dip2px(4), ScreenUtil.dip2px(1)); setGravity(Gravity.CENTER); // TextViewCompat.setAutoSizeTextTypeWithDefaults(this,TextViewCompat.AUTO_SIZE_TEXT_TYPE_UNIFORM); // TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(this, @@ -74,38 +73,22 @@ public class BubbleView extends AppCompatTextView { * @param num */ public void setNumText(int num) { -// num += 100; if (num < 1) { setVisibility(GONE); return; } - setVisibility(VISIBLE); String numStr; if (num > 99) { - numStr = "99+"; + numStr = "99"; } else { numStr = String.valueOf(num); } getPaint().getTextBounds(numStr, 0, numStr.length(), textRect); - int width = textRect.width() + getPaddingStart() + getPaddingEnd(); - int height = textRect.height() + getPaddingTop() + getPaddingBottom(); ViewGroup.LayoutParams lp = getLayoutParams(); - lp.width = ViewGroup.LayoutParams.WRAP_CONTENT; - lp.height = ViewGroup.LayoutParams.WRAP_CONTENT; -// if (num < 10) { -// int size = Math.max(width, height); -//// lp.width = size; -//// lp.height = size; -// lp.width = ViewGroup.LayoutParams.WRAP_CONTENT; -// lp.height = ViewGroup.LayoutParams.WRAP_CONTENT; -// } else { -// lp.width = ViewGroup.LayoutParams.WRAP_CONTENT; -// lp.height = ViewGroup.LayoutParams.WRAP_CONTENT; -// } - + lp.width = ScreenUtil.dip2px(18); + lp.height = ScreenUtil.dip2px(18); + setLayoutParams(lp); setText(numStr); - - } }