更改目录结构,增加拖动排序并更新数据库
This commit is contained in:
1 parent
80f7e47511
commit
70fd325c00
11 files changed
+199
-49
No files matched your search
@@ -7,7 +7,6 @@ import androidx.lifecycle.Observer;
|
||||
|
||||
import com.ttstd.dialer.R;
|
||||
import com.ttstd.dialer.base.mvvm.BaseMvvmActivity;
|
||||
import com.ttstd.dialer.contact.Contact;
|
||||
import com.ttstd.dialer.databinding.ActivityContactAddBinding;
|
||||
import com.ttstd.dialer.filter.NoSpaceInputFilter;
|
||||
|
||||
@@ -58,8 +57,7 @@ public class ContactAddActivity extends BaseMvvmActivity<ContactAddViewModel, Ac
|
||||
public void save(View view) {
|
||||
String name = mViewDataBinding.etName.getText().toString();
|
||||
String phone = mViewDataBinding.etPhone.getText().toString();
|
||||
Contact contact = new Contact(name, phone);
|
||||
mViewModel.insert(contact);
|
||||
mViewModel.saveContact(name, phone);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,13 +5,21 @@ import android.util.Log;
|
||||
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
|
||||
import com.trello.rxlifecycle4.RxLifecycle;
|
||||
import com.trello.rxlifecycle4.android.ActivityEvent;
|
||||
import com.ttstd.dialer.base.mvvm.BaseViewModel;
|
||||
import com.ttstd.dialer.contact.Contact;
|
||||
import com.ttstd.dialer.contact.ContactRepository;
|
||||
import com.ttstd.dialer.databinding.ActivityContactAddBinding;
|
||||
import com.ttstd.dialer.db.contact.Contact;
|
||||
import com.ttstd.dialer.db.contact.ContactRepository;
|
||||
|
||||
import java.util.List;
|
||||
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
|
||||
import io.reactivex.rxjava3.annotations.NonNull;
|
||||
import io.reactivex.rxjava3.core.Observable;
|
||||
import io.reactivex.rxjava3.core.ObservableEmitter;
|
||||
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
|
||||
import io.reactivex.rxjava3.core.Observer;
|
||||
import io.reactivex.rxjava3.disposables.Disposable;
|
||||
import io.reactivex.rxjava3.schedulers.Schedulers;
|
||||
|
||||
public class ContactAddViewModel extends BaseViewModel<ActivityContactAddBinding, ActivityEvent> {
|
||||
private static final String TAG = "ContactAddViewModel";
|
||||
@@ -25,9 +33,41 @@ public class ContactAddViewModel extends BaseViewModel<ActivityContactAddBinding
|
||||
|
||||
public MutableLiveData<Long> mIntegerMutableLiveData = new MutableLiveData<>();
|
||||
|
||||
public void insert(Contact contact) {
|
||||
Log.e(TAG, "insert: " );
|
||||
mIntegerMutableLiveData.setValue(mRepository.insert(contact));
|
||||
public void saveContact(String name, String phone) {
|
||||
Observable.create(new ObservableOnSubscribe<Long>() {
|
||||
@Override
|
||||
public void subscribe(@NonNull ObservableEmitter<Long> emitter) throws Throwable {
|
||||
int count = mRepository.getTotalCount() + 1;
|
||||
Contact contact = new Contact(name, phone, count);
|
||||
Log.e(TAG, "saveContact: " + contact);
|
||||
emitter.onNext(mRepository.insert(contact));
|
||||
emitter.onComplete();
|
||||
}
|
||||
}).compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new Observer<Long>() {
|
||||
@Override
|
||||
public void onSubscribe(@NonNull Disposable d) {
|
||||
Log.e("saveContact", "onSubscribe: ");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(@NonNull Long aLong) {
|
||||
Log.e("saveContact", "onNext: " + aLong);
|
||||
mIntegerMutableLiveData.setValue(aLong);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(@NonNull Throwable e) {
|
||||
Log.e("saveContact", "onError: " + e.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onComplete() {
|
||||
Log.e("saveContact", "onComplete: ");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
@@ -7,14 +7,13 @@ import android.view.View;
|
||||
import androidx.lifecycle.Observer;
|
||||
import androidx.recyclerview.widget.ItemTouchHelper;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.ttstd.dialer.R;
|
||||
import com.ttstd.dialer.activity.contact.add.ContactAddActivity;
|
||||
import com.ttstd.dialer.adapter.ContactInfoAdapter;
|
||||
import com.ttstd.dialer.base.mvvm.BaseMvvmActivity;
|
||||
import com.ttstd.dialer.contact.Contact;
|
||||
import com.ttstd.dialer.databinding.ActivityContactListBinding;
|
||||
import com.ttstd.dialer.db.contact.Contact;
|
||||
import com.ttstd.dialer.view.ItemTouchHelperCallback;
|
||||
|
||||
import java.util.List;
|
||||
@@ -25,6 +24,8 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
|
||||
|
||||
private ContactInfoAdapter mContactInfoAdapter;
|
||||
|
||||
private List<Contact> mContacts;
|
||||
|
||||
@Override
|
||||
public boolean setNightMode() {
|
||||
return true;
|
||||
@@ -54,12 +55,21 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
|
||||
mContactInfoAdapter.setItemMoveCallback(new ContactInfoAdapter.ItemMoveCallback() {
|
||||
@Override
|
||||
public void onItemMove(int fromPosition, int toPosition) {
|
||||
Log.e(TAG, "onItemMove: " );
|
||||
Log.e(TAG, "onItemMove: ");
|
||||
Contact fromContact = mContacts.get(fromPosition);
|
||||
int fromContactPosition = fromContact.getPosition();
|
||||
Contact toContact = mContacts.get(toPosition);
|
||||
int toContactPosition = toContact.getPosition();
|
||||
fromContact.setPosition(toContactPosition);
|
||||
mViewModel.updateItemPosition(fromContact);
|
||||
toContact.setPosition(fromContactPosition);
|
||||
mViewModel.updateItemPosition(toContact);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onItemRemoved(int position) {
|
||||
Log.e(TAG, "onItemRemoved: " );
|
||||
Log.e(TAG, "onItemRemoved: ");
|
||||
|
||||
}
|
||||
});
|
||||
// 设置ItemTouchHelper,实现拖动和滑动删除
|
||||
@@ -78,8 +88,9 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
|
||||
mViewModel.mContactListData.observe(this, new Observer<List<Contact>>() {
|
||||
@Override
|
||||
public void onChanged(List<Contact> contacts) {
|
||||
Log.e(TAG, "onChanged: " + contacts);
|
||||
mContactInfoAdapter.setContacts(contacts);
|
||||
Log.e(TAG, "mContactListData: " + contacts);
|
||||
mContacts = contacts;
|
||||
mContactInfoAdapter.setContacts(mContacts);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
+83
-12
@@ -1,18 +1,27 @@
|
||||
package com.ttstd.dialer.activity.contact.list;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
|
||||
import com.trello.rxlifecycle4.RxLifecycle;
|
||||
import com.trello.rxlifecycle4.android.ActivityEvent;
|
||||
import com.ttstd.dialer.base.mvvm.BaseViewModel;
|
||||
import com.ttstd.dialer.contact.Contact;
|
||||
import com.ttstd.dialer.contact.ContactRepository;
|
||||
import com.ttstd.dialer.databinding.ActivityContactListBinding;
|
||||
import com.ttstd.dialer.db.contact.Contact;
|
||||
import com.ttstd.dialer.db.contact.ContactRepository;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
|
||||
import io.reactivex.rxjava3.annotations.NonNull;
|
||||
import io.reactivex.rxjava3.core.Observable;
|
||||
import io.reactivex.rxjava3.core.ObservableEmitter;
|
||||
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
|
||||
import io.reactivex.rxjava3.core.Observer;
|
||||
import io.reactivex.rxjava3.disposables.Disposable;
|
||||
import io.reactivex.rxjava3.schedulers.Schedulers;
|
||||
|
||||
public class ContactListViewModel extends BaseViewModel<ActivityContactListBinding, ActivityEvent> {
|
||||
private static final String TAG = "ContactListViewModel";
|
||||
@@ -27,19 +36,81 @@ public class ContactListViewModel extends BaseViewModel<ActivityContactListBindi
|
||||
public MutableLiveData<List<Contact>> mContactListData = new MutableLiveData<>();
|
||||
|
||||
public void getAllContacts() {
|
||||
List<Contact> contacts = mRepository.getAllContacts();
|
||||
List<Contact> sorted = contacts.stream().sorted(new Comparator<Contact>() {
|
||||
Observable.create(new ObservableOnSubscribe<List<Contact>>() {
|
||||
@Override
|
||||
public int compare(Contact o1, Contact o2) {
|
||||
return Integer.compare(o1.getSort(), o2.getSort());
|
||||
public void subscribe(@NonNull ObservableEmitter<List<Contact>> emitter) throws Throwable {
|
||||
List<Contact> contacts = mRepository.getAllContacts();
|
||||
emitter.onNext(contacts);
|
||||
emitter.onComplete();
|
||||
}
|
||||
}).collect(Collectors.toList());
|
||||
}).compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new Observer<List<Contact>>() {
|
||||
@Override
|
||||
public void onSubscribe(@NonNull Disposable d) {
|
||||
Log.e("getAllContacts", "onSubscribe: ");
|
||||
}
|
||||
|
||||
mContactListData.setValue(sorted);
|
||||
@Override
|
||||
public void onNext(@NonNull List<Contact> contacts) {
|
||||
Log.e("getAllContacts", "onNext: ");
|
||||
mContactListData.setValue(contacts);
|
||||
|
||||
// List<Contact> sorted = contacts.stream().sorted(new Comparator<Contact>() {
|
||||
// @Override
|
||||
// public int compare(Contact o1, Contact o2) {
|
||||
// return Integer.compare(o1.getSort(), o2.getSort());
|
||||
// }
|
||||
// }).collect(Collectors.toList());
|
||||
// mContactListData.setValue(sorted);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(@NonNull Throwable e) {
|
||||
Log.e("getAllContacts", "onError: " + e.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onComplete() {
|
||||
Log.e("getAllContacts", "onComplete: ");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public List<Contact> searchContacts(String query) {
|
||||
return mRepository.searchContacts(query);
|
||||
public void updateItemPosition(Contact contact) {
|
||||
Log.e(TAG, "updateItemPosition: " + contact);
|
||||
Observable.create(new ObservableOnSubscribe<Integer>() {
|
||||
@Override
|
||||
public void subscribe(@NonNull ObservableEmitter<Integer> emitter) throws Throwable {
|
||||
int id = mRepository.update(contact);
|
||||
emitter.onNext(id);
|
||||
emitter.onComplete();
|
||||
}
|
||||
}).compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new Observer<Integer>() {
|
||||
@Override
|
||||
public void onSubscribe(@NonNull Disposable d) {
|
||||
Log.e("updateItemPosition", "onComplete: ");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(@NonNull Integer integer) {
|
||||
Log.e("updateItemPosition", "onNext: " + integer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(@NonNull Throwable e) {
|
||||
Log.e("updateItemPosition", "onError: " + e.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onComplete() {
|
||||
Log.e("updateItemPosition", "onComplete: ");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user