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
33461bc2
Commit
33461bc2
authored
Dec 10, 2021
by
sheteng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
开始测试 2
搜索好友列表
parent
cd37fbf6
Changes
15
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
202 additions
and
83 deletions
+202
-83
app/build.gradle
app/build.gradle
+4
-0
app/src/main/java/com/ccwangluo/im/FirstFragment.java
app/src/main/java/com/ccwangluo/im/FirstFragment.java
+65
-1
app/src/main/java/com/ccwangluo/im/adapter/ChannelMsgAdapter.java
...main/java/com/ccwangluo/im/adapter/ChannelMsgAdapter.java
+5
-0
app/src/main/java/com/ccwangluo/im/adapter/ContactExpandableAdapter.java
...va/com/ccwangluo/im/adapter/ContactExpandableAdapter.java
+25
-0
app/src/main/java/com/ccwangluo/im/adapter/PrivateMsgAdapter.java
...main/java/com/ccwangluo/im/adapter/PrivateMsgAdapter.java
+5
-0
app/src/main/java/com/ccwangluo/im/data/LoginViewModel.java
app/src/main/java/com/ccwangluo/im/data/LoginViewModel.java
+2
-2
app/src/main/java/com/ccwangluo/im/ui/dashboard/ConnectFragment.java
...n/java/com/ccwangluo/im/ui/dashboard/ConnectFragment.java
+5
-0
app/src/main/java/com/ccwangluo/im/ui/dashboard/ContactsFragment.java
.../java/com/ccwangluo/im/ui/dashboard/ContactsFragment.java
+10
-0
app/src/main/java/com/ccwangluo/im/ui/login/LoginActivity.java
...rc/main/java/com/ccwangluo/im/ui/login/LoginActivity.java
+1
-1
app/src/main/java/com/ccwangluo/im/ui/notifications/ConnectChannelFragment.java
...ccwangluo/im/ui/notifications/ConnectChannelFragment.java
+5
-0
ccim/build.gradle
ccim/build.gradle
+0
-2
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
+72
-69
ccim/src/main/java/com/ccwangluo/ccim/database/AppDatabase.java
...rc/main/java/com/ccwangluo/ccim/database/AppDatabase.java
+1
-2
ccim/src/main/java/com/ccwangluo/ccim/listener/ResultCallback.java
...main/java/com/ccwangluo/ccim/listener/ResultCallback.java
+1
-3
ccim/src/main/java/com/ccwangluo/ccim/listener/ResultEventCallback.java
...java/com/ccwangluo/ccim/listener/ResultEventCallback.java
+1
-3
No files found.
app/build.gradle
View file @
33461bc2
...
...
@@ -60,5 +60,9 @@ dependencies {
implementation
'com.google.protobuf:protobuf-java-util:3.12.0'
implementation
'com.guolindev.permissionx:permissionx:1.6.1'
implementation
'io.netty:netty-all:4.1.4.Final'
implementation
'com.squareup.okhttp3:okhttp:4.9.0'
def
room_version
=
"2.3.0"
implementation
"androidx.room:room-runtime:$room_version"
annotationProcessor
"androidx.room:room-compiler:$room_version"
}
\ No newline at end of file
app/src/main/java/com/ccwangluo/im/FirstFragment.java
View file @
33461bc2
...
...
@@ -155,6 +155,11 @@ public class FirstFragment extends Fragment {
public
void
onSuccess
()
{
refreshLogView
(
"addContact success"
);
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
});
...
...
@@ -163,12 +168,16 @@ public class FirstFragment extends Fragment {
@Override
public
void
onClick
(
View
v
)
{
CCIMClient
.
getInstance
().
sendTextMessage
(
binding
.
msg
.
getText
().
toString
(),
Long
.
parseLong
(
binding
.
userId
.
getText
().
toString
()),
binding
.
userName
.
getText
().
toString
(),
new
ResultEventCallback
<
MessageContent
>()
{
@Override
public
void
onSuccess
(
MessageContent
messageContent
)
{
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
});
...
...
@@ -198,6 +207,11 @@ public class FirstFragment extends Fragment {
public
void
onSuccess
()
{
refreshLogView
(
"checkContactRequests success"
);
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
});
...
...
@@ -209,6 +223,11 @@ public class FirstFragment extends Fragment {
public
void
onSuccess
(
Long
aLong
)
{
refreshLogView
(
"createContactGroupRequest : "
+
aLong
);
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
});
...
...
@@ -221,6 +240,11 @@ public class FirstFragment extends Fragment {
public
void
onSuccess
()
{
refreshLogView
(
"moveContactGroupRequest success "
);
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
});
...
...
@@ -233,6 +257,11 @@ public class FirstFragment extends Fragment {
public
void
onSuccess
()
{
refreshLogView
(
"deleteContact success "
);
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
});
...
...
@@ -245,6 +274,11 @@ public class FirstFragment extends Fragment {
public
void
onSuccess
()
{
refreshLogView
(
"blockContact success "
);
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
});
...
...
@@ -257,6 +291,11 @@ public class FirstFragment extends Fragment {
public
void
onSuccess
()
{
refreshLogView
(
"reportIllegalUser success "
);
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
});
...
...
@@ -282,6 +321,11 @@ public class FirstFragment extends Fragment {
public
void
onSuccess
()
{
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
});
...
...
@@ -310,6 +354,11 @@ public class FirstFragment extends Fragment {
binding
.
channelId
.
setText
(
aLong
.
toString
());
refreshLogView
(
"createChannel "
+
aLong
);
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
});
...
...
@@ -322,6 +371,11 @@ public class FirstFragment extends Fragment {
public
void
onSuccess
()
{
refreshLogView
(
"joinChannel "
);
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
});
...
...
@@ -334,6 +388,11 @@ public class FirstFragment extends Fragment {
public
void
onSuccess
()
{
refreshLogView
(
"removeChannelMember: "
);
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
});
...
...
@@ -346,6 +405,11 @@ public class FirstFragment extends Fragment {
public
void
onSuccess
()
{
refreshLogView
(
"exitChannel: "
);
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
});
...
...
app/src/main/java/com/ccwangluo/im/adapter/ChannelMsgAdapter.java
View file @
33461bc2
...
...
@@ -87,6 +87,11 @@ public class ChannelMsgAdapter extends BaseAdapter {
public
void
onSuccess
()
{
Toast
.
makeText
(
context
,
"播放成功"
,
Toast
.
LENGTH_SHORT
).
show
();
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
}
...
...
app/src/main/java/com/ccwangluo/im/adapter/ContactExpandableAdapter.java
View file @
33461bc2
...
...
@@ -165,6 +165,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter {
public
void
onSuccess
()
{
loginViewModel
.
getContactList
();
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
})
...
...
@@ -233,6 +238,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter {
public
void
onSuccess
()
{
loginViewModel
.
getContactList
();
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
break
;
case
1
:
...
...
@@ -241,6 +251,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter {
public
void
onSuccess
()
{
loginViewModel
.
getContactList
();
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
break
;
case
2
:
...
...
@@ -263,6 +278,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter {
public
void
onSuccess
()
{
Toast
.
makeText
(
context
,
"举报成功"
,
Toast
.
LENGTH_SHORT
).
show
();
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
...
...
@@ -298,6 +318,11 @@ public class ContactExpandableAdapter extends BaseExpandableListAdapter {
Toast
.
makeText
(
context
,
"移动成功"
,
Toast
.
LENGTH_SHORT
).
show
();
loginViewModel
.
getContactList
();
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
})
...
...
app/src/main/java/com/ccwangluo/im/adapter/PrivateMsgAdapter.java
View file @
33461bc2
...
...
@@ -91,6 +91,11 @@ public class PrivateMsgAdapter extends BaseAdapter {
public
void
onSuccess
()
{
Toast
.
makeText
(
context
,
"播放成功"
,
Toast
.
LENGTH_SHORT
).
show
();
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
}
...
...
app/src/main/java/com/ccwangluo/im/data/LoginViewModel.java
View file @
33461bc2
...
...
@@ -46,8 +46,8 @@ public class LoginViewModel extends ViewModel {
@Override
public
void
onSocketDisconnection
()
{
// loginState.postValue(false);
// System.out.println("链接断开"
);
//重连
login
(
context
,
appKey
,
appsecret
,
username
,
userId
,
ip
,
port
);
}
});
}
...
...
app/src/main/java/com/ccwangluo/im/ui/dashboard/ConnectFragment.java
View file @
33461bc2
...
...
@@ -106,6 +106,11 @@ public class ConnectFragment extends Fragment {
public
void
onSuccess
()
{
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
...
...
app/src/main/java/com/ccwangluo/im/ui/dashboard/ContactsFragment.java
View file @
33461bc2
...
...
@@ -124,6 +124,11 @@ public class ContactsFragment extends Fragment {
showSearchResultdialog
(
searchRes
.
getUsers
());
}
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
});
...
...
@@ -210,6 +215,11 @@ public class ContactsFragment extends Fragment {
alertDialog
.
show
();
}
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
...
...
app/src/main/java/com/ccwangluo/im/ui/login/LoginActivity.java
View file @
33461bc2
...
...
@@ -65,7 +65,7 @@ public class LoginActivity extends AppCompatActivity {
String
appSecret
=
binding
.
appSecret
.
getText
().
toString
();
String
ip
=
binding
.
ip
.
getText
().
toString
();
int
port
=
Integer
.
parseInt
(
binding
.
port
.
getText
().
toString
());
loginViewModel
.
login
(
LoginActivity
.
this
,
appkey
,
appSecret
,
username
,
id
,
ip
,
port
);
loginViewModel
.
login
(
getApplicationContext
()
,
appkey
,
appSecret
,
username
,
id
,
ip
,
port
);
}
});
}
...
...
app/src/main/java/com/ccwangluo/im/ui/notifications/ConnectChannelFragment.java
View file @
33461bc2
...
...
@@ -104,6 +104,11 @@ public class ConnectChannelFragment extends Fragment {
public
void
onSuccess
()
{
}
@Override
public
void
onFailed
(
int
errorCode
)
{
}
});
}
...
...
ccim/build.gradle
View file @
33461bc2
...
...
@@ -62,8 +62,6 @@ dependencies {
implementation
'com.google.android.material:material:1.4.0'
implementation
'com.google.protobuf:protobuf-java:3.13.0'
implementation
'com.google.protobuf:protobuf-java-util:3.12.0'
// implementation 'com.tonystark.android:socket:latest.release'
// implementation 'com.tonystark.android:socket-server:latest.release'
implementation
'com.guolindev.permissionx:permissionx:1.6.1'
implementation
'com.google.code.gson:gson:2.8.7'
implementation
'io.netty:netty-all:4.1.4.Final'
...
...
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
View file @
33461bc2
This diff is collapsed.
Click to expand it.
ccim/src/main/java/com/ccwangluo/ccim/database/AppDatabase.java
View file @
33461bc2
...
...
@@ -4,8 +4,7 @@ import androidx.room.Database;
import
androidx.room.RoomDatabase
;
import
com.ccwangluo.ccim.modle.MessageContent
;
@Database
(
entities
=
{
MessageContent
.
class
},
version
=
1
)
@Database
(
entities
=
{
MessageContent
.
class
},
version
=
1
,
exportSchema
=
false
)
public
abstract
class
AppDatabase
extends
RoomDatabase
{
public
abstract
MessageDao
messageDao
();
}
ccim/src/main/java/com/ccwangluo/ccim/listener/ResultCallback.java
View file @
33461bc2
...
...
@@ -3,7 +3,5 @@ package com.ccwangluo.ccim.listener;
public
interface
ResultCallback
{
void
onSuccess
();
default
void
onFailed
(
int
errorCode
){
};
void
onFailed
(
int
errorCode
);
}
ccim/src/main/java/com/ccwangluo/ccim/listener/ResultEventCallback.java
View file @
33461bc2
...
...
@@ -3,7 +3,5 @@ package com.ccwangluo.ccim.listener;
public
interface
ResultEventCallback
<
T
>
{
void
onSuccess
(
T
t
);
default
void
onFailed
(
int
errorCode
){
}
void
onFailed
(
int
errorCode
);
}
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