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
7df562e2
Commit
7df562e2
authored
Jan 05, 2022
by
sheteng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
链接超时错误码
parent
e9e98975
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
40 additions
and
15 deletions
+40
-15
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
+22
-2
ccim/src/main/java/com/ccwangluo/ccim/listener/MessageListener.java
...ain/java/com/ccwangluo/ccim/listener/MessageListener.java
+1
-1
ccim/src/main/java/com/ccwangluo/ccim/listener/OnClientConnectListener.java
.../com/ccwangluo/ccim/listener/OnClientConnectListener.java
+1
-1
ccim/src/main/java/com/ccwangluo/ccim/listener/OnConnectListener.java
...n/java/com/ccwangluo/ccim/listener/OnConnectListener.java
+1
-1
ccim/src/main/java/com/ccwangluo/ccim/manage/SocketManager.java
...rc/main/java/com/ccwangluo/ccim/manage/SocketManager.java
+9
-3
ccim/src/main/java/com/ccwangluo/ccim/socket/NettyChatClient.java
.../main/java/com/ccwangluo/ccim/socket/NettyChatClient.java
+6
-7
No files found.
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
View file @
7df562e2
...
...
@@ -119,12 +119,32 @@ public class CCIMClient {
}
@Override
public
void
onSocketDisconnection
()
{
public
void
onSocketDisconnection
(
int
code
)
{
isConnected
=
false
;
logger
.
info
(
"disconnection"
);
resultCallback
.
onSocketDisconnection
();
resultCallback
.
onSocketDisconnection
(
code
);
}
});
initCachePath
(
context
);
}
/**
* 初始化缓存目录
*
* @param context
*/
private
void
initCachePath
(
Context
context
)
{
if
(
Environment
.
getExternalStorageState
().
equals
(
Environment
.
MEDIA_MOUNTED
))
{
cachePath
=
context
.
getExternalFilesDir
(
"cache"
).
getAbsolutePath
();
}
else
{
cachePath
=
context
.
getCacheDir
().
getAbsolutePath
();
}
File
fileDir
=
new
File
(
cachePath
);
boolean
b
=
!
fileDir
.
exists
();
if
(
b
)
{
fileDir
.
mkdirs
();
}
}
...
...
ccim/src/main/java/com/ccwangluo/ccim/listener/MessageListener.java
View file @
7df562e2
...
...
@@ -7,7 +7,7 @@ public interface MessageListener {
}
default
void
onServerDisConnect
(){
default
void
onServerDisConnect
(
int
code
){
}
void
onMessageListener
(
Chat
.
ChatResponseMessage
data
);
...
...
ccim/src/main/java/com/ccwangluo/ccim/listener/OnClientConnectListener.java
View file @
7df562e2
...
...
@@ -5,5 +5,5 @@ import ccim.protocol.Chat;
public
interface
OnClientConnectListener
{
void
onSocketConnection
(
Chat
.
ConnectResponse
.
ClientConfig
clientConfig
);
void
onSocketReConnection
();
default
void
onSocketDisconnection
(){};
default
void
onSocketDisconnection
(
int
code
){};
}
ccim/src/main/java/com/ccwangluo/ccim/listener/OnConnectListener.java
View file @
7df562e2
...
...
@@ -2,5 +2,5 @@ package com.ccwangluo.ccim.listener;
public
interface
OnConnectListener
{
void
onSocketConnection
();
void
onSocketDisconnection
();
void
onSocketDisconnection
(
int
errorCode
);
}
ccim/src/main/java/com/ccwangluo/ccim/manage/SocketManager.java
View file @
7df562e2
...
...
@@ -11,6 +11,7 @@ import com.ccwangluo.ccim.listener.OnClientConnectListener;
import
com.ccwangluo.ccim.listener.ResultEventCallback
;
import
com.ccwangluo.ccim.socket.NettyChatClient
;
import
com.ccwangluo.ccim.socket.SocketClient
;
import
com.ccwangluo.ccim.util.ErrorCode
;
import
com.google.protobuf.util.JsonFormat
;
import
java.util.logging.Logger
;
...
...
@@ -65,7 +66,7 @@ public class SocketManager {
@Override
public
void
onFailed
(
int
errorCode
)
{
onConnectListener
.
onSocketDisconnection
();
onConnectListener
.
onSocketDisconnection
(
errorCode
);
disConnect
();
}
});
...
...
@@ -83,9 +84,13 @@ public class SocketManager {
}
@Override
public
void
onServerDisConnect
()
{
public
void
onServerDisConnect
(
int
code
)
{
if
(
code
==
ErrorCode
.
NET_ERROR
){
onConnectListener
.
onSocketDisconnection
(
code
);
}
else
{
onConnectListener
.
onSocketReConnection
();
}
}
@Override
public
void
onMessageListener
(
Chat
.
ChatResponseMessage
data
)
{
...
...
@@ -122,6 +127,7 @@ public class SocketManager {
e
.
printStackTrace
();
}
}
});
}
...
...
ccim/src/main/java/com/ccwangluo/ccim/socket/NettyChatClient.java
View file @
7df562e2
...
...
@@ -7,6 +7,7 @@ import android.net.NetworkInfo;
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
;
...
...
@@ -33,23 +34,18 @@ import io.netty.handler.codec.protobuf.ProtobufEncoder;
public
class
NettyChatClient
implements
SocketClient
{
private
final
Logger
logger
=
Logger
.
getLogger
(
CCIMClient
.
class
.
getName
());
private
MessageListener
msglitener
;
private
ChannelFuture
channelFuture
;
private
final
String
ip
;
private
final
int
port
;
private
Bootstrap
bootstrap
;
private
Context
context
;
EventLoopGroup
group
=
new
NioEventLoopGroup
();
private
ExecutorService
executor
=
Executors
.
newSingleThreadExecutor
();
ScheduledExecutorService
timerExcutor
;
public
NettyChatClient
(
Context
context
,
String
ip
,
int
port
)
{
this
.
ip
=
ip
;
this
.
port
=
port
;
...
...
@@ -90,6 +86,9 @@ public class NettyChatClient implements SocketClient {
channelFuture
=
bootstrap
.
connect
(
ip
,
port
).
sync
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
if
(
msglitener
!=
null
){
msglitener
.
onServerDisConnect
(
ErrorCode
.
NET_ERROR
);
}
}
});
}
...
...
@@ -185,7 +184,7 @@ public class NettyChatClient implements SocketClient {
public
void
channelInactive
(
ChannelHandlerContext
ctx
)
throws
Exception
{
super
.
channelInactive
(
ctx
);
logger
.
info
(
"channelInactive"
);
msglitener
.
onServerDisConnect
();
msglitener
.
onServerDisConnect
(
ErrorCode
.
NET_TIME_OUT
);
}
/**
...
...
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