Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
ccim_sdk_android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
ccim_sdk_android
Commits
4d734ba7
Commit
4d734ba7
authored
Dec 27, 2021
by
sheteng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除联系人推送
parent
ef12c5bf
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
35 additions
and
26 deletions
+35
-26
app/build.gradle
app/build.gradle
+0
-4
app/src/main/res/layout/activity_login.xml
app/src/main/res/layout/activity_login.xml
+1
-1
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
+8
-1
ccim/src/main/java/com/ccwangluo/ccim/manage/ContactManager.java
...c/main/java/com/ccwangluo/ccim/manage/ContactManager.java
+1
-1
ccim/src/main/proto/chat.proto
ccim/src/main/proto/chat.proto
+19
-18
ccim/src/main/proto/common.proto
ccim/src/main/proto/common.proto
+1
-0
ccim/src/main/proto/push.proto
ccim/src/main/proto/push.proto
+5
-1
No files found.
app/build.gradle
View file @
4d734ba7
...
@@ -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
app/src/main/res/layout/activity_login.xml
View file @
4d734ba7
...
@@ -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=
"10
6.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"
...
...
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
View file @
4d734ba7
...
@@ -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
,
L
ong
userId
,
int
page
,
int
size
,
ResultEventCallback
<
SearchRes
>
resultEventCallback
)
{
public
void
searchUser
(
String
userName
,
l
ong
userId
,
int
page
,
int
size
,
ResultEventCallback
<
SearchRes
>
resultEventCallback
)
{
contactManager
.
searchUser
(
userName
,
userId
,
page
,
size
,
resultEventCallback
);
contactManager
.
searchUser
(
userName
,
userId
,
page
,
size
,
resultEventCallback
);
}
}
...
...
ccim/src/main/java/com/ccwangluo/ccim/manage/ContactManager.java
View file @
4d734ba7
...
@@ -100,7 +100,7 @@ public class ContactManager {
...
@@ -100,7 +100,7 @@ public class ContactManager {
/**
/**
* 搜索好友
* 搜索好友
*/
*/
public
void
searchUser
(
String
userName
,
L
ong
userId
,
int
page
,
int
size
,
ResultEventCallback
<
SearchRes
>
resultEventCallback
)
{
public
void
searchUser
(
String
userName
,
l
ong
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
)
...
...
ccim/src/main/proto/chat.proto
View file @
4d734ba7
...
@@ -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
;
...
...
ccim/src/main/proto/common.proto
View file @
4d734ba7
...
@@ -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
{
...
...
ccim/src/main/proto/push.proto
View file @
4d734ba7
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment