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
bf1b3988
Commit
bf1b3988
authored
Jan 12, 2022
by
sheteng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
链接重新链接发消息逻辑
parent
02d6dcc9
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
14 deletions
+9
-14
app/src/main/java/com/ccwangluo/im/FirstFragment.java
app/src/main/java/com/ccwangluo/im/FirstFragment.java
+0
-1
app/src/main/java/com/ccwangluo/im/ui/login/LoginActivity.java
...rc/main/java/com/ccwangluo/im/ui/login/LoginActivity.java
+0
-1
app/src/main/res/layout/activity_login.xml
app/src/main/res/layout/activity_login.xml
+2
-2
ccim/build.gradle
ccim/build.gradle
+2
-2
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
+1
-1
ccim/src/main/java/com/ccwangluo/ccim/manage/SocketManager.java
...rc/main/java/com/ccwangluo/ccim/manage/SocketManager.java
+2
-4
ccim/src/main/java/com/ccwangluo/ccim/socket/NettyChatClient.java
.../main/java/com/ccwangluo/ccim/socket/NettyChatClient.java
+2
-3
No files found.
app/src/main/java/com/ccwangluo/im/FirstFragment.java
View file @
bf1b3988
...
@@ -67,7 +67,6 @@ public class FirstFragment extends Fragment {
...
@@ -67,7 +67,6 @@ public class FirstFragment extends Fragment {
CCIMClient
.
getInstance
().
registerMessageListener
(
new
OnPushMsgListener
()
{
CCIMClient
.
getInstance
().
registerMessageListener
(
new
OnPushMsgListener
()
{
@Override
@Override
public
void
pushPrivateMsg
(
MessageContent
msg
)
{
public
void
pushPrivateMsg
(
MessageContent
msg
)
{
...
...
app/src/main/java/com/ccwangluo/im/ui/login/LoginActivity.java
View file @
bf1b3988
...
@@ -47,7 +47,6 @@ public class LoginActivity extends AppCompatActivity {
...
@@ -47,7 +47,6 @@ public class LoginActivity extends AppCompatActivity {
}
}
});
});
loginButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
loginButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
@Override
public
void
onClick
(
View
v
)
{
public
void
onClick
(
View
v
)
{
...
...
app/src/main/res/layout/activity_login.xml
View file @
bf1b3988
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:hint=
"Username"
android:hint=
"Username"
android:text=
"1
8
"
android:text=
"1
9
"
android:inputType=
"textEmailAddress"
android:inputType=
"textEmailAddress"
android:selectAllOnFocus=
"true"
android:selectAllOnFocus=
"true"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"8dp"
android:layout_marginTop=
"8dp"
android:hint=
"UserId"
android:hint=
"UserId"
android:text=
"1
8
"
android:text=
"1
9
"
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/build.gradle
View file @
bf1b3988
...
@@ -10,8 +10,8 @@ android {
...
@@ -10,8 +10,8 @@ android {
defaultConfig
{
defaultConfig
{
minSdkVersion
16
minSdkVersion
16
targetSdkVersion
30
targetSdkVersion
30
versionCode
1
versionCode
3
versionName
"1.0"
versionName
"1.0
.2
"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles
"consumer-rules.pro"
consumerProguardFiles
"consumer-rules.pro"
...
...
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
View file @
bf1b3988
...
@@ -108,7 +108,7 @@ public class CCIMClient {
...
@@ -108,7 +108,7 @@ public class CCIMClient {
@Override
@Override
public
void
onFailed
(
int
errorCode
)
{
public
void
onFailed
(
int
errorCode
)
{
resultCallback
.
onSocketDisconnection
(
errorCode
);
}
}
});
});
}
}
...
...
ccim/src/main/java/com/ccwangluo/ccim/manage/SocketManager.java
View file @
bf1b3988
...
@@ -85,7 +85,7 @@ public class SocketManager {
...
@@ -85,7 +85,7 @@ public class SocketManager {
@Override
@Override
public
void
onServerDisConnect
(
int
code
)
{
public
void
onServerDisConnect
(
int
code
)
{
if
(
code
==
ErrorCode
.
NET_ERROR
){
if
(
code
==
ErrorCode
.
NET_ERROR
)
{
onConnectListener
.
onSocketDisconnection
(
code
);
onConnectListener
.
onSocketDisconnection
(
code
);
}
else
{
}
else
{
onConnectListener
.
onSocketReConnection
();
onConnectListener
.
onSocketReConnection
();
...
@@ -155,9 +155,7 @@ public class SocketManager {
...
@@ -155,9 +155,7 @@ public class SocketManager {
Common
.
RequestMessageHeader
header
=
Common
.
RequestMessageHeader
.
newBuilder
().
setVersion
(
version
).
setSeq
(
idPlus
).
build
();
Common
.
RequestMessageHeader
header
=
Common
.
RequestMessageHeader
.
newBuilder
().
setVersion
(
version
).
setSeq
(
idPlus
).
build
();
reqBuilder
.
setHeader
(
header
);
reqBuilder
.
setHeader
(
header
);
logger
.
info
(
reqBuilder
.
build
().
toString
());
logger
.
info
(
reqBuilder
.
build
().
toString
());
if
(
socketClient
.
isActive
())
{
socketClient
.
sendMsg
(
reqBuilder
.
build
());
socketClient
.
sendMsg
(
reqBuilder
.
build
());
}
return
idPlus
;
return
idPlus
;
}
}
...
...
ccim/src/main/java/com/ccwangluo/ccim/socket/NettyChatClient.java
View file @
bf1b3988
...
@@ -115,9 +115,8 @@ public class NettyChatClient implements SocketClient {
...
@@ -115,9 +115,8 @@ public class NettyChatClient implements SocketClient {
return
;
return
;
}
}
executor
.
execute
(()
->
{
executor
.
execute
(()
->
{
if
(
channelFuture
.
channel
().
isActive
())
{
channelFuture
.
channel
().
writeAndFlush
(
msg
);
channelFuture
.
channel
().
writeAndFlush
(
msg
);
}
else
{
if
(!
channelFuture
.
channel
().
isActive
())
{
connect
();
connect
();
}
}
});
});
...
...
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