Commit 1f2ac88d authored by sheteng's avatar sheteng

Merge remote-tracking branch 'origin/master'

parents 24778a77 a8f8cfd0
......@@ -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
......
......@@ -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).getUnReadMsgNum().toString());
childrenHolder.unReadMsg.setText("unReadMsg : " + dataList.get(position).getUnreadCount().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.setUnReadMsgNum(0L);
dialog.setUnreadCount(0L);
}
});
return convertView;
......
......@@ -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());
}
}
......
......@@ -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.setUnReadMsgNum(offlineMessageCountByUserId == null ? 0 : offlineMessageCountByUserId);
dialog.setUnreadCount(offlineMessageCountByUserId == null ? 0 : offlineMessageCountByUserId);
}
resultEventCallback.onSuccess(new PullContactsRes(contactGroups.values(), contacts.values(), dialogs.values(), blocklist));
}
......
......@@ -11,14 +11,14 @@ public class Dialog {
private NetStatus netStatus = NetStatus.NET_STATUS_ONLINE;
private String extData;
private Long readMsgId;
private Long unReadMsgNum;
private Long unreadCount = 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() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment