diff --git a/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt b/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt index 6677d8292..e2c5cf973 100644 --- a/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt +++ b/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt @@ -69,6 +69,12 @@ class HomeViewModel : BaseViewModel() { private val _anchorInfoLiveData = MutableLiveData() val anchorInfoLiveData: MutableLiveData = _anchorInfoLiveData + private val _homePlayInfoLiveData = MutableLiveData?>() + val homePlayInfoData : MutableLiveData?> = _homePlayInfoLiveData + + private val _homeHotRoomLiveData = MutableLiveData?>() + val homeHotRoomLiveData: LiveData?> = _homeHotRoomLiveData + fun getBannerInfo() { safeLaunch { _bannerLiveData.value = HomeModel.getHomeBanner("9") @@ -239,5 +245,26 @@ class HomeViewModel : BaseViewModel() { ) } + fun getHomePlayV2() { + safeLaunch( + onError = { + _homePlayInfoLiveData.value = null + }, + block = { + _homePlayInfoLiveData.value = HomeModel.getHomePlayV2() + } + ) + } + + fun getHotRoom() { + safeLaunch( + onError = { + _homeHotRoomLiveData.value = null + }, + block = { + _homeHotRoomLiveData.value = HomeModel.getHotRoom() + } + ) + } } \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeChatAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeChatAdapter.kt new file mode 100644 index 000000000..ac07d41b1 --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeChatAdapter.kt @@ -0,0 +1,31 @@ +package com.yizhuan.erban.home.adapter + +import android.view.View +import androidx.core.content.ContextCompat +import com.chad.library.adapter.base.BaseQuickAdapter +import com.chad.library.adapter.base.BaseViewHolder +import com.yizhuan.erban.R +import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 +import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo + +/** + * create by lvzebiao @2019/11/13 + */ +class HomeChatAdapter : + BaseQuickAdapter(R.layout.item_home_chat) { + + override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) { + when(item.gender){ + 0 ->{ + helper.getView(R.id.mViewBg).background = ContextCompat.getDrawable(mContext,R.drawable.bg_home_chat_man) + } + 1 ->{ + helper.getView(R.id.mViewBg).background = ContextCompat.getDrawable(mContext,R.drawable.bg_home_chat_man) + } + 2 ->{ + helper.getView(R.id.mViewBg).background = ContextCompat.getDrawable(mContext,R.drawable.bg_home_chat_women) + } + } + ImageLoadUtilsV2.loadAvatar(helper.getView(R.id.mCirImage), item.avatar) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeHotAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeHotAdapter.kt new file mode 100644 index 000000000..daa9dab51 --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeHotAdapter.kt @@ -0,0 +1,43 @@ +package com.yizhuan.erban.home.adapter + +import android.widget.ImageView +import androidx.core.view.isGone +import com.chad.library.adapter.base.BaseQuickAdapter +import com.chad.library.adapter.base.BaseViewHolder +import com.yizhuan.erban.R +import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 +import com.yizhuan.erban.ui.utils.load +import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo +import com.yizhuan.xchat_android_core.utils.TextUtils + +/** + * create by lvzebiao @2019/11/13 + */ +class HomeHotAdapter : + BaseQuickAdapter(R.layout.item_room_common) { + + override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) { + helper.apply { + getView(R.id.iv_room_image).load(item.avatar) + setText(R.id.tv_online_number, "${item.onlineNum}") + setText(R.id.tv_room_title, item.title) + setText(R.id.tv_id, "ID:${item.erbanNo}") + } + helper.setVisible(R.id.tv_in_pk, item.isCrossPking) + helper.setGone(R.id.iv_room_tag, !TextUtils.isEmptyText(item.tagPict)) + ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_room_tag), item.tagPict) + + val avatars: Array = arrayOf( + helper.getView(R.id.iv_avatar_0), + helper.getView(R.id.iv_avatar_1), + helper.getView(R.id.iv_avatar_2), + helper.getView(R.id.iv_avatar_3), + helper.getView(R.id.iv_avatar_4) + ) + for (i in avatars.indices) { + val avatarUrl = item.micUsers?.getOrNull(i)?.avatar + avatars[i].isGone = avatarUrl.isNullOrBlank() + avatars[i].load(avatarUrl) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomCommonAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomCommonAdapter.kt index 343af4384..4d8b06f78 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomCommonAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomCommonAdapter.kt @@ -22,7 +22,7 @@ class RoomCommonAdapter : BaseQuickAdapter(R.layou setText(R.id.tv_id, "ID:${item.erbanNo}") } helper.setVisible(R.id.tv_in_pk, item.isCrossPking) - 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) val avatars: Array = arrayOf( diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt index c3d96425a..113380354 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt @@ -1,33 +1,24 @@ package com.yizhuan.erban.home.fragment -import android.graphics.Color import android.os.Bundle import android.view.View -import android.widget.LinearLayout -import android.widget.TextView -import androidx.core.view.isGone import androidx.databinding.DataBindingUtil -import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import androidx.recyclerview.widget.LinearLayoutManager -import com.scwang.smartrefresh.layout.internal.ProgressDrawable +import com.chad.library.adapter.base.BaseQuickAdapter import com.yizhuan.erban.R import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.avroom.adapter.RoomVPAdapter +import com.yizhuan.erban.base.BaseActivity import com.yizhuan.erban.base.BaseFragment import com.yizhuan.erban.databinding.FragmentRecommendBinding import com.yizhuan.erban.home.HomeViewModel -import com.yizhuan.erban.home.adapter.HomeSingleAnchorAdapter -import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter +import com.yizhuan.erban.home.adapter.HomeChatAdapter +import com.yizhuan.erban.home.adapter.HomeHotAdapter import com.yizhuan.erban.home.dialog.RecommendRoomDialog import com.yizhuan.erban.home.helper.BannerHelper -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.erban.ui.webview.CommonWebViewActivity -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.yizhuan.erban.home.helper.OpenRoomHelper import com.yizhuan.xchat_android_core.auth.AuthModel +import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent -import com.yizhuan.xchat_android_core.initial.InitialModel import com.yizhuan.xchat_android_core.statistic.StatisticManager import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol import com.yizhuan.xchat_android_library.utils.ResUtil @@ -38,11 +29,10 @@ import org.greenrobot.eventbus.ThreadMode /** * Peko首页 */ -class RecommendFragment : BaseFragment(), - MainMagicIndicatorAdapter.OnItemSelectListener { +class RecommendFragment : BaseFragment() { private lateinit var mBinding: FragmentRecommendBinding - private var mFragmentsBottom: MutableList = ArrayList() - private lateinit var singleAnchorAdapter: HomeSingleAnchorAdapter + private lateinit var charAdapter: HomeChatAdapter + private lateinit var roomHotAdapter: HomeHotAdapter private val homeViewModel: HomeViewModel by activityViewModels() @@ -63,7 +53,6 @@ class RecommendFragment : BaseFragment(), return R.layout.fragment_recommend } - override fun onFindViews() { mBinding = DataBindingUtil.bind(mView)!! } @@ -75,8 +64,8 @@ class RecommendFragment : BaseFragment(), override fun initiate() { initRefreshView() - initTitleTab() - initSingleAnchor() + initChatTab() + initHotRoomTab() childFragmentManager .beginTransaction() @@ -86,38 +75,10 @@ class RecommendFragment : BaseFragment(), homeViewModel.bannerLiveData.observe(this) { BannerHelper.setBanner(mBinding.rollView, it) { _, _ -> StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_HOME_BANNER_CLICK, ResUtil.getString(R.string.home_fragment_recommendfragment_01)) - } - } - - homeViewModel.resourceLiveData.observe(this) { - if (it.isNullOrEmpty() || it.size != 3) { - mBinding.llResource.isGone = true - return@observe - } - mBinding.llResource.isGone = false - val resourceViews = arrayOf( - mBinding.ivResource0, - mBinding.ivResource1, - mBinding.ivResource2 - ) - - for (i in resourceViews.indices) { - resourceViews[i].load(it[i].icon) - resourceViews[i].setOnClickListener { _ -> - currMatchClick = abcArray[i] - StatisticManager.Instance().onEvent( - "${currMatchClick}_match_click", - ResUtil.getString(R.string.home_fragment_recommendfragment_02), - mapOf("user_id" to AuthModel.get().currentUid.toString()) + .onEvent( + StatisticsProtocol.EVENT_HOME_BANNER_CLICK, + ResUtil.getString(R.string.home_fragment_recommendfragment_01) ) - if (it[i].resourceType == 5) { - CommonWebViewActivity.start(context, it[i].resourceContent) - } else { - dialogManager.showProgressDialog(mContext) - homeViewModel.getResourceJumpInfo(it[i].id) - } - } } } @@ -137,11 +98,6 @@ class RecommendFragment : BaseFragment(), } } - mBinding.tvMore.setOnClickListener { - (parentFragment as HomeFragment).onItemSelect(1, null) - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_ZXTJ_ROOM_MORE_CLICK, ResUtil.getString(R.string.home_fragment_recommendfragment_04)) - } } private fun initRefreshView() { @@ -151,68 +107,63 @@ class RecommendFragment : BaseFragment(), } mBinding.refreshLayout.isEnableLoadmore = false mBinding.refreshLayout.isEnableOverScrollBounce = false - val themeColor = requireContext().resources.getColor(R.color.color_666666) - mBinding.refreshHeader.lastUpdateText.setTextColor(themeColor) - mBinding.refreshHeader.titleText.setTextColor(themeColor) - mBinding.refreshHeader.setBackgroundColor(Color.TRANSPARENT) - val progressDrawable = ProgressDrawable() - progressDrawable.setColor(themeColor) - mBinding.refreshHeader.progressView.setImageDrawable(progressDrawable) } - private fun initTitleTab() { - val tagList = InitialModel.get().cacheInitInfo?.homeTabList.let { - if (it?.size == 2) it else arrayListOf( ResUtil.getString(R.string.home_fragment_recommendfragment_05),ResUtil.getString(R.string.home_fragment_recommendfragment_06)) - } - mFragmentsBottom.add(HomePlayFragment.newInstance()) - mFragmentsBottom.add(RoomHotFragment.newInstance()) - if (tagList[0] != ResUtil.getString(R.string.home_fragment_recommendfragment_07)) { - mFragmentsBottom.reverse() - } - val commonNavigator = CommonNavigator(context) - commonNavigator.setTitleWrapContent(true) - val magicIndicatorAdapter = MainMagicIndicatorAdapter(context, tagList) - magicIndicatorAdapter.textSize = 16 - magicIndicatorAdapter.setOnItemSelectListener(this) - commonNavigator.adapter = magicIndicatorAdapter - mBinding.magicIndicator.navigator = commonNavigator - commonNavigator.titleContainer.showDividers = LinearLayout.SHOW_DIVIDER_MIDDLE - mBinding.viewPager.offscreenPageLimit = 5 - mBinding.viewPager.adapter = - RoomVPAdapter(childFragmentManager, mFragmentsBottom) - ViewPagerHelper.bind(mBinding.magicIndicator, mBinding.viewPager) - } - - private fun initSingleAnchor() { - singleAnchorAdapter = HomeSingleAnchorAdapter() - mBinding.rvSingleAnchor.adapter = singleAnchorAdapter - val layoutManager = - LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) - mBinding.rvSingleAnchor.layoutManager = layoutManager - homeViewModel.singleAnchorHomeLiveData.observe(this) { - if (it.data.isNullOrEmpty()) { - mBinding.llSingleAnchor.visibility = View.GONE - mBinding.rvSingleAnchor.visibility = View.GONE - } else { - mBinding.llSingleAnchor.visibility = View.VISIBLE - mBinding.rvSingleAnchor.visibility = View.VISIBLE + private fun initChatTab() { + charAdapter = HomeChatAdapter() + charAdapter.onItemClickListener = + BaseQuickAdapter.OnItemClickListener { _: BaseQuickAdapter<*, *>?, _: View?, position: Int -> + val homePlayInfo: HomeRoomInfo? = charAdapter.getItem(position) + if (homePlayInfo != null) { + StatisticManager.Instance().onEvent( + StatisticsProtocol.EVENT_KH_ROOM_SUCCESS, + ResUtil.getString(R.string.home_fragment_homeplayfragment_02) + ) + AVRoomActivity.startForFromType( + mContext, + homePlayInfo.uid, + AVRoomActivity.FROM_TYPE_RECOMMEND + ) + } } - singleAnchorAdapter.setNewData(it.data) + mBinding.mRecyclerChat.adapter = charAdapter + mBinding.mLiCreateRoom.setOnClickListener { + OpenRoomHelper.openRoom(context as BaseActivity?) } - mBinding.llSingleAnchor.setOnClickListener { - (parentFragment as HomeFragment).onItemSelect(2, null) - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_RQZB_ROOM_MORE_CLICK, ResUtil.getString(R.string.home_fragment_recommendfragment_08)) + homeViewModel.homePlayInfoData.observe(this) { + it?.let { + if (it.isNotEmpty()) { + mBinding.mLiCreateRoom.visibility = View.GONE + mBinding.mRecyclerChat.visibility = View.VISIBLE + charAdapter.setNewData(it) + } else { + mBinding.mLiCreateRoom.visibility = View.VISIBLE + mBinding.mRecyclerChat.visibility = View.GONE + } + } } } - override fun onItemSelect(position: Int, view: TextView?) { - if (mFragmentsBottom.isEmpty()) { - return + private fun initHotRoomTab() { + roomHotAdapter = HomeHotAdapter() + roomHotAdapter.onItemClickListener = + BaseQuickAdapter.OnItemClickListener { _: BaseQuickAdapter<*, *>?, _: View?, position: Int -> + val homePlayInfo: HomeRoomInfo? = roomHotAdapter.getItem(position) + if (homePlayInfo != null) { + AVRoomActivity.start(mContext, homePlayInfo.uid) + StatisticManager.Instance() + .onEvent( + StatisticsProtocol.EVENT_RM_ROOM_SUCCESS, + ResUtil.getString(R.string.home_adapter_roomhotadapter_01) + ) + } + } + mBinding.mRecyclerRoom.adapter = roomHotAdapter + homeViewModel.homeHotRoomLiveData.observe(this) { + it?.let { + roomHotAdapter.setNewData(it) + } } - mBinding.viewPager.currentItem = position - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_TJ_TABEXCHANGE, ResUtil.getString(R.string.home_fragment_recommendfragment_09)) } @Subscribe(threadMode = ThreadMode.MAIN) @@ -226,6 +177,8 @@ class RecommendFragment : BaseFragment(), homeViewModel.getBannerInfo() homeViewModel.getHomeResource() homeViewModel.getHomeSingleAnchorList() + homeViewModel.getHomePlayV2() + homeViewModel.getHotRoom() } diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java index 39881e663..65177df76 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java @@ -611,8 +611,8 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi int charmLevelIndex = privacyAgreementDescTip.indexOf(charmLevel); - ss.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getContext(), R.color.appColor)), experLevelIndex, experLevelIndex + experLevel.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); - ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(getContext(), R.color.appColor)) { + ss.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getContext(), R.color.color_9168FA)), experLevelIndex, experLevelIndex + experLevel.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); + ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(getContext(), R.color.color_9168FA)) { @Override public void onClick(@NonNull View widget) { if (widget instanceof TextView) @@ -621,8 +621,8 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi CommonWebViewActivity.start(getContext(), UriProvider.getUserLevelUrl()); } }, experLevelIndex, experLevelIndex + experLevel.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); - ss.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getContext(), R.color.appColor)), charmLevelIndex, charmLevelIndex + charmLevel.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); - ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(getContext(), R.color.appColor)) { + ss.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getContext(), R.color.color_9168FA)), charmLevelIndex, charmLevelIndex + charmLevel.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); + ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(getContext(), R.color.color_9168FA)) { @Override public void onClick(@NonNull View widget) { if (widget instanceof TextView) diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java index bcee7ac1a..f54dc83e1 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java @@ -591,7 +591,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene currentGiftInfoList = GiftModel.get().getKnapList(); } else if (position == GiftIndicator.TYPE_NOBLE) { currentGiftInfoList = nobleGiftInfos; - ivOpenNoble.setVisibility(View.VISIBLE); + ivOpenNoble.setVisibility(View.GONE); } else if (position == GiftIndicator.TYPE_NORMAL) { currentGiftInfoList = getNormalGiftInfos(); } else if (position == GiftIndicator.TYPE_LUCKY) { diff --git a/app/src/main/res/drawable-xhdpi/bg_home_chat_man.webp b/app/src/main/res/drawable-xhdpi/bg_home_chat_man.webp new file mode 100644 index 000000000..ee18b1e9a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_home_chat_man.webp differ diff --git a/app/src/main/res/drawable-xhdpi/bg_home_chat_women.webp b/app/src/main/res/drawable-xhdpi/bg_home_chat_women.webp new file mode 100644 index 000000000..0273eb9b4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_home_chat_women.webp differ diff --git a/app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.png b/app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.png deleted file mode 100644 index 508766469..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.webp b/app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.webp new file mode 100644 index 000000000..f1ad67be6 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.webp differ diff --git a/app/src/main/res/drawable-xhdpi/ic_home_chat_add.webp b/app/src/main/res/drawable-xhdpi/ic_home_chat_add.webp new file mode 100644 index 000000000..f39ed06f8 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_home_chat_add.webp differ diff --git a/app/src/main/res/drawable-xhdpi/ic_home_hot_hot.png b/app/src/main/res/drawable-xhdpi/ic_home_hot_hot.png deleted file mode 100644 index bb35f2b04..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_home_hot_hot.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_home_hot_hot.webp b/app/src/main/res/drawable-xhdpi/ic_home_hot_hot.webp new file mode 100644 index 000000000..009a3f1c1 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_home_hot_hot.webp differ diff --git a/app/src/main/res/drawable/bg_ffffff_14.xml b/app/src/main/res/drawable/bg_ffffff_14.xml new file mode 100644 index 000000000..60792ac6b --- /dev/null +++ b/app/src/main/res/drawable/bg_ffffff_14.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_home_chat.xml b/app/src/main/res/drawable/bg_home_chat.xml new file mode 100644 index 000000000..b38108c4c --- /dev/null +++ b/app/src/main/res/drawable/bg_home_chat.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_p2p_message.xml b/app/src/main/res/layout/activity_p2p_message.xml index 24fd8514b..25fca9dd9 100644 --- a/app/src/main/res/layout/activity_p2p_message.xml +++ b/app/src/main/res/layout/activity_p2p_message.xml @@ -29,41 +29,23 @@ - - - - - - - + android:layout_gravity="center_vertical" + android:ellipsize="end" + android:maxWidth="214dp" + android:maxLines="1" + android:singleLine="true" + android:textAppearance="@style/Toolbar.TitleText" + android:textColor="@color/text_title_color" + android:visibility="gone" + tools:text="@string/layout_activity_p2p_message_01" + tools:visibility="visible" /> - + + + + + + + diff --git a/app/src/main/res/layout/dialog_bottom_face.xml b/app/src/main/res/layout/dialog_bottom_face.xml index 2e94da958..9d0776d39 100644 --- a/app/src/main/res/layout/dialog_bottom_face.xml +++ b/app/src/main/res/layout/dialog_bottom_face.xml @@ -38,6 +38,7 @@ android:layout_gravity="center_vertical" android:layout_marginLeft="25dp" android:gravity="center_vertical" + android:visibility="gone" android:text="@string/layout_dialog_bottom_face_02" android:textColor="@color/bg_gift_tab_color_selector" android:textSize="14dp" /> @@ -69,6 +70,6 @@ android:layout_marginEnd="15dp" android:scaleType="fitCenter" android:src="@drawable/ic_vip_gift_dialog" - android:visibility="visible" /> + android:visibility="gone" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_recommend.xml b/app/src/main/res/layout/fragment_recommend.xml index f62e9a334..ef732d333 100644 --- a/app/src/main/res/layout/fragment_recommend.xml +++ b/app/src/main/res/layout/fragment_recommend.xml @@ -18,228 +18,123 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:layout_height="wrap_content"> - - - + android:orientation="vertical"> - + android:layout_marginStart="@dimen/dp_15" + android:layout_marginEnd="@dimen/dp_15"> - + + + + + + + + + + + + + android:layout_height="wrap_content"/> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_marginTop="@dimen/dp_12" + android:orientation="horizontal" + android:overScrollMode="never" + android:paddingStart="0dp" + android:paddingEnd="@dimen/dp_15" + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - + - + - + - - - - + diff --git a/app/src/main/res/layout/item_home_chat.xml b/app/src/main/res/layout/item_home_chat.xml new file mode 100644 index 000000000..9027545c1 --- /dev/null +++ b/app/src/main/res/layout/item_home_chat.xml @@ -0,0 +1,30 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_room_common.xml b/app/src/main/res/layout/item_room_common.xml index de86913da..99093ed9b 100644 --- a/app/src/main/res/layout/item_room_common.xml +++ b/app/src/main/res/layout/item_room_common.xml @@ -4,28 +4,31 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="12dp" - android:layout_marginTop="5dp" - android:layout_marginEnd="10dp"> + android:layout_marginTop="6dp" + android:layout_marginEnd="@dimen/dp_15" + android:clipChildren="false" + android:clipToPadding="false" + android:paddingStart="@dimen/dp_36" + android:paddingEnd="0dp"> - - - - @@ -74,9 +67,9 @@ android:id="@+id/iv_room_tag" android:layout_width="wrap_content" android:layout_height="14dp" - android:layout_marginTop="11dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="@id/tv_room_title" + android:layout_marginStart="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_10" + app:layout_constraintStart_toEndOf="@id/iv_room_image" app:layout_constraintTop_toBottomOf="@id/tv_room_title" tools:src="@drawable/tag_101" /> @@ -84,11 +77,13 @@ android:id="@+id/tv_id" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="6dp" + android:layout_marginStart="@dimen/dp_10" + android:layout_marginTop="10dp" + android:includeFontPadding="false" android:textColor="#66333333" android:textSize="12sp" - app:layout_constraintBottom_toBottomOf="@id/iv_room_tag" app:layout_constraintStart_toEndOf="@id/iv_room_tag" + app:layout_constraintTop_toBottomOf="@id/tv_room_title" tools:text="ID:1234" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cd4ca8546..754ecf7e2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4898,5 +4898,8 @@ emoji第二個字節: 暫未加入公會 搜索昵稱/ID/房間 + 擴列聊天 + 房間派對 + 快來創建房間一起開黑吧~ \ No newline at end of file diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java index f98361001..9484acfc8 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java @@ -105,7 +105,7 @@ public class XChatConstants { /** * 友盟統計 key */ - public static final String UMENG_APP_KEY = "5ff6bc27adb42d5826a1cb97";//已更改 + public static final String UMENG_APP_KEY = "634d1fbf88ccdf4b7e4bcb0e";//已更改 /** * linkedMe key diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.kt index 370ab7cd5..9408a5801 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.kt +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.kt @@ -182,6 +182,10 @@ object HomeModel : BaseModel() { api.requestAnchorInfo() } + suspend fun getHomePlayV2(): List? = + launchRequest { + api.apiHomePlayV2() + } private interface Api { /** @@ -381,6 +385,15 @@ object HomeModel : BaseModel() { */ @GET("user/get/userCard") suspend fun requestAnchorInfo(): ServiceResult + + /** + * 首页聊天交友 + * + * @return - + */ + @GET("/home/playV2") + suspend fun apiHomePlayV2(): ServiceResult> + } } \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java index da3823200..75804c6b1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java @@ -417,7 +417,7 @@ public class AuthModel extends BaseModel implements IAuthModel { public void onComplete(Platform platform, int i, HashMap hashMap) { if (i == Platform.ACTION_USER_INFOR) { String openid = platform.getDb().getUserId(); - String unionid = platform.getDb().getUserId(); + String unionid = platform.getDb().get("unionid"); Logger.i("openid:" + openid + " unionid:" + unionid + platform.getDb().getUserIcon()); thirdUserInfo = new ThirdUserInfo(); @@ -447,7 +447,7 @@ public class AuthModel extends BaseModel implements IAuthModel { }) .flatMap(platform -> { String openid = platform.getDb().getUserId(); - String unionid = platform.getDb().get("unionid"); + String unionid = platform.getDb().getUserId(); String avatar = thirdUserInfo.getUserIcon(); if (avatar != null && avatar.equals("null")) { avatar = null; @@ -487,7 +487,7 @@ public class AuthModel extends BaseModel implements IAuthModel { public void onComplete(Platform platform, int i, HashMap hashMap) { if (i == Platform.ACTION_USER_INFOR) { String openid = platform.getDb().getUserId(); - String unionid = platform.getDb().getUserId(); + String unionid = platform.getDb().get("unionid"); Logger.i("openid:" + openid + " unionid:" + unionid + platform.getDb().getUserIcon()); thirdUserInfo = new ThirdUserInfo(); @@ -518,7 +518,7 @@ public class AuthModel extends BaseModel implements IAuthModel { }) .flatMap(platform -> { String openid = platform.getDb().getUserId(); - String unionid = platform.getDb().get("unionid"); + String unionid = platform.getDb().getUserId(); String avatar = thirdUserInfo.getUserIcon(); if (avatar != null && avatar.equals("null")) { avatar = null; diff --git a/gradle.properties b/gradle.properties index ee0dffcd9..bba8b643d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,5 +24,5 @@ only_arm64=false channel_file=channel.txt -version_name=1.0.2 -version_code=102 \ No newline at end of file +version_name=1.0.3 +version_code=103 \ No newline at end of file diff --git a/nim_uikit/res/drawable-xhdpi/nim_message_input_emotion_pressed.png b/nim_uikit/res/drawable-xhdpi/nim_message_input_emotion_pressed.png deleted file mode 100644 index ff5c90c1f..000000000 Binary files a/nim_uikit/res/drawable-xhdpi/nim_message_input_emotion_pressed.png and /dev/null differ diff --git a/nim_uikit/res/drawable-xhdpi/nim_message_input_emotion_pressed.webp b/nim_uikit/res/drawable-xhdpi/nim_message_input_emotion_pressed.webp new file mode 100644 index 000000000..6dd9d6504 Binary files /dev/null and b/nim_uikit/res/drawable-xhdpi/nim_message_input_emotion_pressed.webp differ diff --git a/nim_uikit/res/drawable-xhdpi/nim_message_input_plus.png b/nim_uikit/res/drawable-xhdpi/nim_message_input_plus.png deleted file mode 100644 index 7a5561f50..000000000 Binary files a/nim_uikit/res/drawable-xhdpi/nim_message_input_plus.png and /dev/null differ diff --git a/nim_uikit/res/drawable-xhdpi/nim_message_input_plus.webp b/nim_uikit/res/drawable-xhdpi/nim_message_input_plus.webp new file mode 100644 index 000000000..da0dc0753 Binary files /dev/null and b/nim_uikit/res/drawable-xhdpi/nim_message_input_plus.webp differ diff --git a/nim_uikit/res/drawable-xhdpi/nim_message_input_voice_pressed.png b/nim_uikit/res/drawable-xhdpi/nim_message_input_voice_pressed.png deleted file mode 100644 index c8710118e..000000000 Binary files a/nim_uikit/res/drawable-xhdpi/nim_message_input_voice_pressed.png and /dev/null differ diff --git a/nim_uikit/res/drawable-xhdpi/nim_message_input_voice_pressed.webp b/nim_uikit/res/drawable-xhdpi/nim_message_input_voice_pressed.webp new file mode 100644 index 000000000..2394754f3 Binary files /dev/null and b/nim_uikit/res/drawable-xhdpi/nim_message_input_voice_pressed.webp differ diff --git a/nim_uikit/res/drawable/nim_message_button_bottom_emoji_selector.xml b/nim_uikit/res/drawable/nim_message_button_bottom_emoji_selector.xml index a4436d1c5..3cb0ed31d 100644 --- a/nim_uikit/res/drawable/nim_message_button_bottom_emoji_selector.xml +++ b/nim_uikit/res/drawable/nim_message_button_bottom_emoji_selector.xml @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/nim_uikit/res/layout/nim_message_activity_text_layout.xml b/nim_uikit/res/layout/nim_message_activity_text_layout.xml index 6d2873742..70344244a 100644 --- a/nim_uikit/res/layout/nim_message_activity_text_layout.xml +++ b/nim_uikit/res/layout/nim_message_activity_text_layout.xml @@ -72,7 +72,7 @@ android:paddingStart="@dimen/dp_10" android:paddingEnd="10dp" android:textColor="@color/color_C6C6E9" - android:textColorHint="@color/text_hint_555574" + android:textColorHint="@color/color_b3b3b3" android:textCursorDrawable="@null" android:textSize="13sp" />