From d79d273db6ae9bc7cd260e3d46a1bf3a722d153c Mon Sep 17 00:00:00 2001 From: huangjian Date: Thu, 16 Dec 2021 11:31:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=A1=B5UI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/avroom/fragment/GameRoomFragment.kt | 3 +- .../yizhuan/erban/avroom/game/GameDelegate.kt | 47 ++++++++++--------- .../erban/home/fragment/RecommendFragment.kt | 19 ++------ .../main/res/drawable/bg_nim_msg_touch.xml | 4 +- .../res/drawable/shape_7154ee_stroke_1dp.xml | 2 +- .../main/res/layout/fans_list_item_new.xml | 2 +- .../main/res/layout/im_customer_msg_text.xml | 2 +- ...ut_msg_view_holder_lucky_money_receive.xml | 2 +- .../layout/layout_msg_view_holder_match.xml | 2 +- .../layout_msg_view_holder_red_packet.xml | 2 +- .../layout_msg_view_holder_sign_in_notice.xml | 4 +- .../main/res/layout/list_item_friend_new.xml | 2 +- app/src/main/res/layout/newbie_list_item.xml | 2 +- .../im/msgholder/HallMsgViewHolder.java | 16 +------ .../drawable/bg_mini_world_no_data_button.xml | 2 +- .../res/layout/nim_message_item_text.xml | 2 +- .../activity/RoomInviteFansActivity.java | 4 +- .../res/layout/activity_newbie_list.xml | 6 +-- .../res/layout/activity_room_newbie_list.xml | 2 +- nim_uikit/res/drawable/bg_message_input.xml | 2 +- .../res/drawable/bg_nim_water_drop_other.xml | 2 +- .../res/drawable/bg_nim_water_drop_self.xml | 2 +- nim_uikit/res/drawable/nim_bg_message_tip.xml | 2 +- .../nim_recent_contact_sticky_selecter.xml | 6 +-- .../nim_message_activity_bottom_layout.xml | 2 +- .../nim_message_activity_text_layout.xml | 16 +++---- nim_uikit/res/layout/nim_message_item.xml | 2 +- .../layout/nim_message_item_notification.xml | 2 +- .../res/layout/nim_message_item_text.xml | 2 +- nim_uikit/res/layout/nim_message_item_tip.xml | 2 +- nim_uikit/res/values/colors.xml | 11 +++-- .../session/viewholder/MsgViewHolderText.java | 2 +- 32 files changed, 78 insertions(+), 100 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt index e27eef709..e3a315d7a 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt @@ -377,8 +377,7 @@ class GameRoomFragment() : BaseMvpFragment() RoomEvent.DOWN_MIC -> { if (AvRoomDataManager.get().isOwner(roomEvent.account)) { //自己的消息 - gameDelegate.notifySelfPlayingState(false) - gameDelegate.notifySelfInState(false) + gameDelegate.exitGame() } onDownMicro(roomEvent.micPosition) } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt b/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt index 93150b9d1..c4e81ebb7 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt @@ -91,6 +91,30 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: login(loginCallback) } + + fun updateGame(mgId: Long?) { + if (mgId == null || mgId == 0L || mgId == mMGID || iSudFSTAPP == null) return + mMGID = mgId + updateMyMicQueue(GameStatus.STATUS_NOT_JOIN) + loadMG(activity, mUid, mRoomID, APP_CODE, mMGID, mLanguage) + } + + fun exitGame() { + notifySelfPlayingState(false) + notifySelfInState(false) + } + + /** + * 例如"你画我猜"游戏的文字命中 + */ + fun hitTheMark(msg: String) { + mKeyWord?.let { + if (msg.contains(it)) { + notifySelfTextHit(it, msg) + } + } + } + /** * "接入方客户端"登陆接口, 从"接入方服务端"获得Code * "接入方服务端"是通过"服务端接入SDK"获得Code来返回给"接入方客户端"的 @@ -108,13 +132,6 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: } - fun updateGame(mgId: Long?) { - if (mgId == null || mgId == 0L || mgId == mMGID || iSudFSTAPP == null) return - mMGID = mgId - updateMyMicQueue(GameStatus.STATUS_NOT_JOIN) - loadMG(activity, mUid, mRoomID, APP_CODE, mMGID, mLanguage) - } - /** * 1,初始化游戏SDK * @@ -173,16 +190,6 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: SingleToastUtil.showToast(content) } - /** - * 例如"你画我猜"游戏的文字命中 - */ - fun hitTheMark(msg: String) { - mKeyWord?.let { - if (msg.contains(it)) { - notifySelfTextHit(it, msg) - } - } - } /** * 通知"文字命中状态"到游戏端 @@ -515,7 +522,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: } } - fun notifySelfInState(isIn: Boolean, seatIndex: Int = -1) { + private fun notifySelfInState(isIn: Boolean, seatIndex: Int = -1) { try { if (!isIn) { notifySelfReadyState(false) @@ -555,7 +562,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: } } - fun notifySelfPlayingState(isPlaying: Boolean) { + private fun notifySelfPlayingState(isPlaying: Boolean) { try { //状态名称 val state = SudMGPAPPState.APP_COMMON_SELF_PLAYING @@ -639,8 +646,6 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: } fun onDestroy() { - notifySelfPlayingState(false) - notifySelfInState(false) updateMyMicQueue(GameStatus.STATUS_NOT_JOIN) iSudFSTAPP?.destroyMG() } 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 016879881..d0b0990ab 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 @@ -10,6 +10,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import com.scwang.smartrefresh.layout.internal.ProgressDrawable 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 @@ -107,23 +108,9 @@ class RecommendFragment : BaseFragment(), dialogManager.dismissDialog() it?.let { if (it.isPick) { - RecommendRoomDialog.newInstance(it).show(context) + AVRoomActivity.start(context, it.uid) } else { - dialogManager.showOkCancelDialog( - it.failContext, - "新建游戏房间", - "交友畅聊", - true, - object : DialogManager.OkCancelDialogListener { - override fun onOk() { - OpenRoomHelper.openHomePartyRoom(requireActivity() as BaseActivity) - } - - override fun onCancel() { - OpenRoomHelper.openRoom(requireActivity() as BaseActivity) - } - - }) + RecommendRoomDialog.newInstance(it).show(context) } } } diff --git a/app/src/main/res/drawable/bg_nim_msg_touch.xml b/app/src/main/res/drawable/bg_nim_msg_touch.xml index a38aabe2b..e2f51f55a 100644 --- a/app/src/main/res/drawable/bg_nim_msg_touch.xml +++ b/app/src/main/res/drawable/bg_nim_msg_touch.xml @@ -1,6 +1,6 @@ - - + + diff --git a/app/src/main/res/drawable/shape_7154ee_stroke_1dp.xml b/app/src/main/res/drawable/shape_7154ee_stroke_1dp.xml index f8eb9d6e8..04c8bec5b 100644 --- a/app/src/main/res/drawable/shape_7154ee_stroke_1dp.xml +++ b/app/src/main/res/drawable/shape_7154ee_stroke_1dp.xml @@ -2,6 +2,6 @@ \ No newline at end of file diff --git a/app/src/main/res/layout/fans_list_item_new.xml b/app/src/main/res/layout/fans_list_item_new.xml index 0bbfe6108..e3a6e367f 100644 --- a/app/src/main/res/layout/fans_list_item_new.xml +++ b/app/src/main/res/layout/fans_list_item_new.xml @@ -35,7 +35,7 @@ android:layout_marginEnd="2dp" android:ellipsize="end" android:lines="1" - android:textColor="@color/white" + android:textColor="@color/text_title_white" android:textSize="15sp" tools:text="我的我的我的我的我的我的" app:layout_flexShrink="1" diff --git a/app/src/main/res/layout/im_customer_msg_text.xml b/app/src/main/res/layout/im_customer_msg_text.xml index 24b8674a4..b10ddcb04 100644 --- a/app/src/main/res/layout/im_customer_msg_text.xml +++ b/app/src/main/res/layout/im_customer_msg_text.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/tv_msg" - android:textColor="@color/white" + android:textColor="@color/text_title_white" android:textSize="14sp" android:maxWidth="215dp" tools:text="恭喜您,获得抽奖机会,点我抽奖>>" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_msg_view_holder_lucky_money_receive.xml b/app/src/main/res/layout/layout_msg_view_holder_lucky_money_receive.xml index 617d3c9d1..bb4594151 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_lucky_money_receive.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_lucky_money_receive.xml @@ -16,7 +16,7 @@ android:gravity="center" android:layout_gravity="center" tools:text="你领取了一个红包" - android:textColor="@color/white" + android:textColor="@color/text_title_white" android:textSize="@dimen/dp_13" tools:ignore="SpUsage" /> diff --git a/app/src/main/res/layout/layout_msg_view_holder_match.xml b/app/src/main/res/layout/layout_msg_view_holder_match.xml index 24550535e..be9d636d3 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_match.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_match.xml @@ -6,6 +6,6 @@ android:layout_height="wrap_content" android:maxWidth="215dp" android:padding="@dimen/dp_5" - android:textColor="@color/white" + android:textColor="@color/text_title_white" android:textSize="14sp" tools:text="恭喜您,获得抽奖机会,点我抽奖>>" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_msg_view_holder_red_packet.xml b/app/src/main/res/layout/layout_msg_view_holder_red_packet.xml index c2df96cec..ab322eaab 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_red_packet.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_red_packet.xml @@ -25,7 +25,7 @@ android:id="@+id/tip_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/white" + android:textColor="@color/text_title_white" android:layout_gravity="center_vertical" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" diff --git a/app/src/main/res/layout/layout_msg_view_holder_sign_in_notice.xml b/app/src/main/res/layout/layout_msg_view_holder_sign_in_notice.xml index a0bc21e14..9716696bb 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_sign_in_notice.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_sign_in_notice.xml @@ -11,7 +11,7 @@ diff --git a/app/src/main/res/layout/list_item_friend_new.xml b/app/src/main/res/layout/list_item_friend_new.xml index dc434b38a..2e1883e26 100644 --- a/app/src/main/res/layout/list_item_friend_new.xml +++ b/app/src/main/res/layout/list_item_friend_new.xml @@ -35,7 +35,7 @@ android:layout_marginEnd="2dp" android:ellipsize="end" android:lines="1" - android:textColor="@color/white" + android:textColor="@color/text_title_white" android:textSize="15sp" app:layout_flexShrink="1" tools:text="我的我的我的我的我的我的" /> diff --git a/app/src/main/res/layout/newbie_list_item.xml b/app/src/main/res/layout/newbie_list_item.xml index 5e54c764f..608f9d64c 100644 --- a/app/src/main/res/layout/newbie_list_item.xml +++ b/app/src/main/res/layout/newbie_list_item.xml @@ -41,7 +41,7 @@ android:layout_marginEnd="2dp" android:ellipsize="end" android:lines="1" - android:textColor="@color/white" + android:textColor="@color/text_title_white" android:textSize="15sp" tools:text="我的我的我的我的我的我的" app:layout_flexShrink="1" diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java index 6908b7a73..ea92d5a3b 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java @@ -146,7 +146,7 @@ public class HallMsgViewHolder extends MsgViewHolderBase{ return; } // title - setupView(tvTitle, hallMsgLayout.getTitle()); + tvTitle.setText(hallMsgLayout.getTitle().getContent()); // content List erbanSysMsgLayoutContent = hallMsgLayout.getContents(); if (erbanSysMsgLayoutContent != null) { @@ -208,20 +208,6 @@ public class HallMsgViewHolder extends MsgViewHolderBase{ } - private void setupView(TextView view, HallMsgComponent component) { - if (component != null) { - setupComponent(view, component.getContent(), - component.getFontColor(), component.getFontSize(), - component.getRouterType(), component.getRouterValue()); - } - } - - private void setupComponent(TextView view, String text, String textColor, float fontSize, - int routerType, int routerValue) { - view.setText(text); - view.setTextColor(Color.parseColor(textColor)); - view.setTextSize(fontSize); - } private void handleClick(HallImMsgInfo info, int second) { stvAgree.setOnClickListener(v -> handleApply(info, second, 1)); diff --git a/app/src/module_mini_world/res/drawable/bg_mini_world_no_data_button.xml b/app/src/module_mini_world/res/drawable/bg_mini_world_no_data_button.xml index ef86ccebb..126c8ea75 100644 --- a/app/src/module_mini_world/res/drawable/bg_mini_world_no_data_button.xml +++ b/app/src/module_mini_world/res/drawable/bg_mini_world_no_data_button.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/module_public_chat_hall/res/layout/nim_message_item_text.xml b/app/src/module_public_chat_hall/res/layout/nim_message_item_text.xml index c7615067b..0615c57b2 100644 --- a/app/src/module_public_chat_hall/res/layout/nim_message_item_text.xml +++ b/app/src/module_public_chat_hall/res/layout/nim_message_item_text.xml @@ -12,6 +12,6 @@ android:includeFontPadding="false" android:lineSpacingExtra="3dip" android:maxWidth="222dp" - android:textColor="@color/white" + android:textColor="@color/text_title_white" android:textSize="@dimen/dp_13"/> \ No newline at end of file diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomInviteFansActivity.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomInviteFansActivity.java index 807066ea0..351e8515c 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomInviteFansActivity.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomInviteFansActivity.java @@ -56,7 +56,7 @@ public class RoomInviteFansActivity extends BaseActivity { getInviteError(throwable.getMessage()) ) .subscribe(info -> { - tvInviteFansCount.setText(Html.fromHtml("确认邀请后会给收藏该房间的共"+""+info.getFansNum()+""+"位用户发送提醒")); + tvInviteFansCount.setText(Html.fromHtml("确认邀请后会给收藏该房间的共"+""+info.getFansNum()+""+"位用户发送提醒")); tvInviteFansTimes.setText(Html.fromHtml("今日剩余"+""+info.getInviteTimes()+""+"次")); tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_confirm_normal)); if (info.getInviteInterval() > 0){ @@ -92,7 +92,7 @@ public class RoomInviteFansActivity extends BaseActivity { RoomInviteFansModel.INSTANCE.setRoomInviteFans(AvRoomDataManager.get().mCurrentRoomInfo.getUid()) .doOnError(throwable -> SingleToastUtil.showToastShort(throwable.getMessage())) .subscribe(info -> { - tvInviteFansCount.setText(Html.fromHtml("确认邀请后会给收藏该房间的"+""+info.getFansNum()+""+"位用户发送提醒")); + tvInviteFansCount.setText(Html.fromHtml("确认邀请后会给收藏该房间的"+""+info.getFansNum()+""+"位用户发送提醒")); tvInviteFansTimes.setText(Html.fromHtml("今日剩余"+""+info.getInviteTimes()+""+"次")); tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_confirm_normal)); if (info.getInviteInterval() > 0){ diff --git a/app/src/module_room_chat/res/layout/activity_newbie_list.xml b/app/src/module_room_chat/res/layout/activity_newbie_list.xml index dd70041bb..d5ca8b3b5 100644 --- a/app/src/module_room_chat/res/layout/activity_newbie_list.xml +++ b/app/src/module_room_chat/res/layout/activity_newbie_list.xml @@ -33,14 +33,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/find_new" - android:textColor="@color/white" + android:textColor="@color/text_normal_c6c6e9" android:textSize="@dimen/dp_18" /> @@ -51,7 +51,7 @@ android:layout_gravity="center_vertical" android:layout_marginStart="@dimen/dp_15" android:padding="@dimen/dp_8" - android:src="@drawable/arrow_left_white" /> + android:src="@drawable/arrow_left" /> diff --git a/app/src/module_room_chat/res/layout/activity_room_newbie_list.xml b/app/src/module_room_chat/res/layout/activity_room_newbie_list.xml index a9e02a95d..f7bb6b223 100644 --- a/app/src/module_room_chat/res/layout/activity_room_newbie_list.xml +++ b/app/src/module_room_chat/res/layout/activity_room_newbie_list.xml @@ -49,7 +49,7 @@ android:id="@+id/iv_back" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/arrow_left_white" + android:src="@drawable/arrow_left" android:layout_marginStart="@dimen/dp_15" android:layout_gravity="center_vertical" /> diff --git a/nim_uikit/res/drawable/bg_message_input.xml b/nim_uikit/res/drawable/bg_message_input.xml index 352cd26ad..6765ea311 100644 --- a/nim_uikit/res/drawable/bg_message_input.xml +++ b/nim_uikit/res/drawable/bg_message_input.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nim_uikit/res/drawable/bg_nim_water_drop_other.xml b/nim_uikit/res/drawable/bg_nim_water_drop_other.xml index ce79eb035..71dc9acaf 100644 --- a/nim_uikit/res/drawable/bg_nim_water_drop_other.xml +++ b/nim_uikit/res/drawable/bg_nim_water_drop_other.xml @@ -13,6 +13,6 @@ android:topLeftRadius="4dp" android:topRightRadius="20dp"/> - + \ No newline at end of file diff --git a/nim_uikit/res/drawable/bg_nim_water_drop_self.xml b/nim_uikit/res/drawable/bg_nim_water_drop_self.xml index fa0dd22f8..d5f8f270f 100644 --- a/nim_uikit/res/drawable/bg_nim_water_drop_self.xml +++ b/nim_uikit/res/drawable/bg_nim_water_drop_self.xml @@ -13,6 +13,6 @@ android:bottomRightRadius="20dp" android:bottomLeftRadius="20dp"/> - + \ No newline at end of file diff --git a/nim_uikit/res/drawable/nim_bg_message_tip.xml b/nim_uikit/res/drawable/nim_bg_message_tip.xml index 57ee44fad..70782df29 100644 --- a/nim_uikit/res/drawable/nim_bg_message_tip.xml +++ b/nim_uikit/res/drawable/nim_bg_message_tip.xml @@ -1,6 +1,6 @@ - + - - - + + + \ No newline at end of file diff --git a/nim_uikit/res/layout/nim_message_activity_bottom_layout.xml b/nim_uikit/res/layout/nim_message_activity_bottom_layout.xml index fdf9e0265..b567f9164 100644 --- a/nim_uikit/res/layout/nim_message_activity_bottom_layout.xml +++ b/nim_uikit/res/layout/nim_message_activity_bottom_layout.xml @@ -4,7 +4,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/color_2a2a39" + android:background="@color/white" android:orientation="vertical"> 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 0eab72541..29e4ddb21 100644 --- a/nim_uikit/res/layout/nim_message_activity_text_layout.xml +++ b/nim_uikit/res/layout/nim_message_activity_text_layout.xml @@ -56,24 +56,24 @@ diff --git a/nim_uikit/res/layout/nim_message_item_notification.xml b/nim_uikit/res/layout/nim_message_item_notification.xml index 668352e8a..36469423a 100644 --- a/nim_uikit/res/layout/nim_message_item_notification.xml +++ b/nim_uikit/res/layout/nim_message_item_notification.xml @@ -11,7 +11,7 @@ android:gravity="center" android:paddingLeft="7dip" android:paddingRight="7dip" - android:textColor="#ffffff" + android:textColor="@color/color_black_333333" android:textSize="12sp"/> \ No newline at end of file diff --git a/nim_uikit/res/layout/nim_message_item_text.xml b/nim_uikit/res/layout/nim_message_item_text.xml index 0aeb3165c..b3e9a0e6e 100644 --- a/nim_uikit/res/layout/nim_message_item_text.xml +++ b/nim_uikit/res/layout/nim_message_item_text.xml @@ -16,6 +16,6 @@ android:maxWidth="238dp" android:minWidth="40dp" android:minHeight="40dp" - android:textColor="@color/white" + android:textColor="@color/color_black_333333" android:textSize="13sp" /> \ No newline at end of file diff --git a/nim_uikit/res/layout/nim_message_item_tip.xml b/nim_uikit/res/layout/nim_message_item_tip.xml index 907553e84..318bca072 100644 --- a/nim_uikit/res/layout/nim_message_item_tip.xml +++ b/nim_uikit/res/layout/nim_message_item_tip.xml @@ -13,7 +13,7 @@ android:background="@drawable/nim_bg_message_tip" android:paddingLeft="7dip" android:paddingRight="7dip" - android:textColor="#ffffff" + android:textColor="@color/color_black_333333" android:textSize="12sp" tools:text="12312313" /> \ No newline at end of file diff --git a/nim_uikit/res/values/colors.xml b/nim_uikit/res/values/colors.xml index db9648506..68409c0bc 100644 --- a/nim_uikit/res/values/colors.xml +++ b/nim_uikit/res/values/colors.xml @@ -1,8 +1,8 @@ - #7154EE - #7154EE + #FFBC52 + #FFBC52 #00000000 #FFFFFF @@ -69,11 +69,12 @@ #248DFA #FAFAFA #B3B3B3 - #7154EE + #FFBC52 #BAB0FF #2A2A39 #1C1B22 - #C6C6E9 - #555574 + #ff333333 + #B3333333 + #FFF4F4FA \ No newline at end of file diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderText.java b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderText.java index 69904c7c0..7fcedfe93 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderText.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderText.java @@ -38,7 +38,7 @@ public class MsgViewHolderText extends MsgViewHolderBase { @Override protected void bindContentView() { - bodyTextView.setTextColor(ContextCompat.getColor(context, isReceivedMessage() ? R.color.white : R.color.color_C6C6E9)); + bodyTextView.setTextColor(ContextCompat.getColor(context,R.color.color_C6C6E9)); bodyTextView.setOnClickListener(v -> onItemClick()); MoonUtil.identifyFaceExpression(NimUIKit.getContext(), bodyTextView, getDisplayText(), ImageSpan.ALIGN_BOTTOM); bodyTextView.setMovementMethod(LinkMovementMethod.getInstance());