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
1f2ac88d
Commit
1f2ac88d
authored
Aug 30, 2022
by
sheteng
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
24778a77
a8f8cfd0
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
9 deletions
+23
-9
app/android.keystore
app/android.keystore
+0
-0
app/build.gradle
app/build.gradle
+14
-0
app/src/main/java/com/ccwangluo/im/adapter/DialogAdapter.java
...src/main/java/com/ccwangluo/im/adapter/DialogAdapter.java
+2
-2
app/src/main/java/com/ccwangluo/im/ui/dashboard/ContactsFragment.java
.../java/com/ccwangluo/im/ui/dashboard/ContactsFragment.java
+1
-1
ccim/src/main/java/com/ccwangluo/ccim/manage/ContactManager.java
...c/main/java/com/ccwangluo/ccim/manage/ContactManager.java
+1
-1
ccim/src/main/java/com/ccwangluo/ccim/modle/Dialog.java
ccim/src/main/java/com/ccwangluo/ccim/modle/Dialog.java
+5
-5
No files found.
app/android.keystore
0 → 100644
View file @
1f2ac88d
File added
app/build.gradle
View file @
1f2ac88d
...
...
@@ -6,6 +6,15 @@ android {
compileSdkVersion
30
buildToolsVersion
"30.0.3"
signingConfigs
{
config
{
keyAlias
'android.keystore'
keyPassword
'123456'
storeFile
file
(
'android.keystore'
)
storePassword
'123456'
}
}
defaultConfig
{
applicationId
"com.ccwangluo.xiyuan22"
minSdkVersion
24
...
...
@@ -18,9 +27,14 @@ android {
buildTypes
{
release
{
signingConfig
signingConfigs
.
config
minifyEnabled
false
proguardFiles
getDefaultProguardFile
(
'proguard-android-optimize.txt'
),
'proguard-rules.pro'
}
debug
{
signingConfig
signingConfigs
.
config
minifyEnabled
false
}
}
compileOptions
{
sourceCompatibility
JavaVersion
.
VERSION_1_8
...
...
app/src/main/java/com/ccwangluo/im/adapter/DialogAdapter.java
View file @
1f2ac88d
...
...
@@ -82,7 +82,7 @@ public class DialogAdapter extends BaseAdapter {
childrenHolder
.
contactName
.
setText
(
"username: "
+
dataList
.
get
(
position
).
getContactUserName
());
childrenHolder
.
netStatus
.
setText
(
"netStatus: "
+
dataList
.
get
(
position
).
getNetStatus
().
toString
());
// childrenHolder.status.setText("status: " + dataList.get(childPosition).);
childrenHolder
.
unReadMsg
.
setText
(
"unReadMsg : "
+
dataList
.
get
(
position
).
getUn
ReadMsgNum
().
toString
());
childrenHolder
.
unReadMsg
.
setText
(
"unReadMsg : "
+
dataList
.
get
(
position
).
getUn
readCount
().
toString
());
convertView
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
...
...
@@ -93,7 +93,7 @@ public class DialogAdapter extends BaseAdapter {
contact
.
setContactUserName
(
dialog
.
getContactUserName
());
intent
.
putExtra
(
"contact"
,
contact
);
context
.
startActivity
(
intent
);
dialog
.
setUn
ReadMsgNum
(
0L
);
dialog
.
setUn
readCount
(
0L
);
}
});
return
convertView
;
...
...
app/src/main/java/com/ccwangluo/im/ui/dashboard/ContactsFragment.java
View file @
1f2ac88d
...
...
@@ -122,7 +122,7 @@ public class ContactsFragment extends Fragment {
@Override
public
void
onSuccess
(
SearchRes
searchRes
)
{
int
total
=
searchRes
.
getTotal
();
if
(
searchRes
.
getUsers
().
size
()
>
0
)
{
if
(
searchRes
.
getUsers
()
!=
null
&&
searchRes
.
getUsers
()
.
size
()
>
0
)
{
showSearchResultdialog
(
searchRes
.
getUsers
());
}
}
...
...
ccim/src/main/java/com/ccwangluo/ccim/manage/ContactManager.java
View file @
1f2ac88d
...
...
@@ -102,7 +102,7 @@ public class ContactManager {
for
(
Long
aLong
:
dialogs
.
keySet
())
{
Dialog
dialog
=
dialogs
.
get
(
aLong
);
Long
offlineMessageCountByUserId
=
messageManager
.
getOfflineMessageCountByUserId
(
aLong
,
dialog
.
getReadMsgId
());
dialog
.
setUn
ReadMsgNum
(
offlineMessageCountByUserId
==
null
?
0
:
offlineMessageCountByUserId
);
dialog
.
setUn
readCount
(
offlineMessageCountByUserId
==
null
?
0
:
offlineMessageCountByUserId
);
}
resultEventCallback
.
onSuccess
(
new
PullContactsRes
(
contactGroups
.
values
(),
contacts
.
values
(),
dialogs
.
values
(),
blocklist
));
}
...
...
ccim/src/main/java/com/ccwangluo/ccim/modle/Dialog.java
View file @
1f2ac88d
...
...
@@ -11,14 +11,14 @@ public class Dialog {
private
NetStatus
netStatus
=
NetStatus
.
NET_STATUS_ONLINE
;
private
String
extData
;
private
Long
readMsgId
;
private
Long
un
ReadMsgNum
;
private
Long
un
readCount
=
0L
;
public
Long
getUnReadMsgNum
(
)
{
return
unReadMsgNum
;
public
void
setUnreadCount
(
Long
unreadCount
)
{
this
.
unreadCount
=
unreadCount
;
}
public
void
setUnReadMsgNum
(
Long
unReadMsgNum
)
{
this
.
unReadMsgNum
=
unReadMsgNum
;
public
Long
getUnreadCount
(
)
{
return
unreadCount
;
}
public
Long
getReadMsgId
()
{
...
...
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