diff --git a/app/src/main/java/com/nnbc123/app/home/adapter/HomePartyRoomAdapter.kt b/app/src/main/java/com/nnbc123/app/home/adapter/HomePartyRoomAdapter.kt index ea5847797..1ba284fe7 100644 --- a/app/src/main/java/com/nnbc123/app/home/adapter/HomePartyRoomAdapter.kt +++ b/app/src/main/java/com/nnbc123/app/home/adapter/HomePartyRoomAdapter.kt @@ -22,8 +22,8 @@ class HomePartyRoomAdapter : setGone(R.id.iv_tag, !item.tagPict.isNullOrEmpty()) getView(R.id.iv_tag).load(item.tagPict) setGone(R.id.iv_pk, item.isCrossPking) - setGone(R.id.iv_cover_foreground, !item.backgroundPic.isNullOrEmpty()) - getView(R.id.iv_cover_foreground).load(item.backgroundPic, defaultRes = R.color.transparent) + setGone(R.id.iv_cover_border, !item.backgroundPic.isNullOrEmpty()) + getView(R.id.iv_cover_border).load(item.backgroundPic, defaultRes = R.color.transparent) } val avatars: Array = arrayOf( helper.getView(R.id.iv_avatar_0), diff --git a/app/src/main/java/com/nnbc123/app/home/fragment/HomeFriendsFragment.kt b/app/src/main/java/com/nnbc123/app/home/fragment/HomeFriendsFragment.kt index ff0dfd9bc..a73b39b1a 100644 --- a/app/src/main/java/com/nnbc123/app/home/fragment/HomeFriendsFragment.kt +++ b/app/src/main/java/com/nnbc123/app/home/fragment/HomeFriendsFragment.kt @@ -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() { + + 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() + } } \ No newline at end of file diff --git a/app/src/main/java/com/nnbc123/app/home/fragment/HomePartyFragment.kt b/app/src/main/java/com/nnbc123/app/home/fragment/HomePartyFragment.kt index bdbf258f3..3962ea1bc 100644 --- a/app/src/main/java/com/nnbc123/app/home/fragment/HomePartyFragment.kt +++ b/app/src/main/java/com/nnbc123/app/home/fragment/HomePartyFragment.kt @@ -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,15 +122,23 @@ class HomePartyFragment : BaseBindingFragment() { ) 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()) ) - dialogManager.showProgressDialog(mContext) - homeViewModel.getResourceJumpInfo(it[i].id) + when (it[i].resourceType) { + 5 -> { + CommonWebViewActivity.start(context, it[i].resourceContent) + } + + else -> { + dialogManager.showProgressDialog(mContext) + homeViewModel.getResourceJumpInfo(it[i].id) + } + } } } } diff --git a/app/src/main/res/drawable-xhdpi/ic_home_arrow_new.png b/app/src/main/res/drawable-xhdpi/ic_home_arrow_new.png deleted file mode 100644 index 7aaa45ada..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_home_arrow_new.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_home_refresh_new.png b/app/src/main/res/drawable-xhdpi/ic_home_refresh_new.png deleted file mode 100644 index b45795a18..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_home_refresh_new.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/home_bg_match.png b/app/src/main/res/drawable-xxhdpi/home_bg_match.png new file mode 100644 index 000000000..ce0b45620 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/home_bg_match.png differ diff --git a/app/src/main/res/drawable/base_shape_0f000000_13dp.xml b/app/src/main/res/drawable/base_shape_0f000000_13dp.xml new file mode 100644 index 000000000..b0433a2dc --- /dev/null +++ b/app/src/main/res/drawable/base_shape_0f000000_13dp.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/home_ic_refresh.xml b/app/src/main/res/drawable/home_ic_refresh.xml new file mode 100644 index 000000000..6d7cf937f --- /dev/null +++ b/app/src/main/res/drawable/home_ic_refresh.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/drawable/home_ic_triangle.xml b/app/src/main/res/drawable/home_ic_triangle.xml new file mode 100644 index 000000000..b64d3e0b6 --- /dev/null +++ b/app/src/main/res/drawable/home_ic_triangle.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/layout/home_friends_fragment.xml b/app/src/main/res/layout/home_friends_fragment.xml index 17442c5f7..6d96e411c 100644 --- a/app/src/main/res/layout/home_friends_fragment.xml +++ b/app/src/main/res/layout/home_friends_fragment.xml @@ -32,206 +32,112 @@ app:contentScrim="@color/transparent" app:layout_scrollFlags="scroll|enterAlwaysCollapsed"> - + android:layout_height="wrap_content"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 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" /> - + - + - + + + - - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_20"> + 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" /> + 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" /> + android:textColor="#696D7A" + android:textSize="@dimen/dp_11" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + diff --git a/app/src/main/res/layout/home_party_fragment.xml b/app/src/main/res/layout/home_party_fragment.xml index d783793c7..c7bb97b00 100644 --- a/app/src/main/res/layout/home_party_fragment.xml +++ b/app/src/main/res/layout/home_party_fragment.xml @@ -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" diff --git a/app/src/main/res/layout/home_party_room_fragment.xml b/app/src/main/res/layout/home_party_room_fragment.xml index 96aed6d91..0d4acea99 100644 --- a/app/src/main/res/layout/home_party_room_fragment.xml +++ b/app/src/main/res/layout/home_party_room_fragment.xml @@ -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" /> diff --git a/app/src/main/res/layout/home_party_room_item.xml b/app/src/main/res/layout/home_party_room_item.xml index c3af707c7..647d03fc2 100644 --- a/app/src/main/res/layout/home_party_room_item.xml +++ b/app/src/main/res/layout/home_party_room_item.xml @@ -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"> + + + + - - 40dp 70dp + 1dp 2dp 3dp 4dp @@ -85,6 +86,7 @@ 40dp 45dp 50dp + 52dp 60dp 72dp