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
39176743
Commit
39176743
authored
Jan 13, 2022
by
sheteng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
链接重新链接发消息逻辑
parent
bf1b3988
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
32 deletions
+27
-32
app/src/main/java/com/ccwangluo/im/data/LoginViewModel.java
app/src/main/java/com/ccwangluo/im/data/LoginViewModel.java
+1
-1
app/src/main/java/com/ccwangluo/im/ui/notifications/NotificationsFragment.java
.../ccwangluo/im/ui/notifications/NotificationsFragment.java
+6
-4
app/src/main/res/layout/activity_login.xml
app/src/main/res/layout/activity_login.xml
+2
-2
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
+3
-3
ccim/src/main/java/com/ccwangluo/ccim/socket/NettyChatClient.java
.../main/java/com/ccwangluo/ccim/socket/NettyChatClient.java
+15
-22
No files found.
app/src/main/java/com/ccwangluo/im/data/LoginViewModel.java
View file @
39176743
...
...
@@ -50,7 +50,7 @@ public class LoginViewModel extends ViewModel {
public
void
onSocketDisconnection
(
int
code
)
{
System
.
out
.
println
(
"onSocketDisconnection"
);
//重连
login
(
context
,
appKey
,
appsecret
,
username
,
userId
,
ip
,
port
);
//
login(context, appKey, appsecret, username, userId, ip, port);
}
});
...
...
app/src/main/java/com/ccwangluo/im/ui/notifications/NotificationsFragment.java
View file @
39176743
...
...
@@ -146,10 +146,12 @@ public class NotificationsFragment extends Fragment {
public
void
onSuccess
(
Long
aLong
)
{
//获取剪贴板管理器:
loginViewModel
.
addChannelId
(
aLong
);
ClipboardManager
cm
=
(
ClipboardManager
)
getContext
().
getSystemService
(
Context
.
CLIPBOARD_SERVICE
);
ClipData
mClipData
=
ClipData
.
newPlainText
(
"Label"
,
aLong
.
toString
());
cm
.
setPrimaryClip
(
mClipData
);
ToastUtil
.
show
(
getContext
(),
"create success,id copy success"
);
if
(
getContext
()
!=
null
)
{
ClipboardManager
cm
=
(
ClipboardManager
)
getContext
().
getSystemService
(
Context
.
CLIPBOARD_SERVICE
);
ClipData
mClipData
=
ClipData
.
newPlainText
(
"Label"
,
aLong
.
toString
());
cm
.
setPrimaryClip
(
mClipData
);
ToastUtil
.
show
(
getContext
(),
"create success,id copy success"
);
}
}
@Override
...
...
app/src/main/res/layout/activity_login.xml
View file @
39176743
...
...
@@ -14,7 +14,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:hint=
"Username"
android:text=
"
19
"
android:text=
"
20
"
android:inputType=
"textEmailAddress"
android:selectAllOnFocus=
"true"
app:layout_constraintEnd_toEndOf=
"parent"
...
...
@@ -27,7 +27,7 @@
android:layout_height=
"wrap_content"
android:layout_marginTop=
"8dp"
android:hint=
"UserId"
android:text=
"
19
"
android:text=
"
20
"
android:imeActionLabel=
"@string/action_sign_in_short"
android:imeOptions=
"actionDone"
android:selectAllOnFocus=
"true"
...
...
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
View file @
39176743
...
...
@@ -56,7 +56,7 @@ public class CCIMClient {
private
Long
lastSendTimemillis
=
0L
;
//上次发送消息时间,用于时间间隔
private
int
maxSendMsgInterval
=
0
;
private
int
maxAudioDuration
=
0
;
private
int
minAudioDuration
=
500
;
private
final
int
minAudioDuration
=
500
;
private
String
downloadPrefix
;
private
String
cachePath
;
...
...
@@ -115,13 +115,13 @@ public class CCIMClient {
@Override
public
void
onSocketReConnection
()
{
isConnected
=
false
;
//
isConnected = false;
}
@Override
public
void
onSocketDisconnection
(
int
code
)
{
isConnected
=
false
;
logger
.
info
(
"disconnection
"
);
logger
.
info
(
"disconnection
"
+
code
);
resultCallback
.
onSocketDisconnection
(
code
);
}
...
...
ccim/src/main/java/com/ccwangluo/ccim/socket/NettyChatClient.java
View file @
39176743
...
...
@@ -9,7 +9,6 @@ import com.ccwangluo.ccim.CCIMClient;
import
com.ccwangluo.ccim.listener.MessageListener
;
import
com.ccwangluo.ccim.util.ErrorCode
;
import
java.util.concurrent.ExecutorService
;
import
java.util.concurrent.Executors
;
import
java.util.concurrent.ScheduledExecutorService
;
import
java.util.concurrent.TimeUnit
;
...
...
@@ -41,8 +40,6 @@ public class NettyChatClient implements SocketClient {
private
Bootstrap
bootstrap
;
private
Context
context
;
EventLoopGroup
group
=
new
NioEventLoopGroup
();
private
ExecutorService
executor
=
Executors
.
newSingleThreadExecutor
();
ScheduledExecutorService
timerExcutor
;
...
...
@@ -76,21 +73,18 @@ public class NettyChatClient implements SocketClient {
@Override
public
void
connect
(
MessageListener
msglistner
)
{
this
.
msglitener
=
msglistner
;
connect
();
connect
Sync
();
}
private
void
connect
()
{
executor
.
execute
(()
->
{
try
{
channelFuture
=
bootstrap
.
connect
(
ip
,
port
).
sync
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
if
(
msglitener
!=
null
){
msglitener
.
onServerDisConnect
(
ErrorCode
.
NET_ERROR
);
}
private
void
connectSync
()
{
try
{
channelFuture
=
bootstrap
.
connect
(
ip
,
port
).
sync
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
if
(
msglitener
!=
null
)
{
msglitener
.
onServerDisConnect
(
ErrorCode
.
NET_ERROR
);
}
}
);
}
}
...
...
@@ -114,12 +108,11 @@ public class NettyChatClient implements SocketClient {
if
(
channelFuture
==
null
)
{
return
;
}
executor
.
execute
(()
->
{
if
(!
channelFuture
.
channel
().
isActive
())
{
connectSync
();
}
else
{
channelFuture
.
channel
().
writeAndFlush
(
msg
);
if
(!
channelFuture
.
channel
().
isActive
())
{
connect
();
}
});
}
}
...
...
@@ -138,7 +131,7 @@ public class NettyChatClient implements SocketClient {
if
(
channelFuture
!=
null
&&
channelFuture
.
channel
().
isActive
())
{
return
true
;
}
connect
();
connect
Sync
();
return
false
;
}
...
...
@@ -158,7 +151,7 @@ public class NettyChatClient implements SocketClient {
}
else
{
try
{
logger
.
info
(
"reconnect"
);
connect
();
connect
Sync
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
...
...
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