yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:调整派对-房间条目样式尺寸

Browse Source 
feat:完善交友UI
This commit is contained in:
Max
2023-12-22 12:11:45 +08:00
parent c7dd6ec61c
commit 583d5a139b
14 changed files with 233 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nnbc123/app/home/adapter/HomePartyRoomAdapter.kt
View File

@@ -22,8 +22,8 @@ class HomePartyRoomAdapter :
setGone(R.id.iv_tag, !item.tagPict.isNullOrEmpty())
getView<ImageView>(R.id.iv_tag).load(item.tagPict)
setGone(R.id.iv_pk, item.isCrossPking)
setGone(R.id.iv_cover_foreground, !item.backgroundPic.isNullOrEmpty())
getView<ImageView>(R.id.iv_cover_foreground).load(item.backgroundPic, defaultRes = R.color.transparent)
setGone(R.id.iv_cover_border, !item.backgroundPic.isNullOrEmpty())
getView<ImageView>(R.id.iv_cover_border).load(item.backgroundPic, defaultRes = R.color.transparent)
}
val avatars: Array<ImageView> = arrayOf(
helper.getView(R.id.iv_avatar_0),

81
app/src/main/java/com/nnbc123/app/home/fragment/HomeFriendsFragment.kt
View File

@@ -1,9 +1,25 @@
package com.nnbc123.app.home.fragment
import androidx.core.view.isVisible
import androidx.fragment.app.activityViewModels
import com.chuhai.utils.ktx.singleClick
import com.nnbc123.app.R
import com.nnbc123.app.avroom.activity.AVRoomActivity
import com.nnbc123.app.base.BaseBindingFragment
import com.nnbc123.app.databinding.HomeFriendsFragmentBinding
import com.nnbc123.app.home.HomeViewModel
import com.nnbc123.app.home.activity.MoreRoomActivity
import com.nnbc123.app.home.dialog.RecommendRoomDialog
import com.nnbc123.app.ui.im.avtivity.NimP2PMessageActivity
import com.nnbc123.app.ui.utils.load
import com.nnbc123.app.ui.webview.CommonWebViewActivity
import com.nnbc123.core.auth.AuthModel
import com.nnbc123.core.home.event.RefreshHomeDataEvent
import com.nnbc123.core.statistic.StatisticManager
import com.nnbc123.library.annatation.ActLayoutRes
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
/**
* Created by Max on 2023/12/18 17:59
@@ -12,10 +28,75 @@ import com.nnbc123.library.annatation.ActLayoutRes
@ActLayoutRes(R.layout.home_friends_fragment)
class HomeFriendsFragment : BaseBindingFragment<HomeFriendsFragmentBinding>() {
private val homeViewModel: HomeViewModel by activityViewModels()
override fun initiate() {
initResource()
initType()
mBinding.refreshLayout.isEnableLoadmore = false
mBinding.refreshLayout.isEnableOverScrollBounce = false
mBinding.refreshLayout.setOnRefreshListener {
mBinding.refreshLayout.finishRefresh()
loadData()
}
childFragmentManager
.beginTransaction()
.replace(R.id.fragment_container_view, HomeFriendsListFragment())
.commitAllowingStateLoss()
}
private fun initType() {
}
private fun initResource() {
mBinding.ivResourceMatch.singleClick {
dialogManager.showProgressDialog(mContext)
homeViewModel.getHomeChatPick()
}
homeViewModel.homeChatPickLiveData.observe(viewLifecycleOwner) {
dialogManager.dismissDialog()
it?.let {
if (it.isNotEmpty()) {
NimP2PMessageActivity.start(context, it)
}
}
}
homeViewModel.resourceLiveData.observe(this) {
// 资源位5
it.getOrNull(4)?.let { item ->
mBinding.groupResource.isVisible = true
mBinding.ivResource0.load(item.icon)
mBinding.ivResource0.singleClick {
StatisticManager.Instance().onEvent(
"E_match_click",
"资源位点击",
mapOf("user_id" to AuthModel.get().currentUid.toString())
)
when (item.resourceType) {
5 -> {
CommonWebViewActivity.start(context, item.resourceContent)
}
else -> {
dialogManager.showProgressDialog(mContext)
homeViewModel.getResourceJumpInfo(item.id)
}
}
}
}
}
}
override fun onResume() {
super.onResume()
loadData()
}
private fun loadData() {
homeViewModel.getHomeResource()
}
}

11
app/src/main/java/com/nnbc123/app/home/fragment/HomePartyFragment.kt
View File

@@ -16,6 +16,7 @@ import com.nnbc123.app.home.dialog.RecommendRoomDialog
import com.nnbc123.app.home.helper.BannerHelper
import com.nnbc123.app.ui.im.avtivity.NimP2PMessageActivity
import com.nnbc123.app.ui.utils.load
import com.nnbc123.app.ui.webview.CommonWebViewActivity
import com.nnbc123.core.auth.AuthModel
import com.nnbc123.core.home.event.RefreshHomeDataEvent
import com.nnbc123.core.statistic.StatisticManager
@@ -121,18 +122,26 @@ class HomePartyFragment : BaseBindingFragment<HomePartyFragmentBinding>() {
)
for (i in resourceViews.indices) {
resourceViews[i].load(it[i].icon)
resourceViews[i].setOnClickListener { _ ->
resourceViews[i].singleClick { _ ->
currMatchClick = abcArray[i]
StatisticManager.Instance().onEvent(
"${currMatchClick}_match_click",
"资源位点击",
mapOf("user_id" to AuthModel.get().currentUid.toString())
)
when (it[i].resourceType) {
5 -> {
CommonWebViewActivity.start(context, it[i].resourceContent)
}
else -> {
dialogManager.showProgressDialog(mContext)
homeViewModel.getResourceJumpInfo(it[i].id)
}
}
}
}
}
homeViewModel.resourceJumpLiveData.observe(this)
{

BIN
app/src/main/res/drawable-xhdpi/ic_home_arrow_new.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 303 B

BIN
app/src/main/res/drawable-xhdpi/ic_home_refresh_new.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 584 B

BIN
app/src/main/res/drawable-xxhdpi/home_bg_match.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 124 KiB

8
app/src/main/res/drawable/base_shape_0f000000_13dp.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#0F000000" />
<corners android:radius="@dimen/dp_13" />
</shape>

12
app/src/main/res/drawable/home_ic_refresh.xml Normal file
View File

@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="14dp"
android:viewportWidth="14"
android:viewportHeight="14">
<path
android:pathData="M4.47,11.441C4.557,11.259 4.775,11.182 4.956,11.269C6.114,11.823 7.414,11.886 8.619,11.448C10.842,10.639 12.093,8.327 11.642,6.075L10.995,6.954C10.876,7.116 10.647,7.151 10.485,7.032C10.323,6.913 10.289,6.686 10.408,6.522L11.495,5.042C11.51,5.023 11.526,5.004 11.544,4.988L11.496,5.041C11.514,5.017 11.534,4.996 11.557,4.977C11.588,4.951 11.625,4.929 11.665,4.914C11.808,4.862 11.962,4.905 12.059,5.011L12.005,4.964C12.035,4.985 12.06,5.01 12.081,5.037C12.088,5.046 12.094,5.056 12.101,5.066C12.101,5.067 12.102,5.068 12.102,5.069L12.132,5.132L12.132,5.132C13.162,7.962 11.698,11.102 8.868,12.132C7.478,12.638 5.978,12.565 4.642,11.926C4.461,11.84 4.384,11.622 4.47,11.441ZM1.867,8.865C0.838,6.038 2.302,2.898 5.132,1.868C6.762,1.275 8.531,1.478 9.985,2.426C10.053,2.471 10.102,2.535 10.128,2.606C10.165,2.709 10.156,2.829 10.09,2.929C9.981,3.097 9.755,3.146 9.587,3.035C8.326,2.214 6.794,2.038 5.381,2.552C3.158,3.361 1.907,5.673 2.358,7.925L3.005,7.046C3.124,6.884 3.353,6.849 3.515,6.968C3.574,7.013 3.617,7.073 3.641,7.138C3.681,7.248 3.667,7.377 3.592,7.479L2.504,8.959L2.492,8.975C2.452,9.023 2.398,9.062 2.335,9.086C2.168,9.146 1.986,9.078 1.898,8.931C1.89,8.916 1.882,8.901 1.875,8.885C1.872,8.88 1.87,8.874 1.868,8.868L1.867,8.865Z"
android:strokeWidth="0.2"
android:fillColor="#696D7A"
android:fillType="nonZero"
android:strokeColor="#696D7A"/>
</vector>

12
app/src/main/res/drawable/home_ic_triangle.xml Normal file
View File

@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="14dp"
android:viewportWidth="14"
android:viewportHeight="14">
<path
android:pathData="M6.505,9.305L3.995,6.795C3.722,6.522 3.722,6.078 3.995,5.805C4.126,5.674 4.304,5.6 4.49,5.6L9.51,5.6C9.897,5.6 10.21,5.913 10.21,6.3C10.21,6.486 10.136,6.664 10.005,6.795L7.495,9.305C7.222,9.578 6.778,9.578 6.505,9.305Z"
android:strokeWidth="1"
android:fillColor="#696D7A"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>

238
app/src/main/res/layout/home_friends_fragment.xml
View File

@@ -32,206 +32,112 @@
app:contentScrim="@color/transparent"
app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ll_resource"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="15dp"
android:orientation="horizontal">
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_resource_0"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/ic_resource_0"
app:layout_constraintDimensionRatio="94:120"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.274" />
<ImageView
android:id="@+id/iv_resource_1"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/ic_resource_1"
app:layout_constraintDimensionRatio="120:56"
app:layout_constraintEnd_toStartOf="@id/iv_resource_2"
app:layout_constraintTop_toTopOf="@id/iv_resource_0"
app:layout_constraintWidth_percent="0.355" />
<ImageView
android:id="@+id/iv_resource_2"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="3dp"
android:src="@drawable/ic_resource_2"
app:layout_constraintDimensionRatio="120:56"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/iv_resource_0"
app:layout_constraintWidth_percent="0.355" />
<ImageView
android:id="@+id/iv_resource_3"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/ic_resource_3"
app:layout_constraintBottom_toBottomOf="@id/iv_resource_0"
app:layout_constraintDimensionRatio="243:56"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintWidth_percent="0.705" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="11dp"
android:layout_marginBottom="10dp"
android:gravity="bottom"
app:layout_constraintBottom_toBottomOf="@id/iv_resource_3"
app:layout_constraintEnd_toEndOf="@id/iv_resource_3">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:src="@drawable/ic_home_pick_avatar0" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_home_pick_avatar1" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_home_pick_avatar2" />
</LinearLayout>
<TextView
android:id="@+id/tv_online_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginBottom="10dp"
android:drawableStart="@drawable/shape_circle_82fbff_small"
android:drawablePadding="5dp"
android:textColor="@color/white"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="@id/iv_resource_3"
app:layout_constraintStart_toStartOf="@id/iv_resource_3"
tools:text="999人组队中" />
<FrameLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:background="@drawable/bg_gift_service"
app:layout_constraintDimensionRatio="694:148"
app:layout_constraintEnd_toEndOf="@id/iv_resource_3"
app:layout_constraintStart_toStartOf="@id/iv_resource_0"
app:layout_constraintTop_toBottomOf="@id/iv_resource_0">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="7dp"
android:src="@drawable/ic_home_hot" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_gift_service"
android:layout_width="match_parent"
android:layout_height="24dp"
android:layout_gravity="bottom"
android:layout_marginStart="15dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="11dp" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_roll_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15">
android:layout_marginTop="@dimen/dp_10"
android:scaleType="centerCrop"
android:src="@drawable/default_cover"
app:layout_constraintDimensionRatio="171:68"
app:layout_constraintEnd_toStartOf="@id/iv_resource_match"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.nnbc123.app.ui.widget.rollviewpager.RollPagerView
android:id="@+id/roll_view"
<ImageView
android:id="@+id/iv_resource_match"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="15dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="345:80"
android:layout_marginStart="@dimen/dp_3"
android:layout_marginEnd="@dimen/dp_15"
android:scaleType="centerCrop"
android:src="@drawable/home_bg_match"
app:layout_constraintDimensionRatio="171:68"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:rollviewpager_hint_gravity="left"
app:rollviewpager_hint_paddingBottom="8dp"
app:layout_constraintStart_toEndOf="@id/iv_resource_0"
app:layout_constraintTop_toTopOf="@id/iv_resource_0" />
<androidx.constraintlayout.widget.Group
android:id="@+id/group_resource"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="iv_resource_0,iv_resource_match"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_6"
android:orientation="horizontal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintTop_toBottomOf="@id/iv_resource_0"
tools:layout_height="80dp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>
<FrameLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/fl_indicator"
android:layout_width="match_parent"
android:layout_height="40dp">
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="15dp"
android:text="发现新朋友" />
android:layout_marginStart="@dimen/dp_18"
android:text="发现新朋友"
android:textColor="#2B2D33"
android:textSize="@dimen/dp_16"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.nnbc123.library.widget.DrawableCenterTextView
android:id="@+id/tv_new_refresh"
android:layout_width="65dp"
android:layout_height="23dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="74dp"
android:background="@drawable/shape_white_round_23dp"
android:drawableEnd="@drawable/ic_home_refresh_new"
android:drawablePadding="3dp"
android:id="@+id/tv_refresh"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_22"
android:layout_marginEnd="@dimen/dp_6"
android:background="@drawable/base_shape_0f000000_13dp"
android:drawableEnd="@drawable/home_ic_refresh"
android:drawablePadding="@dimen/dp_1"
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/dp_8"
android:text="换一换"
android:textColor="#ff878b9c"
android:textSize="11sp" />
android:textColor="#696D7A"
android:textSize="@dimen/dp_11"
app:layout_constraintBottom_toBottomOf="@id/tv_all"
app:layout_constraintEnd_toStartOf="@id/tv_all"
app:layout_constraintTop_toTopOf="@id/tv_all" />
<com.nnbc123.library.widget.DrawableCenterTextView
android:id="@+id/tv_new_filter"
android:layout_width="53dp"
android:layout_height="23dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="15dp"
android:background="@drawable/shape_white_round_23dp"
android:drawableEnd="@drawable/ic_home_arrow_new"
android:drawablePadding="3dp"
android:id="@+id/tv_all"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_22"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/base_shape_0f000000_13dp"
android:drawableEnd="@drawable/home_ic_triangle"
android:drawablePadding="@dimen/dp_1"
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/dp_8"
android:text="全部"
android:textColor="#ff878b9c"
android:textSize="11sp" />
android:textColor="#696D7A"
android:textSize="@dimen/dp_11"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.appbar.AppBarLayout>

1
app/src/main/res/layout/home_party_fragment.xml
View File

@@ -147,7 +147,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_19"
android:layout_marginTop="@dimen/dp_12"
android:paddingBottom="@dimen/dp_4"
android:text="热门推荐"
android:textColor="#2B2D33"
android:textSize="@dimen/dp_16"

2
app/src/main/res/layout/home_party_room_fragment.xml
View File

@@ -6,7 +6,7 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginHorizontal="@dimen/dp_9"
android:layout_marginHorizontal="@dimen/dp_11"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="2" />

35
app/src/main/res/layout/home_party_room_item.xml
View File

@@ -4,20 +4,38 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_4"
android:layout_marginVertical="@dimen/dp_3">
android:layout_marginHorizontal="@dimen/dp_2">
<Space
android:id="@+id/space_border_anchor"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="@id/iv_cover_border"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintWidth_percent="0.01162" />
<com.nnbc123.app.common.widget.RectRoundImageView
android:id="@+id/iv_cover"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerCrop"
app:borderRadius="@dimen/dp_12"
app:layout_constraintBottom_toTopOf="@id/space_border_anchor"
app:layout_constraintDimensionRatio="168:164"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="@id/iv_cover_border"
app:layout_constraintStart_toStartOf="@id/iv_cover_border"
app:layout_constraintWidth_percent="0.9767"
app:type="round"
tools:src="@drawable/default_cover" />
<ImageView
android:id="@+id/iv_cover_border"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintDimensionRatio="172:174"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_content_background"
android:layout_width="0dp"
@@ -28,15 +46,6 @@
app:layout_constraintEnd_toEndOf="@id/iv_cover"
app:layout_constraintStart_toStartOf="@id/iv_cover" />
<ImageView
android:id="@+id/iv_cover_foreground"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="@id/iv_cover"
app:layout_constraintEnd_toEndOf="@id/iv_cover"
app:layout_constraintStart_toStartOf="@id/iv_cover"
app:layout_constraintTop_toTopOf="@id/iv_cover" />
<ImageView
android:id="@+id/iv_tag"
android:layout_width="wrap_content"

2
app/src/main/res/values/dimens.xml
View File

@@ -59,6 +59,7 @@
<dimen name="bill_item_time">40dp</dimen>
<dimen name="bill_chat_item_height">70dp</dimen>
<dimen name="dp_1">1dp</dimen>
<dimen name="dp_2">2dp</dimen>
<dimen name="dp_3">3dp</dimen>
<dimen name="dp_4">4dp</dimen>
@@ -85,6 +86,7 @@
<dimen name="dp_40">40dp</dimen>
<dimen name="dp_45">45dp</dimen>
<dimen name="dp_50">50dp</dimen>
<dimen name="dp_52">52dp</dimen>
<dimen name="dp_60">60dp</dimen>
<dimen name="dp_72">72dp</dimen>