From 989853b4e485d3784818a4f6a3e9a124559fbbb4 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Mon, 17 Oct 2022 20:42:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A0=81ui=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=BE=A9=E6=B8=AC=E8=A9=A6=E6=8F=90=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yizhuan/erban/home/HomeViewModel.kt | 27 ++ .../erban/home/adapter/HomeChatAdapter.kt | 31 ++ .../erban/home/adapter/HomeHotAdapter.kt | 43 +++ .../erban/home/adapter/RoomCommonAdapter.kt | 2 +- .../erban/home/fragment/RecommendFragment.kt | 177 ++++------ .../erban/ui/im/fragment/MessageFragment.java | 8 +- .../yizhuan/erban/ui/widget/GiftDialog.java | 2 +- .../res/drawable-xhdpi/bg_home_chat_man.webp | Bin 0 -> 9532 bytes .../drawable-xhdpi/bg_home_chat_women.webp | Bin 0 -> 9878 bytes .../ic_chat_navigation_attention.png | Bin 1614 -> 0 bytes .../ic_chat_navigation_attention.webp | Bin 0 -> 2900 bytes .../res/drawable-xhdpi/ic_home_chat_add.webp | Bin 0 -> 8000 bytes .../res/drawable-xhdpi/ic_home_hot_hot.png | Bin 1367 -> 0 bytes .../res/drawable-xhdpi/ic_home_hot_hot.webp | Bin 0 -> 1008 bytes app/src/main/res/drawable/bg_ffffff_14.xml | 9 + app/src/main/res/drawable/bg_home_chat.xml | 14 + .../main/res/layout/activity_p2p_message.xml | 90 +++--- .../main/res/layout/dialog_bottom_face.xml | 3 +- .../main/res/layout/fragment_recommend.xml | 305 ++++++------------ app/src/main/res/layout/item_home_chat.xml | 30 ++ app/src/main/res/layout/item_room_common.xml | 59 ++-- app/src/main/res/values/strings.xml | 3 + .../XChatConstants.java | 2 +- .../home/model/HomeModel.kt | 13 + .../xchat_android_core/auth/AuthModel.java | 8 +- gradle.properties | 4 +- .../nim_message_input_emotion_pressed.png | Bin 2768 -> 0 bytes .../nim_message_input_emotion_pressed.webp | Bin 0 -> 1270 bytes .../drawable-xhdpi/nim_message_input_plus.png | Bin 2052 -> 0 bytes .../nim_message_input_plus.webp | Bin 0 -> 1224 bytes .../nim_message_input_voice_pressed.png | Bin 2945 -> 0 bytes .../nim_message_input_voice_pressed.webp | Bin 0 -> 1352 bytes ...m_message_button_bottom_emoji_selector.xml | 2 +- .../nim_message_activity_text_layout.xml | 2 +- 34 files changed, 426 insertions(+), 408 deletions(-) create mode 100644 app/src/main/java/com/yizhuan/erban/home/adapter/HomeChatAdapter.kt create mode 100644 app/src/main/java/com/yizhuan/erban/home/adapter/HomeHotAdapter.kt create mode 100644 app/src/main/res/drawable-xhdpi/bg_home_chat_man.webp create mode 100644 app/src/main/res/drawable-xhdpi/bg_home_chat_women.webp delete mode 100644 app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.webp create mode 100644 app/src/main/res/drawable-xhdpi/ic_home_chat_add.webp delete mode 100644 app/src/main/res/drawable-xhdpi/ic_home_hot_hot.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_home_hot_hot.webp create mode 100644 app/src/main/res/drawable/bg_ffffff_14.xml create mode 100644 app/src/main/res/drawable/bg_home_chat.xml create mode 100644 app/src/main/res/layout/item_home_chat.xml delete mode 100644 nim_uikit/res/drawable-xhdpi/nim_message_input_emotion_pressed.png create mode 100644 nim_uikit/res/drawable-xhdpi/nim_message_input_emotion_pressed.webp delete mode 100644 nim_uikit/res/drawable-xhdpi/nim_message_input_plus.png create mode 100644 nim_uikit/res/drawable-xhdpi/nim_message_input_plus.webp delete mode 100644 nim_uikit/res/drawable-xhdpi/nim_message_input_voice_pressed.png create mode 100644 nim_uikit/res/drawable-xhdpi/nim_message_input_voice_pressed.webp 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 0000000000000000000000000000000000000000..ee18b1e9af554b0c03a853f614a4e5924358025b GIT binary patch literal 9532 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0273eb9b45614ef55b0fcda5363caad8a6bc707e GIT binary patch literal 9878 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 literal 0 HcmV?d00001 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 50876646996c345b47c30a74d5ac321708ace055..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1614 zcmV-U2C?~xP)=ZP};lOc6Vt28xR{41r_ODS{ub`kw=1Je3S%GiHUqcVxr%S@sVgX zK4MIK5lD<8!UqT>_-NYQEk4l12P)8j(A}2q-6D;&#eK{%_qA?o+g)2VnmC_2J2U6} z=6}x2nOnlYtkJ)W2mcKq28(cI-)d51GqJdqfl2^_0G$M7!jkD=afN#5nlC9emcpU( z-g&}JE0`$=AV8pE5aI;>ObW3}J5zRaw6%XwC{%f_ij?%bV6ik$IC}-~;;$w0<%Xl) z3&vaqQ`ncdO$a>9Om)DR5nw>>#B_Q{JLdT%*UvDZjzGLxLWIDmC^)wWJpgZ$5eG!eg)rp$Kf8ako4rd>)GT{R@R zkx1OjKwyMd9-&B*hz}BQAf?FfkfI@is1n2*0b2Dt0Dl~dsg3JE8RNGsP}m=T3J{N) z6A6P7+*B9!w2ijaBa7LcjO)!T#p9!ZB?OKntr zB@5I#zgu+=PB{Zck@2GfesF2b^IAUL4ON+^J;8)U02hJr3rY9=!Jb*C^Q|2w04O17 zu&OpXd&pEM;@7t_sKqw&MKD&jgg{0J3TnH+if=)pICxCGQ0Te?)hDLTxLEoN^SMxn^=P7S?vFKmHRyVV}MLM2@fHT1;Kw zoU;84T49n3xiQ$~efzHh3RNX;B8d-(>9kao`ekQIes*lz_t6_xpZ94o&ngqB!>4bP zM9*5M47-Cd^^U&^DB{;YV$hAIOYq8NG0%R-cEq1}pMl#gzx;48=6T)(3i_%kmGNC4FE>s!+Eu+$Or@UyOtDybq1Np=mMtBT zfZk?TXn^H2TDR9KBa>(mzrKS(&DJU6gId(nl%vj*3_NC!g|w*0cpdy+%i4X3HG;6$ zK7vCTNek+`%ep4Y6Ar|iz`_WRwP_*iv@UPR_%p2PK1`z%U=$mDNtxU0qU9e912Wz+ zkwD@wn3gy@3P#lxg_eR`@b=2yMj@2<0bFV)>@F?lxihOyK;O$uYs^0Lkzluao#SWN zd#JstHz+bnyB+gveJNC>P?f$|Fg?T)>m3^ax&*nes*TP(XXR_6nSdR(P0k2;Lw%Rm z@M#BUgtv%aZ(-0@dvqX!^wRoh#kcvOLbLU|NYXpQ<`H6<43^jTs6QCLw*}5#>4Gc7 zjG2~w`HB|xZpmHqhbOH0P~#$_zFclk?36{R+Pcn4eLSdP8?l@n!bRGkB|P0mx4pW@ zBZk}^0IF>}#|P5sMI)=is9zmzm5GHe1&6ac0evltlFP?~YW4R8+>k9s3CMunsEewf zI~!=7^K*$inf?$&*O;t?evr_DU8UcR+~k;_L7~d{Ekt4;2rfG@zj3AH&CWfNFNDr` zsOtPIN~aDvFaReG3^WmEg{=7>D4$Bd0g;4mLv#lcHUIzs M07*qoM6N<$g6InXlK=n! 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 0000000000000000000000000000000000000000..f1ad67be63d3438559eed3a0d382e7b1cadab8f1 GIT binary patch literal 2900 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f39ed06f8b44678d3e5aee383f92d448e67831f1 GIT binary patch literal 8000 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 literal 0 HcmV?d00001 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 bb35f2b04f3f9b9cd9d1a5a2cebf09eb859af439..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1367 zcmV-d1*rOoP)Px)5lKWrR9HvFmTQPrRTRhnYwvyU%zaJfV49H-DSnXZgJK$eNNL8R#O8x0J*N~? zw0w|RS=qx6DN>DElM~J)f`pPL6<&u*5y=!1{Zx?@K~GVex$pDXd&N3e2McxPj*|Ow zFZbMY?q0w3U;nkvAzbA}S2;dv1_*aQG@DFpoW5_%%U1%vW&qyRI>hSW6ep5db1k*d zgpS~HKxzh%V0OMN5%K`{LnYk07mT2%;2l72ou>_P$fbWAPU@{3L z6F@8mXkCpbDumW4_Que|U;K0-h<+8YJ6o1B)LKxr<|K|Um4QMYC>HwwkWPaeGN5=J zV5$IY#Ul>ng2lRZ-};&Xc-uXbt%)CiQiep*Fa&uOP@w?i&jLsZB;!mPoM`|O_0?lZ zO^j$64Blww9(cNDfM9F$_oU6(YW89}$-V>>1)u=P_b>#E0Vh)t1X4*cBLtX3=@0?H zA+zYn9W?=P$DL2wSbTF7oEhZ8NN$q4=Zk=-Q1L|Q0LCaJ6B_9hkPshez%dYY35z0s zsAb1T)&vl4oOBpkO^h;kHX1q<29fhoC|0xg0!Av;jF@Tw(Z`Vqr5lt2WB^m zAOM)aiIi1u{&tpZpa8Gj6i_Z_O)pEeXW)dUd9Iyat0#h(_*+UFKxTvI=aHk5xoe?$9h<1>^mw~=%SOXR9$ z5Hmf9h1XFBF8K6($x+OUk|U8XABE-NeZh<>(T6Ve-)!89>$B+1Pm2bXC{SIDxSma& zcKe00m*4um7w{ZRM1Zg0Pz`FdMaHIR1EfEzQC2qIz?As~r_X4TDJcL1A8{<8&FH*X z@Bslt0Ty5^%2)$S_j6sn=2YD(-PZH^xsC1WG3}^?^Xc>{P^stvt`i!osT03nD)@i_ z`Z8_B5Txr{Typ3rJ$(bU=hK^z`$St#L8gg>FgXJ!35+oFiC(&7NAsaUP)1qyOTmh zWRwC(38p847`yH48j)}7`UQg4n^oi#03t&DggD!0R5Q{ zgy{@945m49N_7K$a0Okr*en^!5aoqm-<3?eY??6!KK5O~%^~)7@ z?B2b*+xn6X5U?CPd-kmFor%xBefws{p{K8}|G3X2{Caq}V?kkEonZMAOKWRu?xv$f zJA14zoq7JbQs7M5<;Xh|(@bReniFhh_5hXtjax6y(tI#MpnOTD>Fl)%FUoe`-J$He zHf}weu+uEe+D-km_|)e&-RaA;RSturfpo=$N;cC%;wDn11@{4&}42o*l~) o5a~Xebm!yu-?Ps@|9ta(z25ZGsp+p@RA^gkzkaR#|Ji>Q0IAyyg8%>k literal 0 HcmV?d00001 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 ff5c90c1f0334df35403796dfaa4ae3984290d6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 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 0000000000000000000000000000000000000000..6dd9d6504649a9da62b21f9cbd624dce388a3f6c GIT binary patch literal 1270 zcmWIYbaQ*h!oU#j>J$(bU=hK^z`$St#D-wx>FgXJ!35+oFiC(&7NAsaUP)1qyOTmh zWRwC(34~0|Rd)1B37d1_rKZm_reI5pjXTuL?jtGC+Uk z17SKt4nrz~0)r<*9z!yN9*|`OOeBU3X22BVvmTf}^bH+&1oRK>$i3}Q!u+N5{O$Tn zN^#8-Z*NO{!S*8a_}~9aUC*4zy=?%L-17L}|4T|`S3D*ut6SfCH}g8<4hM!`|Np0# z@BRMk_r5!^@AuA|dA&OS{oY$?(YeBD%O>P*)!p-P?#!I*a`Tg0Wi6f`d1v*U<-u(+ zh6j^!Zr4xBsMhdcy1Gq)Q)E@H+Rv@I9zhq%KKKeXu<!SPMaOfS@9k6Bx3}f~ zKKF0?%VW2y-)@z!SN`?>K<;f1u4Uh!=E-VfF-{$3fT~P4s)Yl8eGM}w&dh<4+bkX|FoAZ;tKG@5Z zvdluaMlHhsb*!aEth7Jp>E}+FdnbLXo^|2NoA7-zH;HC`$==Cw;ZwMjjF#mKtED$L zd7rOcdY0>4r2q7FSGremUam4ujJwqJ>G*B`nv5kE!mKoQM?X$`IcKe!&i9x5ay7P2 z?6~Ff>kH4;@A7pO66X|Gd{hivaZuJw`O$*5hf0r>+83}rQ&2MdTsGtO(#N)sY=Qh7 zT_wKHWzvGeZ*z>4@;-l)60ChIRV(;$*7hUIpfjLRHa(fUoW_OsZ>Yf z+sm_eufF?>e_K#scaZC>?4=$@S8WfOG;P(Y@KtLv9XD@!7dmxo%-+kE(!8(!Muff( q6I2R(0SxKwn>Uvy=?W{>Ig9+_o%rs$`(=B>BxY=}`TwT84g&ykh@GDR literal 0 HcmV?d00001 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 7a5561f50fbc7783aa8d5b6ccea8c48cb43b8a75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2052 zcmV+f2>bVmP)XH+8$+?arH> zc_m%%KfB4?d(QdYuXFA>zei|8OQ+MZO65~uC!$3jFprqO0HTWkoC9EHpz=ciA29F^ zG4@M=mo&+HVzKxCS|}7Mtu~8VB~aIII!96^4aq$qx&pwNP0Bt3=G_o9FxFl=!s15+ECX;xAYB4@0l;1Xyg-D15YgM3#)k?8>m$`Coi=B99-YU` z7cyhM1ik{`8>syift-&S*wI1qZrk4a(o_I94OG|HeojK$3~*0i7=y7}5I@@4*I~U9FB7lIeROsGXr~lmHD0c(*vt);F4w8ycuOe@DGJHm^0bWvS`Kgwz{gD3)ZKCL*J00bD46nin#7Gl;JBe`7o^JG^CKCbnUq$yC;0$qxfK3&86Fw8n9Ae{3hf zv9fhN`%MYHAHZAyhe25B+E%d<8yW(dOqnK2+zUVh!xj`<Mg@%XyAq)8Q1 zo+&`zirP<3bwUF_`v(9=*b|qQ%UfQr%RC;aZvKvd>lk>f>{!=NRq=S^B3jSP z_m)ffpR`&>Jiq|v$K6u?x)Xo~;oaZCs1h)*RI=V~wGm2QLN`bJzynlqom^L|b=1N| zybMB2Bl@Ck=U!Gij;&~1Hyy zEe>mZnEp`!^)V&Qr$JZ@;u~B$|JxeSq`3=(B_Q;=wxwPNZEH~hO{TIpvgG^0{Cl^Q zUqb33JzSlw@-k;=B+s|)t?#uBW$iL*`x#aC8^+o>9*cjf$9i>GJC_ov>|#iM8o)l+ zu@29SAkh!+D3__`DYLoYJ@9n+xk;mQAT)1Yv!R_w{BM_ zX4dN>jaX7!QGN=b&o|P4>V5b%NLmtRMUUUQ)8;aoF7BlsFc9&olATvM(zdoJZ{4Jk zS;{D5KFgn-i~sGl~^G(Y%FW}X7kw@J{NQZe^HI}d48XY_=JcP+{{*MKnq#xrio zy7F`Y`oC04Eo-J>7L>})0W4J@pE-4oK-)YqNF#XyM zbW{SnOC!0UPTLtW1m5OrMl=k55-+3<`>^IkgnI>HxrLpIapOCa0KJkMpVH?bz#bA9ifO}z zLgB%Gg;}|Y`c8R8#}n))+`Ksph2(`2m=EUpOmqPOvjEHp#(czpdift@U_TRH6hwQw iwDJ$(bU=hK^z`$St#D-wx>FgXJ!35+oFiC(&7NAsaUP)1qyOTmh zWRwC(34~0|Rd)1B37d1_rKZm_reI5pjXTuL?jtGC+Uk z17SKt4nrz~0)r<*9z!yN9*|`OOeBU3X22BV(*#T(`i2fX0_zv5Owo`eN$&ez zbnfDr4|}igEx(eTwrJHV9uL)mmHDBbOMk6UHa0Xqx9C(AS}f*Ay*wlW(n!O??;?9*#Pj_29^Xc8q*M&|*mEWxKkKq3;Y^ov5&fod8cJuc5DVJA@ z&02Z+(dKLAO5yg~su^R*{9A|Z}-{T_phG*)Y@Hlcjm9(LLY-#3n#ebPPD6U>(rX?=UB+k2_ji7 zhZ9}qWJbvzk93i_);Q<6?%^DLrE{+x)+r}d&RFYmq*V4qvCA0|jxhcA?||SE7sK?` ztaD~|RIH2Mv{L1AuJy4zZ!I-p>os3CCB6(iTgARRf9r53mwiyI=Zf7u9 zmzNp8M)yLuzw>6a~2y&5z0n zP0)#n(Ft*QBa(G-wTE=G$ja!i+p125t*qL6Y8LygQ&mA)+54-WTeI_i-KT%GI-t#i mYwlY;|9-d2r>m#(eB_OMA#HT`div%0Gd5z2y94##*tr3*DQY+X literal 0 HcmV?d00001 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 c8710118e5443b002e6fc02da1e6fd41dd1b8292..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2945 zcmV-{3x4#8P)hhnH6+JR%*IuQH-R5s2D3Mp}S{xF;o(@v?}olYBT~0F-9#@3E(R}V^mB^ zqb5cSK4TOGNtF>b54Qwnx@WVB&!mj;1sbM%!R1xVvO9fG>dy4YuLYpB(tp<>w5(lK__s9om}(OJyY3}F8O^4>|rYnXXOp)hKBbMx4a0rJ^n z*`R@@)45}Wpq~IV3&7}ry9DqCATvVX4QBD4?-w?7bwxMNn4#@ZG%YP&eO+B)TqF{m zKqMziiLU`738;S|0zP?wmr2RLN~IF-3RVW;!cSjES%Y;3vDf*y`0A<8^i741m7J40SS;j*^I1Fw2FO)%fv1_=X0m?%$3b<9;foxW4oSsSDsI zh;XNAYVQw3iN4l2jyH)JivYS1;5q<#A>?iK^_%Ysdyhi_4Fo?0;DkWAWrafb!sg~f z)(<7Xp1fLHKbs(BY%w#=4d&JnVOE%ptr=)00SU4fLC^Q*3F$UqhU)e0*0EVWZk=#0(2$- zpNOwCP5rmkCWvqz!2Gi7U?N4sMKwDeg zANoG2-SVa6IjNNX#7KasRYp4PUMK`TqE1>Q!k0~(ra#cv+CG8WwtFT(�$^h%Yrw zeMzkfj3k}oxbvCmcj^g}l4qq-`ikD<_X;$V@xDTYHUI|^;TqG_?ieoRZQHvIz(OLv zd;NOtnwc}n4=c-YysMdu$9NkvPDm!T|McXs7tmF!-rujG;h+qF;{krovUKGT4BN16 zuLZz2lmH^RDjKajf9lkOw}utyIPUVmd0E%dvDG^D)JeN4dF%x=o6TJ-rBJ*4Q7jfc zZXiO#D7j{h`{ig`AC+Trzl>&kJFl(v{hmFDtFQMWB&$FCj=d37;*Lg zVq{Ppw(b2Mz{N!T8`IP;55s&YX)~EkM-oY8@ecs-G4rmYlgSDBFfts+y`PzWL?j$fygvnu? zO|`5m(*)0>`jR_+pBkH*;@gW~)V95g06ePVNz>G(hhbWc*0#N$1Gr8JWyb7eQhT=A znwA!hjvl?~4RwTxuqB_zgmS=MZEbnpalBWVp|H%hEbXxXsQY5c;>r1zl~B>akPX}R zW&(J+96&S63zEr%3ibLO>2&T~Aw-c*2wY(p+WpnmRL*C!xl5!J4-xUprm3GoDv;i` zEw1u1qotIIR4UGCIMn$%BtZAAG zW*$xO8P#HQ4ebvMvB(9J!L)1S;6vhKN9Jl*qa*}L>a|=lMwPc!$|z1f1uvo z%(zNfPs`FmW&g9;Psd4Fw+X;z1ytpNU|Cw#{84WTmDle*C%6Q|GrzenyK#IIgYEU0V;~|ElZ1r zIdMIK7LRUcCk_njW+|cBtapW!P^r+0!GE`kf4jq!c@dNmKp zw%xw~^lgCtX<6}N_*U!K!x#<4^HQr|MOQXnMA&E;@k5D7Ro?o!qn?VY5`cWhvJ$Fd zSM%ucyp$XUBFr^SP31_3ZDca;=|r?r2_TZUn`YwL{y}a$9EcRtA-&~+swwI?-W+B; zTyz*l$^~p~^%A}hWt_$X*iOWgOjCFJQ?~M$Gy6s|+1OeQT;=>8F5pNw^{VC>i$z`m zaEwxcosr|Uxn#%dT!ZbDMIPOc#baE}`K8&!E@o^sj=+ctH{D<}Hwb`{~;~mF+ zmYL30J0m4eN~QD7Vd(d&(pR-L z71v2^&I;4i72r@~cPgcnH7UA%Yu0ROh(^0U12BpiNAy;^2qk3@#44HA-5qNK_$UCo z3I#s8xmj0^dCj9DIo4Sy)E%NaTPo6>?xO%*1jzd>D{)25T!)y@adJzU#oXYi-)frr z4Pix;tt}BhZkoDE{O!)`2CmuLY8QzjlT35mr(p#QmVWnBS2RF&J|CZ6E#1;nW<>&f zKPlz0<+hzYA{N`uEd#{NeNmFIZBM0fejO<877E?d!sdtq!&)q>^z@|md69{kDVz1~ zVpdIA#j%Zun@v+!iLFqh<|32gI?`psbUOE4A;g~oMD0@gr=?Pj{|JQ;K&Y~zVqRGY z9;j&#qhzVp!fAj%D-`(juoku~D|8`PEey=F@=M1IcWFP&ru0QSpwfPsSvu{VEkv=D zAcT1RjuTB#~0$+*C?a6@k6R|J!dW&i)O|bhGj~h2X0VLti|QogeBo z*{r)jN>a^TgKwxRD;LCt_XIsh%k%lVdHb?OZuID`CCqe=I<7+CD#Ot3tG1Cfr#OQK zE0uvLHa$v-*{PJax|)EYoDZCRRj(PIrpMjKxY$3d43sM2F_C-(h}}5c?xN#tJ{0J_ znOV#U+}7c1V=aRX8j}}DDO44^+?f105f%?+OMsH68b|2TVSgA<%SQYUlz6>lJ3uxo00000NkvXXu0mjfteUG8 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 0000000000000000000000000000000000000000..2394754f3bd07e0df28739ca30f59592ce449675 GIT binary patch literal 1352 zcmWIYbaQiHWnc(*bqWXzu!!JdU|=u+VnZ~uAtBC`)Z%2Iq7Oh^QUtV|fq^jv$QDV5 zuq#09BnZ0)#4ZX6at5kd0Ay>VBe9c^*ySY!B|tSNKIgA?khp~qQ(3^k zz~92aup2H^_~3|!GLha&VM;sS?X6@YqVfd0$} z!gPilhExUx22X}OhGYgkAj=4tNDLXwfGNg@k(q%(-_U_a;5y6pi7M_vUxYqB`F#JZ z`rJbn54Yv2cqW~HH!D52Y9#uUPPZqnx01;)h;S=)1GZ(A&Pdt2^pvs2rqPLaHQ?9cAwPx}S`rYm?( z>gl^#8hlLV9xTMM&<%2@95N9`;jI~-XE#G&SiZucE0M)?c2^6y!x%uuT~-}JYW50$Wn30#4o#Nr-VSqIcYUD zB~thJPL*KmS7%jzzcy&I@tep0Zbh!=xoe_R?|Rm~pJlvQUd=LU@>283GVkX6UawYJ zwq%dh@1jZ3hpn@pOkK2M&duE^?~awv6XUSHCEPdT&SIVoAL5*Os~7jJ&Rnx+e*f?A zH(qZoZm#Cp{Il*}{wDoNH8++A?TTA{?b`jYkPYALyp8rbt`|v|&$l9==jO+2+wJR$ za_U$YpZ8uGbWeo;aGh>KT~=hxv3Y)hHsR*;gEnb*-|FEt=UOzI`&P`4V#Y6Do+|oU zOt#mr{B&qan7-|U$3mCCI&ZC;_4V6hp)=~vQEg7^o&CKc`0Z|46<54(e0)vDKDzGF z-MO~6+t2U$>^aHAbkTbCZQW;IeZO75Ic=>J_iC%-pBLDQpQ=99_cI~0-+t*_Kid!Q cX1?~%i~sekwY1(#A6QOefpTCjbBd literal 0 HcmV?d00001 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" />