Commit 4d734ba7 authored by sheteng's avatar sheteng

删除联系人推送

parent ef12c5bf
...@@ -63,12 +63,8 @@ dependencies { ...@@ -63,12 +63,8 @@ dependencies {
def room_version = "2.3.0" def room_version = "2.3.0"
implementation "androidx.room:room-runtime:$room_version" implementation "androidx.room:room-runtime:$room_version"
annotationProcessor "androidx.room:room-compiler:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version"
implementation 'com.karumi:dexter:6.2.3' implementation 'com.karumi:dexter:6.2.3'
// implementation('com.fasterxml.jackson.core:jackson-core:2.11.1')
implementation 'com.fasterxml.jackson.jr:jackson-jr-objects:2.13.0'
// implementation('com.fasterxml.jackson.core:jackson-databind:2.11.1')
} }
\ No newline at end of file
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:hint="ip" android:hint="ip"
android:text="10.4.5.134" android:text="106.15.237.67"
android:imeActionLabel="@string/action_sign_in_short" android:imeActionLabel="@string/action_sign_in_short"
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
......
...@@ -203,6 +203,13 @@ public class CCIMClient { ...@@ -203,6 +203,13 @@ public class CCIMClient {
pushMsgListener.pushContactNewReq(new User(id, username)); pushMsgListener.pushContactNewReq(new User(id, username));
} }
if (chatResponseMessage.hasPushUserDeletedRes()){
Push.PushUserDeletedResponse pushUserDeletedRes = chatResponseMessage.getPushUserDeletedRes();
long userId = pushUserDeletedRes.getUserId();
contactManager.pushDeleteContact(userId);
pushMsgListener.pushDeleteContact(userId);
}
} }
@Override @Override
...@@ -224,7 +231,7 @@ public class CCIMClient { ...@@ -224,7 +231,7 @@ public class CCIMClient {
/** /**
* 搜索好友 * 搜索好友
*/ */
public void searchUser(String userName, Long userId, int page, int size, ResultEventCallback<SearchRes> resultEventCallback) { public void searchUser(String userName, long userId, int page, int size, ResultEventCallback<SearchRes> resultEventCallback) {
contactManager.searchUser(userName, userId, page, size, resultEventCallback); contactManager.searchUser(userName, userId, page, size, resultEventCallback);
} }
......
...@@ -100,7 +100,7 @@ public class ContactManager { ...@@ -100,7 +100,7 @@ public class ContactManager {
/** /**
* 搜索好友 * 搜索好友
*/ */
public void searchUser(String userName, Long userId, int page, int size, ResultEventCallback<SearchRes> resultEventCallback) { public void searchUser(String userName, long userId, int page, int size, ResultEventCallback<SearchRes> resultEventCallback) {
Chat.ChatRequestMessage.Builder builder = Chat.ChatRequestMessage.newBuilder(); Chat.ChatRequestMessage.Builder builder = Chat.ChatRequestMessage.newBuilder();
Chat.SearchRequest build = Chat.SearchRequest.newBuilder() Chat.SearchRequest build = Chat.SearchRequest.newBuilder()
.setUsername(userName) .setUsername(userName)
......
...@@ -82,6 +82,7 @@ message ChatResponseMessage { ...@@ -82,6 +82,7 @@ message ChatResponseMessage {
PushNewContactResponse push_new_contact_res = 72; // 推送有新的联系人 PushNewContactResponse push_new_contact_res = 72; // 推送有新的联系人
PushContactNetStatusResponse push_contact_net_status_res = 73; // 推送联系人网络状态 PushContactNetStatusResponse push_contact_net_status_res = 73; // 推送联系人网络状态
PushContactNewReqResponse push_contact_new_req_res = 74; // 推送新的好友申请 PushContactNewReqResponse push_contact_new_req_res = 74; // 推送新的好友申请
PushUserDeletedResponse push_user_deleted_res = 76; // 推送与自己有关系(对话过的陌生人或好友)的用户已删除
HeartbeatResponse heartbeat_res = 100; HeartbeatResponse heartbeat_res = 100;
ConnectionStateResponse connection_state_res = 101; ConnectionStateResponse connection_state_res = 101;
......
...@@ -36,6 +36,7 @@ enum StatusCode { ...@@ -36,6 +36,7 @@ enum StatusCode {
STATUS_CODE_CHANNEL_MUTED_ME_ERROR = 30303; // 频道对我禁言 STATUS_CODE_CHANNEL_MUTED_ME_ERROR = 30303; // 频道对我禁言
STATUS_CODE_CHANNEL_NOT_EXISTS = 30304; // 频道不存在 STATUS_CODE_CHANNEL_NOT_EXISTS = 30304; // 频道不存在
STATUS_CODE_CHANNEL_NOT_PERMITTED = 30305; // 频道不允许该用户加入 STATUS_CODE_CHANNEL_NOT_PERMITTED = 30305; // 频道不允许该用户加入
STATUS_CODE_CHANNEL_LIMIT_EXCEEDED = 30306; // 频道加入时人数达到限制
} }
message RequestMessageHeader { message RequestMessageHeader {
......
...@@ -46,3 +46,7 @@ message PushContactNewReqResponse { ...@@ -46,3 +46,7 @@ message PushContactNewReqResponse {
// int64 contact_user_id = 1; // int64 contact_user_id = 1;
// ContactStatus contact_status = 2; // ContactStatus contact_status = 2;
//} //}
message PushUserDeletedResponse {
int64 user_id = 1;
}
\ 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