Commit a36b82e3 authored by she's avatar she

1.2.3 发送消息返回服务器时间

parent 7dd78e82
...@@ -3,20 +3,17 @@ package com.ccwangluo.im.adapter; ...@@ -3,20 +3,17 @@ package com.ccwangluo.im.adapter;
import android.content.Context; import android.content.Context;
import android.graphics.Color; import android.graphics.Color;
import android.provider.CalendarContract;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.ccwangluo.ccim.CCIMClient; import com.ccwangluo.ccim.CCIMClient;
import com.ccwangluo.ccim.listener.OnPlayAudioCallback; import com.ccwangluo.ccim.listener.OnPlayAudioCallback;
import com.ccwangluo.ccim.listener.ResultEventCallback;
import com.ccwangluo.ccim.modle.MessageContent; import com.ccwangluo.ccim.modle.MessageContent;
import com.ccwangluo.im.R; import com.ccwangluo.im.R;
...@@ -82,8 +79,8 @@ public class ChannelMsgAdapter extends BaseAdapter { ...@@ -82,8 +79,8 @@ public class ChannelMsgAdapter extends BaseAdapter {
// mHolder..setText(messageContent.getVoiceContent()); // mHolder..setText(messageContent.getVoiceContent());
} }
if (messageContent.getSenderUser() != null){ if (messageContent != null){
mHolder.msg_content_send.setText(messageContent.getSenderUser().toString()); mHolder.msg_content_send.setText(messageContent.getCreatedDate().toString());
} else { } else {
mHolder.msg_content_send.setText(""); mHolder.msg_content_send.setText("");
} }
......
...@@ -11,7 +11,7 @@ android { ...@@ -11,7 +11,7 @@ android {
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 30 targetSdkVersion 30
versionCode 3 versionCode 3
versionName "1.2.1" versionName "1.2.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"
......
...@@ -157,7 +157,7 @@ public class MessageManager { ...@@ -157,7 +157,7 @@ public class MessageManager {
message.setMsgId(msgId); message.setMsgId(msgId);
message.setContent(text); message.setContent(text);
message.setMsgType(MessageContent.MessageType.valueOf(messageType.name())); message.setMsgType(MessageContent.MessageType.valueOf(messageType.name()));
message.setCreatedDate(System.currentTimeMillis()); message.setCreatedDate(sendMsgRes.getSendDate());
message.setMsgSrcType(MessageContent.MessageSourceType.MESSAGE_SOURCE_TYPE_PRIVATE); message.setMsgSrcType(MessageContent.MessageSourceType.MESSAGE_SOURCE_TYPE_PRIVATE);
pushNewMessage(message); pushNewMessage(message);
callback.onSuccess(message); callback.onSuccess(message);
...@@ -201,7 +201,7 @@ public class MessageManager { ...@@ -201,7 +201,7 @@ public class MessageManager {
message.setMsgId(msgId); message.setMsgId(msgId);
message.setContent(text); message.setContent(text);
message.setMsgType(MessageContent.MessageType.valueOf(messageType.name())); message.setMsgType(MessageContent.MessageType.valueOf(messageType.name()));
message.setCreatedDate(System.currentTimeMillis()); message.setCreatedDate(sendMsgRes.getSendDate());
message.setMsgSrcType(MessageContent.MessageSourceType.MESSAGE_SOURCE_TYPE_PRIVATE); message.setMsgSrcType(MessageContent.MessageSourceType.MESSAGE_SOURCE_TYPE_PRIVATE);
pushNewMessage(message); pushNewMessage(message);
callback.onSuccess(message); callback.onSuccess(message);
......
...@@ -15,6 +15,7 @@ message SendMessageRequest { ...@@ -15,6 +15,7 @@ message SendMessageRequest {
message SendMessageResponse { message SendMessageResponse {
int64 msg_id = 1; int64 msg_id = 1;
string content = 2; string content = 2;
int64 send_date = 3;
} }
message SendChannelMessageRequest { message SendChannelMessageRequest {
...@@ -26,6 +27,7 @@ message SendChannelMessageRequest { ...@@ -26,6 +27,7 @@ message SendChannelMessageRequest {
message SendChannelMessageResponse { message SendChannelMessageResponse {
int64 msg_id = 1; int64 msg_id = 1;
string content = 2; string content = 2;
int64 send_date = 3;
} }
message PullOfflineMessageRequest { message PullOfflineMessageRequest {
......
...@@ -101,6 +101,13 @@ CCIMClient.getInstance().initSDK(context, appKey, username, extData, id, ts, sig ...@@ -101,6 +101,13 @@ CCIMClient.getInstance().initSDK(context, appKey, username, extData, id, ts, sig
}); });
``` ```
## 更新用户信息
* 参数说明 :`extData`:需要更新的消息
* 接口
```
CCIMClient.getInstance().updateUserRequest(String extData, ResultEventCallback<Void> callback){}
```
## 搜索好友接口 ## 搜索好友接口
* 参数说明 :`userName`:要搜索的好友的名称,`userId`:要搜索的好友的id,`size`:相同昵称一页最多拉取的数量,`page`:当前页码 * 参数说明 :`userName`:要搜索的好友的名称,`userId`:要搜索的好友的id,`size`:相同昵称一页最多拉取的数量,`page`:当前页码
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment