From d7346e478a2658c7a69b3fb9a8050c06d0e1d99d Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Mon, 1 Jun 2026 07:54:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0=E5=86=B2=E7=AA=81?= =?UTF-8?q?=EF=BC=8C=E8=81=94=E7=B3=BB=E4=BA=BA=E5=88=97=E8=A1=A8=E5=85=88?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=90=8E=E7=BD=91=E7=BB=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alarm/list/AlarmListActivity.java | 6 +- .../contact/list/ContactListActivity.java | 8 +++ .../contact/list/ContactListViewModel.java | 65 +++++-------------- .../main/res/layout/activity_contact_list.xml | 5 +- 4 files changed, 32 insertions(+), 52 deletions(-) diff --git a/app/src/main/java/com/ttstd/dialer/activity/alarm/list/AlarmListActivity.java b/app/src/main/java/com/ttstd/dialer/activity/alarm/list/AlarmListActivity.java index 9cc2e88..f3c94fd 100644 --- a/app/src/main/java/com/ttstd/dialer/activity/alarm/list/AlarmListActivity.java +++ b/app/src/main/java/com/ttstd/dialer/activity/alarm/list/AlarmListActivity.java @@ -3,8 +3,10 @@ package com.ttstd.dialer.activity.alarm.list; import android.content.Intent; import android.view.View; +import androidx.annotation.NonNull; import androidx.lifecycle.Observer; import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.kongzue.dialogx.dialogs.MessageDialog; @@ -100,9 +102,9 @@ public class AlarmListActivity extends BaseMvvmActivity= 0); } diff --git a/app/src/main/java/com/ttstd/dialer/activity/contact/list/ContactListActivity.java b/app/src/main/java/com/ttstd/dialer/activity/contact/list/ContactListActivity.java index 2d97f67..bfd92ec 100644 --- a/app/src/main/java/com/ttstd/dialer/activity/contact/list/ContactListActivity.java +++ b/app/src/main/java/com/ttstd/dialer/activity/contact/list/ContactListActivity.java @@ -8,6 +8,7 @@ import androidx.annotation.NonNull; import androidx.lifecycle.Observer; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.kongzue.dialogx.dialogs.TipDialog; @@ -146,6 +147,13 @@ public class ContactListActivity extends BaseMvvmActivity= 0); + } + }); } @Override diff --git a/app/src/main/java/com/ttstd/dialer/activity/contact/list/ContactListViewModel.java b/app/src/main/java/com/ttstd/dialer/activity/contact/list/ContactListViewModel.java index c21799f..bbbe0b9 100644 --- a/app/src/main/java/com/ttstd/dialer/activity/contact/list/ContactListViewModel.java +++ b/app/src/main/java/com/ttstd/dialer/activity/contact/list/ContactListViewModel.java @@ -42,44 +42,7 @@ public class ContactListViewModel extends BaseViewModel> mContactListData = new MutableLiveData<>(); public void getAllContacts() { - mContactManager.getContacts(getLifecycle(), new ContactManager.ContactCallback() { - @Override - public void onSuccess(List contacts) { - Logger.e(TAG, "获取联系人成功: " + contacts.size()); - mContactListData.setValue(contacts); - } - - @Override - public void onFailure(Throwable e) { - Logger.e(TAG, "获取联系人失败: " + e.getMessage()); - mContactListData.setValue(null); - } - }); - -// OkHttpManager.getInstance().getContactListObservable(getLifecycle()) -// .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY)) -// .subscribe(new BaseObserver>>() { -// @Override -// public void onSuccess(BaseResponse> listBaseResponse) { -// Log.e("getAllContacts", "onSuccess: " + listBaseResponse); -// if (listBaseResponse.isSuccess()) { -// List contactInfos = listBaseResponse.getData(); -// List sorted = contactInfos.stream().sorted(new Comparator() { -// @Override -// public int compare(ContactInfo t0, ContactInfo t1) { -// return Integer.compare(t0.getPosition(), t1.getPosition()); -// } -// }).collect(Collectors.toList()); -// mContactListData.setValue(sorted); -// } -// } -// -// @Override -// public void onFailure(Throwable e) { -// Log.e("getAllContacts", "onFailure: " + e.getMessage()); -// mContactListData.setValue(null); -// } -// }); + getAllContactsFromDB(); } private void getAllContactsFromDB() { @@ -102,15 +65,7 @@ public class ContactListViewModel extends BaseViewModel contactInfos) { Logger.e("getAllContacts", "onNext: "); -// mContactListData.setValue(contactInfos); - -// List sorted = contacts.stream().sorted(new Comparator() { -// @Override -// public int compare(Contact o1, Contact o2) { -// return Integer.compare(o1.getSort(), o2.getSort()); -// } -// }).collect(Collectors.toList()); -// mContactListData.setValue(sorted); + mContactListData.setValue(contactInfos); } @Override @@ -121,10 +76,26 @@ public class ContactListViewModel extends BaseViewModel contacts) { + Logger.e(TAG, "获取网络联系人成功: " + contacts.size()); + mContactListData.setValue(contacts); + } + + @Override + public void onFailure(Throwable e) { + Logger.e(TAG, "获取网络联系人失败: " + e.getMessage()); + } + }); + } + public void updateItemPosition(ContactInfo contactInfo) { Logger.e(TAG, "updateItemPosition: " + contactInfo); Observable.create(new ObservableOnSubscribe() { diff --git a/app/src/main/res/layout/activity_contact_list.xml b/app/src/main/res/layout/activity_contact_list.xml index b091856..7127465 100644 --- a/app/src/main/res/layout/activity_contact_list.xml +++ b/app/src/main/res/layout/activity_contact_list.xml @@ -37,8 +37,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" - android:singleLine="true" android:onClick="@{click::testContact}" + android:singleLine="true" android:text="联系人" android:textColor="@color/black" android:textSize="@dimen/sp_22" @@ -72,8 +72,7 @@ + android:layout_height="match_parent" />