Commit 7dd78e82 authored by she's avatar she

1.2.2 更新用户

parent bf38d91e
...@@ -2,12 +2,15 @@ package com.ccwangluo.im.adapter; ...@@ -2,12 +2,15 @@ package com.ccwangluo.im.adapter;
import android.content.Context; import android.content.Context;
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;
...@@ -73,10 +76,22 @@ public class ChannelMsgAdapter extends BaseAdapter { ...@@ -73,10 +76,22 @@ public class ChannelMsgAdapter extends BaseAdapter {
MessageContent messageContent = dataList.get(position); MessageContent messageContent = dataList.get(position);
mHolder.msg_content.setVisibility(View.VISIBLE); mHolder.msg_content.setVisibility(View.VISIBLE);
// mHolder.msg_content_send.setVisibility(View.GONE); // mHolder.msg_content_send.setVisibility(View.GONE);
if (messageContent.getMsgType()== MessageContent.MessageType.MESSAGE_TYPE_TEXT) { if (messageContent.getMsgType() == MessageContent.MessageType.MESSAGE_TYPE_TEXT) {
mHolder.msg_content.setText(messageContent.getContent()); mHolder.msg_content.setText(messageContent.getContent());
} else { } else {
// mHolder.msg_content.setText(messageContent.getVoiceContent()); // mHolder..setText(messageContent.getVoiceContent());
}
if (messageContent.getSenderUser() != null){
mHolder.msg_content_send.setText(messageContent.getSenderUser().toString());
} else {
mHolder.msg_content_send.setText("");
}
if (messageContent.getSenderUser() != null && messageContent.getSenderUser().getUserType() == 1) {
convertView.setBackgroundColor(Color.CYAN);
} else {
convertView.setBackgroundColor(Color.WHITE);
} }
convertView.setOnClickListener(new View.OnClickListener() { convertView.setOnClickListener(new View.OnClickListener() {
@Override @Override
...@@ -97,7 +112,7 @@ public class ChannelMsgAdapter extends BaseAdapter { ...@@ -97,7 +112,7 @@ public class ChannelMsgAdapter extends BaseAdapter {
public void onFailed(int errorCode) { public void onFailed(int errorCode) {
System.out.println("onFailed"); System.out.println("onFailed");
} }
},1.0f); }, 1.0f);
} }
} }
}); });
......
...@@ -92,6 +92,40 @@ public class NotificationsFragment extends Fragment { ...@@ -92,6 +92,40 @@ public class NotificationsFragment extends Fragment {
} }
}); });
binding.updateUser.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
final EditText extData = new EditText(getContext());
extData.setHint("extData");
extData.requestFocus();
LinearLayout linearLayout = new LinearLayout(getContext());
linearLayout.setOrientation(LinearLayout.VERTICAL);
linearLayout.addView(extData);
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
builder.setTitle("update userInfo").setIcon(android.R.drawable.ic_dialog_info).setView(linearLayout)
.setNegativeButton("Cancel", null);
builder.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String tag = extData.getText().toString();
CCIMClient.getInstance().updateUserRequest(tag, new ResultEventCallback<Void>() {
@Override
public void onSuccess(Void unused) {
ToastUtil.show(getContext(), "update success");
}
@Override
public void onFailed(int errorCode) {
ToastUtil.show(getContext(), "update success");
}
});
}
});
builder.show();
}
});
binding.joinChannel.setOnClickListener(new View.OnClickListener() { binding.joinChannel.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
...@@ -206,7 +240,7 @@ public class NotificationsFragment extends Fragment { ...@@ -206,7 +240,7 @@ public class NotificationsFragment extends Fragment {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
String roomId = roomeId.getText().toString(); String roomId = roomeId.getText().toString();
String teamId = teamIdTx.getText().toString(); String teamId = teamIdTx.getText().toString();
CCIMClient.getInstance().joinAudioRoom(getContext(), Integer.parseInt(roomId),Integer.parseInt(teamId), new AudioRoomListener() { CCIMClient.getInstance().joinAudioRoom(getContext(), Integer.parseInt(roomId), Integer.parseInt(teamId), new AudioRoomListener() {
@Override @Override
public void onJoinSuccess() { public void onJoinSuccess() {
ToastUtil.show(getContext(), "onJoinSuccess"); ToastUtil.show(getContext(), "onJoinSuccess");
......
...@@ -31,13 +31,6 @@ ...@@ -31,13 +31,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<Button
android:layout_marginLeft="10dp"
android:text="登出"
android:id="@+id/logout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
...@@ -83,6 +76,25 @@ ...@@ -83,6 +76,25 @@
android:id="@+id/audioTargetWorld" android:id="@+id/audioTargetWorld"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<Button
android:layout_marginLeft="10dp"
android:text="登出"
android:id="@+id/logout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
android:layout_marginLeft="10dp"
android:text="更新用户信息"
android:id="@+id/updateUser"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
<ListView <ListView
......
...@@ -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.0" versionName "1.2.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"
......
...@@ -274,6 +274,27 @@ public class CCIMClient { ...@@ -274,6 +274,27 @@ public class CCIMClient {
contactManager.getContactList(resultEventCallback, isClearCache); contactManager.getContactList(resultEventCallback, isClearCache);
} }
/**
* 更新用户信息
*/
public void updateUserRequest(String extData, ResultEventCallback<Void> callback) {
contactManager.updateUserRequest(extData, new ResultEventCallback<Void>() {
@Override
public void onSuccess(Void unused) {
if (user != null) {
user.setExtData(extData);
}
callback.onSuccess(null);
}
@Override
public void onFailed(int errorCode) {
callback.onFailed(errorCode);
}
});
}
/** /**
* 搜索好友 * 搜索好友
...@@ -730,8 +751,8 @@ public class CCIMClient { ...@@ -730,8 +751,8 @@ public class CCIMClient {
/** /**
* 切换语音目标 * 切换语音目标
*/ */
public void audioTargetWorld(boolean enable){ public void audioTargetWorld(boolean enable) {
if (janusService != null){ if (janusService != null) {
janusService.targetWorld(enable); janusService.targetWorld(enable);
} }
} }
......
...@@ -129,6 +129,29 @@ public class ContactManager { ...@@ -129,6 +129,29 @@ public class ContactManager {
} }
public void updateUserRequest(String extData, ResultEventCallback<Void> callback) {
Chat.ChatRequestMessage.Builder builder = Chat.ChatRequestMessage.newBuilder();
ccim.protocol.User.UpdateUserRequest updateUserRequest = ccim.protocol.User.UpdateUserRequest.newBuilder()
.setExtData(extData)
.build();
builder.setUpdateUserReq(updateUserRequest);
int id = socketManager.sendRequest(builder);
callBackManager.addCallBack(id, new ResultEventCallback<Chat.ChatResponseMessage>() {
@Override
public void onSuccess(Chat.ChatResponseMessage chatResponseMessage) {
if (chatResponseMessage.hasAddContactRes()) {
callback.onSuccess(null);
}
}
@Override
public void onFailed(int errorCode) {
callback.onFailed(errorCode);
}
});
}
/** /**
* 搜索好友 * 搜索好友
...@@ -396,6 +419,7 @@ public class ContactManager { ...@@ -396,6 +419,7 @@ public class ContactManager {
/** /**
* 移出拉黑 * 移出拉黑
*
* @param userId * @param userId
* @param callback * @param callback
*/ */
......
...@@ -11,6 +11,15 @@ public class User { ...@@ -11,6 +11,15 @@ public class User {
private Long userId; private Long userId;
private String username; private String username;
private String extData; private String extData;
private int userType = 0;
public int getUserType() {
return userType;
}
public void setUserType(int userType) {
this.userType = userType;
}
public String getExtData() { public String getExtData() {
return extData; return extData;
...@@ -35,4 +44,14 @@ public class User { ...@@ -35,4 +44,14 @@ public class User {
public void setUsername(String username) { public void setUsername(String username) {
this.username = username; this.username = username;
} }
@Override
public String toString() {
return "User{" +
"userId=" + userId +
", username='" + username + '\'' +
", extData='" + extData + '\'' +
", userType=" + userType +
'}';
}
} }
...@@ -45,4 +45,12 @@ message ChannelBlockUserRequest { ...@@ -45,4 +45,12 @@ message ChannelBlockUserRequest {
} }
message ChannelBlockUserResponse { message ChannelBlockUserResponse {
}
message ChannelUnblockUserRequest {
int64 channel_id = 1;
int64 blocked_user_id = 2;
}
message ChannelUnblockUserResponse {
} }
\ No newline at end of file
...@@ -33,11 +33,13 @@ message ChatRequestMessage { ...@@ -33,11 +33,13 @@ message ChatRequestMessage {
RemoveMemberRequest remove_member_req = 23; // 移除成员 RemoveMemberRequest remove_member_req = 23; // 移除成员
ExitChannelRequest exit_channel_req = 24; // 退出频道 ExitChannelRequest exit_channel_req = 24; // 退出频道
ChannelBlockUserRequest channel_block_user_req = 25; // 拉黑频道成员 ChannelBlockUserRequest channel_block_user_req = 25; // 拉黑频道成员
ChannelUnblockUserRequest channel_unblock_user_req = 26; // 拉出黑名单频道成员
ReportIllegalUserRequest report_illegal_user_req = 31; // 举报违规用户 ReportIllegalUserRequest report_illegal_user_req = 31; // 举报违规用户
BlockUserRequest block_user_req = 32; // 用户拉入黑名单 BlockUserRequest block_user_req = 32; // 用户拉入黑名单
PreUploadSignRequest pre_upload_sign_req = 33; // 预上传获取签名 PreUploadSignRequest pre_upload_sign_req = 33; // 预上传获取签名
UnblockUserRequest unblock_user_req = 34; // 拉出黑名单 UnblockUserRequest unblock_user_req = 34; // 拉出黑名单
UpdateUserRequest update_user_req = 35; // 更新用户信息
SendMessageRequest send_msg_req = 42; // 发送消息 SendMessageRequest send_msg_req = 42; // 发送消息
SendChannelMessageRequest send_channel_msg_req = 43; // 发送频道消息 SendChannelMessageRequest send_channel_msg_req = 43; // 发送频道消息
...@@ -75,11 +77,13 @@ message ChatResponseMessage { ...@@ -75,11 +77,13 @@ message ChatResponseMessage {
RemoveMemberResponse remove_member_res = 23; RemoveMemberResponse remove_member_res = 23;
ExitChannelResponse exit_channel_res = 24; ExitChannelResponse exit_channel_res = 24;
ChannelBlockUserResponse channel_block_user_res = 25; ChannelBlockUserResponse channel_block_user_res = 25;
ChannelUnblockUserResponse channel_unblock_user_res = 26;
ReportIllegalUserResponse report_illegal_user_res = 31; ReportIllegalUserResponse report_illegal_user_res = 31;
BlockUserResponse block_user_res = 32; BlockUserResponse block_user_res = 32;
PreUploadSignResponse pre_upload_sign_res = 33; PreUploadSignResponse pre_upload_sign_res = 33;
UnblockUserResponse unblock_user_res = 34; UnblockUserResponse unblock_user_res = 34;
UpdateUserResponse update_user_res = 35;
SendMessageResponse send_msg_res = 41; SendMessageResponse send_msg_res = 41;
SendChannelMessageResponse send_channel_msg_res = 42; SendChannelMessageResponse send_channel_msg_res = 42;
......
...@@ -19,6 +19,7 @@ message ChatMessage { ...@@ -19,6 +19,7 @@ message ChatMessage {
int64 user_id = 1; int64 user_id = 1;
string username = 2; string username = 2;
string ext_data = 3; string ext_data = 3;
int32 user_type = 4;
} }
int64 msg_id = 1; int64 msg_id = 1;
......
...@@ -24,4 +24,12 @@ message UnblockUserRequest { ...@@ -24,4 +24,12 @@ message UnblockUserRequest {
} }
message UnblockUserResponse { message UnblockUserResponse {
}
message UpdateUserRequest {
string username = 1;
string ext_data = 2;
}
message UpdateUserResponse {
} }
\ No newline at end of file
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