Skip to content

Commit b52a473

Browse files
committed
fix 时间文字颜色,清空列表内容
1 parent 5029310 commit b52a473

File tree

8 files changed

+22
-5
lines changed

8 files changed

+22
-5
lines changed

android/messagelist/src/main/java/cn/jiguang/imui/messages/MsgListAdapter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@ public void clear() {
550550
mItems.clear();
551551
mTimedItems.clear();
552552
lastShowTimeItem = null;
553+
notifyDataSetChanged();
553554
}
554555

555556
/**

android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/AvatarViewHolder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ public void applyStyle(MessageListStyle style) {
142142
if (layout != null && mAvatarIv.getVisibility() == View.VISIBLE) {
143143
layout.getLayoutParams().width = (int) (style.getWindowWidth() * style.getBubbleMaxWidth());
144144
}
145+
if(mDateTv!=null){
146+
mDateTv.setTextColor(Color.WHITE);
147+
}
145148
if (!mIsSender) {
146149
if (mDisplayNameTv.getVisibility() == View.VISIBLE) {
147150
mDisplayNameTv.setMaxEms(8);

android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/TipViewHoler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package cn.jiguang.imui.messages.viewholder;
22

3+
import android.graphics.Color;
34
import android.support.v7.widget.RecyclerView;
45
import android.view.View;
56
import android.widget.TextView;
@@ -31,7 +32,7 @@ public void onBind(MESSAGE message) {
3132

3233
@Override
3334
public void applyStyle(MessageListStyle style) {
34-
mEvent.setTextColor(style.getEventTextColor());
35+
mEvent.setTextColor(Color.WHITE);
3536
mEvent.setTextSize(style.getEventTextSize());
3637
mEvent.setPadding(style.getEventPadding(), style.getEventPadding(), style.getEventPadding(), style.getEventPadding());
3738
}

android/messagelist/src/main/res/layout/item_event_message.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
android:padding="5dp"
1515
android:textSize="10sp"
1616
android:text="TextView"
17-
android:textColor="#ffffff" />
17+
android:textColor="@color/white" />
1818
</LinearLayout>

android/messagelist/src/main/res/layout/item_notification_message.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
android:padding="5dp"
1515
android:textSize="10sp"
1616
android:text="notification"
17-
android:textColor="@color/aurora_msg_event_text_color" />
17+
android:textColor="@color/white" />
1818
</LinearLayout>

android/messagelist/src/main/res/layout/item_tip_message.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
android:padding="5dp"
1515
android:textSize="10sp"
1616
android:text="TextView"
17-
android:textColor="#ffffff" />
17+
android:textColor="@color/white" />
1818
</LinearLayout>

android/src/main/java/cn/jiguang/imui/messagelist/AuroraIMUIModule.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@ public void deleteMessage(ReadableArray messages) {
8989
getReactApplicationContext().sendBroadcast(intent);
9090
}
9191

92+
@ReactMethod
93+
public void clearMessage(){
94+
Intent intent = new Intent();
95+
intent.setAction(ReactMsgListManager.RCT_CLEAR_MESSAGES_ACTION);
96+
getReactApplicationContext().sendBroadcast(intent);
97+
}
9298

9399

94100
@ReactMethod

android/src/main/java/cn/jiguang/imui/messagelist/ReactMsgListManager.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public class ReactMsgListManager extends ViewGroupManager<MessageList> {
7474
public static final String RCT_UPDATE_MESSAGE_ACTION = "cn.jiguang.imui.messagelist.intent.updateMessage";
7575
public static final String RCT_INSERT_MESSAGES_ACTION = "cn.jiguang.imui.messagelist.intent.insertMessages";
7676
public static final String RCT_DELETE_MESSAGES_ACTION = "cn.jiguang.imui.messagelist.intent.deleteMessages";
77+
public static final String RCT_CLEAR_MESSAGES_ACTION = "cn.jiguang.imui.messagelist.intent.clearMessages";
7778

7879
public static final String RCT_SCROLL_TO_BOTTOM_ACTION = "cn.jiguang.imui.messagelist.intent.scrollToBottom";
7980

@@ -96,6 +97,7 @@ protected MessageList createViewInstance(final ThemedReactContext reactContext)
9697
intentFilter.addAction(RCT_UPDATE_MESSAGE_ACTION);
9798
intentFilter.addAction(RCT_INSERT_MESSAGES_ACTION);
9899
intentFilter.addAction(RCT_DELETE_MESSAGES_ACTION);
100+
intentFilter.addAction(RCT_CLEAR_MESSAGES_ACTION);
99101
intentFilter.addAction(RCT_SCROLL_TO_BOTTOM_ACTION);
100102

101103
mContext = reactContext;
@@ -253,7 +255,7 @@ public void onClick() {
253255
});
254256
if (message.isOutgoing()
255257
&& (message.getType() != IMessage.MessageType.SEND_RED_PACKET
256-
|| message.getType() != IMessage.MessageType.SEND_BANK_TRANSFER)) {
258+
&& message.getType() != IMessage.MessageType.SEND_BANK_TRANSFER)) {
257259
dialog.addItem("撤回", new CustomAlertDialog.onSeparateItemClickListener() {
258260
@Override
259261
public void onClick() {
@@ -306,6 +308,8 @@ private static List<PopupMenuItem> getMoreMenuItems(Context context, String sess
306308

307309
@ReactProp(name = "initList")
308310
public void setInitList(MessageList messageList, ReadableArray messages) {
311+
312+
mAdapter.clear();
309313
if (messages != null && messages.size() > 0) {
310314
final List<RCTMessage> list = new ArrayList<>();
311315
for (int i = 0; i < messages.size(); i++) {
@@ -463,6 +467,8 @@ public void run() {
463467
final RCTMessage rctMessage = gson.fromJson(messages[i], RCTMessage.class);
464468
mAdapter.delete(rctMessage);
465469
}
470+
}else if(intent.getAction().equals(RCT_CLEAR_MESSAGES_ACTION)){
471+
mAdapter.clear();
466472
}
467473
}
468474
};

0 commit comments

Comments
 (0)