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
02d6dcc9
Commit
02d6dcc9
authored
Jan 05, 2022
by
sheteng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
连接超时错误码
parent
7df562e2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
53 deletions
+36
-53
app/src/main/java/com/ccwangluo/im/FirstFragment.java
app/src/main/java/com/ccwangluo/im/FirstFragment.java
+4
-2
app/src/main/java/com/ccwangluo/im/data/LoginViewModel.java
app/src/main/java/com/ccwangluo/im/data/LoginViewModel.java
+10
-27
app/src/main/java/com/ccwangluo/im/ui/dashboard/ConnectFragment.java
...n/java/com/ccwangluo/im/ui/dashboard/ConnectFragment.java
+9
-11
app/src/main/java/com/ccwangluo/im/ui/notifications/ConnectChannelFragment.java
...ccwangluo/im/ui/notifications/ConnectChannelFragment.java
+12
-12
app/src/main/res/layout/activity_login.xml
app/src/main/res/layout/activity_login.xml
+1
-1
No files found.
app/src/main/java/com/ccwangluo/im/FirstFragment.java
View file @
02d6dcc9
...
...
@@ -58,9 +58,11 @@ public class FirstFragment extends Fragment {
}
@Override
public
void
onSocketDisconnection
()
{
refreshLogView
(
"disconnect"
);
public
void
onSocketDisconnection
(
int
code
)
{
}
});
CCIMClient
.
getInstance
().
registerMessageListener
(
new
OnPushMsgListener
()
{
...
...
app/src/main/java/com/ccwangluo/im/data/LoginViewModel.java
View file @
02d6dcc9
...
...
@@ -25,8 +25,8 @@ public class LoginViewModel extends ViewModel {
public
MutableLiveData
<
Collection
<
Contact
>>
contactList
=
new
MutableLiveData
<>();
public
MutableLiveData
<
Collection
<
ContactGroup
>>
contactGroupList
=
new
MutableLiveData
<>();
public
MutableLiveData
<
Collection
<
Dialog
>>
dialogList
=
new
MutableLiveData
<>();
public
MutableLiveData
<
List
<
MessageContent
>
>
privateMsgList
=
new
MutableLiveData
<>();
public
MutableLiveData
<
List
<
MessageContent
>
>
channelMsgList
=
new
MutableLiveData
<>();
public
MutableLiveData
<
MessageContent
>
privateMsgList
=
new
MutableLiveData
<>();
public
MutableLiveData
<
MessageContent
>
channelMsgList
=
new
MutableLiveData
<>();
public
MutableLiveData
<
List
<
Long
>>
channelList
=
new
MutableLiveData
<>();
...
...
@@ -42,14 +42,17 @@ public class LoginViewModel extends ViewModel {
CCIMClient
.
getInstance
().
initSDK
(
context
,
appKey
,
username
,
extData
,
id
,
ts
,
sign
,
new
OnConnectListener
()
{
@Override
public
void
onSocketConnection
()
{
System
.
out
.
println
(
"onSocketConnection"
);
loginState
.
postValue
(
true
);
}
@Override
public
void
onSocketDisconnection
()
{
public
void
onSocketDisconnection
(
int
code
)
{
System
.
out
.
println
(
"onSocketDisconnection"
);
//重连
login
(
context
,
appKey
,
appsecret
,
username
,
userId
,
ip
,
port
);
}
});
}
...
...
@@ -89,42 +92,22 @@ public class LoginViewModel extends ViewModel {
}
public
void
addPrivateMsg
(
MessageContent
res
)
{
List
<
MessageContent
>
value
=
privateMsgList
.
getValue
();
if
(
value
==
null
)
{
value
=
new
ArrayList
<>();
}
value
.
add
(
res
);
privateMsgList
.
postValue
(
value
);
privateMsgList
.
postValue
(
res
);
}
public
void
addPrivateMsg
(
List
<
MessageContent
>
res
)
{
List
<
MessageContent
>
value
=
privateMsgList
.
getValue
();
if
(
value
==
null
)
{
value
=
new
ArrayList
<>();
}
for
(
MessageContent
re
:
res
)
{
value
.
add
(
re
);
privateMsgList
.
postValue
(
re
);
}
privateMsgList
.
postValue
(
value
);
}
public
void
addChannelMsg
(
MessageContent
res
)
{
List
<
MessageContent
>
value
=
channelMsgList
.
getValue
();
if
(
value
==
null
)
{
value
=
new
ArrayList
<>();
}
value
.
add
(
res
);
channelMsgList
.
postValue
(
value
);
channelMsgList
.
postValue
(
res
);
}
public
void
addChannelMsg
(
List
<
MessageContent
>
res
)
{
List
<
MessageContent
>
value
=
channelMsgList
.
getValue
();
if
(
value
==
null
)
{
value
=
new
ArrayList
<>();
}
for
(
MessageContent
re
:
res
)
{
value
.
add
(
re
);
channelMsgList
.
postValue
(
re
);
}
channelMsgList
.
postValue
(
value
);
}
}
\ No newline at end of file
app/src/main/java/com/ccwangluo/im/ui/dashboard/ConnectFragment.java
View file @
02d6dcc9
...
...
@@ -48,17 +48,14 @@ public class ConnectFragment extends Fragment {
Contact
contact
=
(
Contact
)
getArguments
().
getSerializable
(
"contact"
);
loginViewModel
.
privateMsgList
.
observe
(
getViewLifecycleOwner
(),
new
Observer
<
List
<
MessageContent
>
>()
{
loginViewModel
.
privateMsgList
.
observe
(
getViewLifecycleOwner
(),
new
Observer
<
MessageContent
>()
{
@Override
public
void
onChanged
(
List
<
MessageContent
>
messageContents
)
{
list
.
clear
();
for
(
MessageContent
messageContent
:
messageContents
)
{
if
((
contact
.
getContactUserId
().
equals
(
messageContent
.
getSenderUserId
())
||
contact
.
getContactUserId
().
equals
(
messageContent
.
getReciveUserId
())))
{
list
.
add
(
messageContent
);
}
public
void
onChanged
(
MessageContent
messageContent
)
{
if
(
messageContent
.
getSenderUserId
().
equals
(
contact
.
getContactUserId
())
||
messageContent
.
getReciveUserId
().
equals
(
contact
.
getContactUserId
()))
{
list
.
add
(
messageContent
);
privaetMsgAdapter
.
refreshData
();
binding
.
msgList
.
setSelection
(
privaetMsgAdapter
.
getCount
()
-
1
);
}
privaetMsgAdapter
.
refreshData
();
binding
.
msgList
.
setSelection
(
privaetMsgAdapter
.
getCount
()
-
1
);
}
});
...
...
@@ -117,11 +114,12 @@ public class ConnectFragment extends Fragment {
return
false
;
}
});
CCIMClient
.
getInstance
().
getPrivateMessage
(
contact
.
getContactUserId
(),
new
ResultEventCallback
<
List
<
MessageContent
>>()
{
@Override
public
void
onSuccess
(
List
<
MessageContent
>
messageContents
)
{
loginViewModel
.
addPrivateMsg
(
messageContents
);
list
.
addAll
(
messageContents
);
privaetMsgAdapter
.
refreshData
();
binding
.
msgList
.
setSelection
(
privaetMsgAdapter
.
getCount
()
-
1
);
}
@Override
...
...
app/src/main/java/com/ccwangluo/im/ui/notifications/ConnectChannelFragment.java
View file @
02d6dcc9
...
...
@@ -46,17 +46,14 @@ public class ConnectChannelFragment extends Fragment {
long
channelId
=
getArguments
().
getLong
(
"channelId"
);
loginViewModel
.
channelMsgList
.
observe
(
getViewLifecycleOwner
(),
new
Observer
<
List
<
MessageContent
>
>()
{
loginViewModel
.
channelMsgList
.
observe
(
getViewLifecycleOwner
(),
new
Observer
<
MessageContent
>()
{
@Override
public
void
onChanged
(
List
<
MessageContent
>
messageContents
)
{
list
.
clear
();
for
(
MessageContent
messageContent
:
messageContents
)
{
if
(
messageContent
.
getChannelId
()
==
channelId
)
{
list
.
add
(
messageContent
);
}
public
void
onChanged
(
MessageContent
messageContent
)
{
if
(
messageContent
.
getChannelId
().
equals
(
channelId
))
{
list
.
add
(
messageContent
);
channelMsgAdapter
.
refreshData
();
binding
.
msgList
.
setSelection
(
channelMsgAdapter
.
getCount
()
-
1
);
}
channelMsgAdapter
.
refreshData
();
binding
.
msgList
.
setSelection
(
channelMsgAdapter
.
getCount
()
-
1
);
}
});
...
...
@@ -71,6 +68,7 @@ public class ConnectChannelFragment extends Fragment {
loginViewModel
.
addChannelMsg
(
messageContent
);
ToastUtil
.
show
(
getContext
(),
"send Success"
);
}
@Override
public
void
onFailed
(
int
errorCode
)
{
ToastUtil
.
show
(
getContext
(),
"send onFailed :"
+
errorCode
);
...
...
@@ -82,7 +80,9 @@ public class ConnectChannelFragment extends Fragment {
CCIMClient
.
getInstance
().
getChannelMessage
(
channelId
,
new
ResultEventCallback
<
List
<
MessageContent
>>()
{
@Override
public
void
onSuccess
(
List
<
MessageContent
>
messageContents
)
{
loginViewModel
.
addChannelMsg
(
messageContents
);
list
.
addAll
(
messageContents
);
channelMsgAdapter
.
refreshData
();
binding
.
msgList
.
setSelection
(
channelMsgAdapter
.
getCount
()
-
1
);
}
@Override
...
...
@@ -95,7 +95,7 @@ public class ConnectChannelFragment extends Fragment {
@Override
public
boolean
onTouch
(
View
v
,
MotionEvent
event
)
{
if
(
event
.
getAction
()
==
MotionEvent
.
ACTION_UP
)
{
CCIMClient
.
getInstance
().
stopAndSendChannelAudioMessage
(
channelId
,
new
ResultEventCallback
<
MessageContent
>(){
CCIMClient
.
getInstance
().
stopAndSendChannelAudioMessage
(
channelId
,
new
ResultEventCallback
<
MessageContent
>()
{
@Override
public
void
onSuccess
(
MessageContent
message
)
{
binding
.
sendEdit
.
setText
(
""
);
...
...
@@ -105,7 +105,7 @@ public class ConnectChannelFragment extends Fragment {
@Override
public
void
onFailed
(
int
errorCode
)
{
ToastUtil
.
show
(
getContext
(),
"send onFailed :"
+
errorCode
);
ToastUtil
.
show
(
getContext
(),
"send onFailed :"
+
errorCode
);
}
});
}
...
...
app/src/main/res/layout/activity_login.xml
View file @
02d6dcc9
...
...
@@ -69,7 +69,7 @@
android:layout_height=
"wrap_content"
android:layout_marginTop=
"8dp"
android:hint=
"ip"
android:text=
"10
.4.5.134
"
android:text=
"10
6.15.237.67
"
android:imeActionLabel=
"@string/action_sign_in_short"
android:imeOptions=
"actionDone"
android:selectAllOnFocus=
"true"
...
...
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