增加app在内外显示,支持长按显示隐藏,优化命名,主页app显示还有问题

This commit is contained in:
tongtong committed 2025-11-03 08:56:21 +08:00
1 parent 552ec8dbe9
commit 8dc284c2f3
38 files changed
+1265 -290

No files matched your search

@@ -8,9 +8,9 @@ import com.tencent.mmkv.MMKV;
import com.ttstd.dialer.R;
import com.ttstd.dialer.adapter.MoreAppAdapter;
import com.ttstd.dialer.base.mvvm.BaseMvvmActivity;
import com.ttstd.dialer.db.app.DesktopSortApp;
import com.ttstd.dialer.config.CommonConfig;
import com.ttstd.dialer.databinding.ActivityAppListBinding;
import com.ttstd.dialer.db.app.AppInfo;
import java.util.List;
@@ -48,6 +48,13 @@ public class AppListActivity extends BaseMvvmActivity<AppListViewModel, Activity
@Override
protected void initView() {
mMoreAppAdapter = new MoreAppAdapter(LoaderManager.getInstance(this));
mMoreAppAdapter.setShortcutCallback(new MoreAppAdapter.ShortcutCallback() {
@Override
public void setAppOutside(AppInfo appInfo) {
appInfo.setOutside(1);
mViewModel.updateAppInfo(appInfo);
}
});
mViewDataBinding.recyclerView.setLayoutManager(new GridLayoutManager(this, 3));
mViewDataBinding.recyclerView.setAdapter(mMoreAppAdapter);
@@ -55,15 +62,24 @@ public class AppListActivity extends BaseMvvmActivity<AppListViewModel, Activity
@Override
protected void initData() {
mViewModel.mDesktopSortAppData.observe(this, new Observer<List<DesktopSortApp>>() {
mViewModel.mDesktopSortAppData.observe(this, new Observer<List<AppInfo>>() {
@Override
public void onChanged(List<DesktopSortApp> desktopSortApps) {
mMoreAppAdapter.setDesktopSortApps(desktopSortApps);
public void onChanged(List<AppInfo> appInfos) {
mMoreAppAdapter.setAppInfos(appInfos);
}
});
// mViewModel.getLauncherAppList();
mViewModel.getDbAppList();
mViewModel.mAppUpdateData.observe(this, new Observer<Integer>() {
@Override
public void onChanged(Integer integer) {
if (integer > 0) {
}
mViewModel.getDbAppList();
}
});
}
@@ -11,8 +11,8 @@ import com.trello.rxlifecycle4.RxLifecycle;
import com.trello.rxlifecycle4.android.ActivityEvent;
import com.ttstd.dialer.base.mvvm.BaseViewModel;
import com.ttstd.dialer.databinding.ActivityAppListBinding;
import com.ttstd.dialer.db.app.AppInfo;
import com.ttstd.dialer.db.app.AppRepository;
import com.ttstd.dialer.db.app.DesktopSortApp;
import com.ttstd.dialer.utils.ApkUtils;
import java.text.Collator;
@@ -41,27 +41,27 @@ public class AppListViewModel extends BaseViewModel<ActivityAppListBinding, Acti
mAppRepository = new AppRepository(context);
}
public MutableLiveData<List<DesktopSortApp>> mDesktopSortAppData = new MutableLiveData<>();
public MutableLiveData<List<AppInfo>> mDesktopSortAppData = new MutableLiveData<>();
public void getDbAppList() {
Observable.fromCallable(new Callable<List<DesktopSortApp>>() {
Observable.fromCallable(new Callable<List<AppInfo>>() {
@Override
public List<DesktopSortApp> call() throws Exception {
return mAppRepository.getAllApp();
public List<AppInfo> call() throws Exception {
return mAppRepository.getInsideApp();
}
}).compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<List<DesktopSortApp>>() {
.subscribe(new Observer<List<AppInfo>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Log.e("getDbAppList", "onSubscribe: ");
}
@Override
public void onNext(@NonNull List<DesktopSortApp> desktopSortApps) {
Log.e("getDbAppList", "onNext: " + desktopSortApps);
mDesktopSortAppData.setValue(desktopSortApps);
public void onNext(@NonNull List<AppInfo> appInfos) {
Log.e("getDbAppList", "onNext: " + appInfos);
mDesktopSortAppData.setValue(appInfos);
}
@Override
@@ -74,80 +74,41 @@ public class AppListViewModel extends BaseViewModel<ActivityAppListBinding, Acti
Log.e("getDbAppList", "onComplete: ");
}
});
}
public void getLauncherAppList() {
Observable.fromCallable(new Callable<List<ResolveInfo>>() {
public MutableLiveData<Integer> mAppUpdateData = new MutableLiveData<>();
public void updateAppInfo(AppInfo appInfo){
Observable.fromCallable(new Callable<Integer>() {
@Override
public List<ResolveInfo> call() throws Exception {
return ApkUtils.getAllLauncherResolveInfo(getSafeContext());
public Integer call() throws Exception {
return mAppRepository.update(appInfo);
}
})
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribeOn(Schedulers.io())
.map(new Function<List<ResolveInfo>, List<ComponentName>>() {
@Override
public List<ComponentName> apply(List<ResolveInfo> resolveInfos) throws Throwable {
List<ComponentName> componentNames = resolveInfos.stream().map(new java.util.function.Function<ResolveInfo, ComponentName>() {
@Override
public ComponentName apply(ResolveInfo resolveInfo) {
String packageName = resolveInfo.activityInfo.packageName;
String className = resolveInfo.activityInfo.name;
ComponentName componentName = new ComponentName(packageName, className);
return componentName;
}
}).collect(Collectors.toList());
return componentNames;
}
})
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribeOn(Schedulers.io())
.map(new Function<List<ComponentName>, List<DesktopSortApp>>() {
@Override
public List<DesktopSortApp> apply(List<ComponentName> componentNames) throws Throwable {
List<DesktopSortApp> desktopSortApps = componentNames.stream().map(new java.util.function.Function<ComponentName, DesktopSortApp>() {
@Override
public DesktopSortApp apply(ComponentName componentName) {
DesktopSortApp desktopSortApp = new DesktopSortApp(getSafeContext(), componentName);
return desktopSortApp;
}
}).sorted(new Comparator<DesktopSortApp>() {
@Override
public int compare(DesktopSortApp o1, DesktopSortApp o2) {
return Collator.getInstance(Locale.CHINESE).compare(o1.getLabel(), o2.getLabel());
}
}).collect(Collectors.toList());
return desktopSortApps;
}
})
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
}).compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<List<DesktopSortApp>>() {
.subscribe(new Observer<Integer>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Log.e("updateAppInfo", "onSubscribe: ");
}
@Override
public void onNext(@NonNull List<DesktopSortApp> desktopSortApps) {
Log.e(TAG, "getLauncherAppList" + "onNext: " + desktopSortApps);
mDesktopSortAppData.setValue(desktopSortApps);
public void onNext(@NonNull Integer row) {
Log.e("updateAppInfo", "onNext: " + row);
mAppUpdateData.setValue(row);
}
@Override
public void onError(@NonNull Throwable e) {
Log.e("updateAppInfo", "onError: " + e.getMessage());
}
@Override
public void onComplete() {
Log.e("updateAppInfo", "onComplete: ");
}
});
}
}
@@ -9,7 +9,7 @@ import com.trello.rxlifecycle4.RxLifecycle;
import com.trello.rxlifecycle4.android.ActivityEvent;
import com.ttstd.dialer.base.mvvm.BaseViewModel;
import com.ttstd.dialer.databinding.ActivityContactAddBinding;
import com.ttstd.dialer.db.contact.Contact;
import com.ttstd.dialer.db.contact.ContactInfo;
import com.ttstd.dialer.db.contact.ContactRepository;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
@@ -38,9 +38,9 @@ public class ContactAddViewModel extends BaseViewModel<ActivityContactAddBinding
@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));
ContactInfo contactInfo = new ContactInfo(name, phone, count);
Log.e(TAG, "saveContact: " + contactInfo);
emitter.onNext(mRepository.insert(contactInfo));
emitter.onComplete();
}
}).compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
@@ -1,14 +1,11 @@
package com.ttstd.dialer.activity.contact.list;
import android.Manifest;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.util.Log;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import androidx.lifecycle.Observer;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -18,7 +15,7 @@ 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.databinding.ActivityContactListBinding;
import com.ttstd.dialer.db.contact.Contact;
import com.ttstd.dialer.db.contact.ContactInfo;
import com.ttstd.dialer.fragment.dialog.call.CallFragment;
import com.ttstd.dialer.view.ItemTouchHelperCallback;
@@ -31,7 +28,7 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
private ContactInfoAdapter mContactInfoAdapter;
private List<Contact> mContacts;
private List<ContactInfo> mContactInfos;
@Override
public boolean setNightMode() {
@@ -63,14 +60,14 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
@Override
public void onItemMove(int fromPosition, int toPosition) {
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);
ContactInfo fromContactInfo = mContactInfos.get(fromPosition);
int fromContactPosition = fromContactInfo.getPosition();
ContactInfo toContactInfo = mContactInfos.get(toPosition);
int toContactPosition = toContactInfo.getPosition();
fromContactInfo.setPosition(toContactPosition);
mViewModel.updateItemPosition(fromContactInfo);
toContactInfo.setPosition(fromContactPosition);
mViewModel.updateItemPosition(toContactInfo);
}
@Override
@@ -81,8 +78,8 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
});
mContactInfoAdapter.setOnClickListener(new ContactInfoAdapter.OnClickListener() {
@Override
public void onClick(Contact contact) {
new CallFragment(contact).show(getSupportFragmentManager(), "CallFragment");
public void onClick(ContactInfo contactInfo) {
new CallFragment(contactInfo).show(getSupportFragmentManager(), "CallFragment");
}
});
// 设置ItemTouchHelper,实现拖动和滑动删除
@@ -98,12 +95,12 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
@Override
protected void initData() {
mViewModel.mContactListData.observe(this, new Observer<List<Contact>>() {
mViewModel.mContactListData.observe(this, new Observer<List<ContactInfo>>() {
@Override
public void onChanged(List<Contact> contacts) {
Log.e(TAG, "mContactListData: " + contacts);
mContacts = contacts;
mContactInfoAdapter.setContacts(mContacts);
public void onChanged(List<ContactInfo> contactInfos) {
Log.e(TAG, "mContactListData: " + contactInfos);
mContactInfos = contactInfos;
mContactInfoAdapter.setContactInfos(mContactInfos);
}
});
}
@@ -9,7 +9,7 @@ import com.trello.rxlifecycle4.RxLifecycle;
import com.trello.rxlifecycle4.android.ActivityEvent;
import com.ttstd.dialer.base.mvvm.BaseViewModel;
import com.ttstd.dialer.databinding.ActivityContactListBinding;
import com.ttstd.dialer.db.contact.Contact;
import com.ttstd.dialer.db.contact.ContactInfo;
import com.ttstd.dialer.db.contact.ContactRepository;
import java.util.List;
@@ -33,29 +33,29 @@ public class ContactListViewModel extends BaseViewModel<ActivityContactListBindi
mRepository = new ContactRepository(context);
}
public MutableLiveData<List<Contact>> mContactListData = new MutableLiveData<>();
public MutableLiveData<List<ContactInfo>> mContactListData = new MutableLiveData<>();
public void getAllContacts() {
Observable.create(new ObservableOnSubscribe<List<Contact>>() {
Observable.create(new ObservableOnSubscribe<List<ContactInfo>>() {
@Override
public void subscribe(@NonNull ObservableEmitter<List<Contact>> emitter) throws Throwable {
List<Contact> contacts = mRepository.getAllContacts();
emitter.onNext(contacts);
public void subscribe(@NonNull ObservableEmitter<List<ContactInfo>> emitter) throws Throwable {
List<ContactInfo> contactInfos = mRepository.getAllContacts();
emitter.onNext(contactInfos);
emitter.onComplete();
}
}).compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<List<Contact>>() {
.subscribe(new Observer<List<ContactInfo>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Log.e("getAllContacts", "onSubscribe: ");
}
@Override
public void onNext(@NonNull List<Contact> contacts) {
public void onNext(@NonNull List<ContactInfo> contactInfos) {
Log.e("getAllContacts", "onNext: ");
mContactListData.setValue(contacts);
mContactListData.setValue(contactInfos);
// List<Contact> sorted = contacts.stream().sorted(new Comparator<Contact>() {
// @Override
@@ -78,12 +78,12 @@ public class ContactListViewModel extends BaseViewModel<ActivityContactListBindi
});
}
public void updateItemPosition(Contact contact) {
Log.e(TAG, "updateItemPosition: " + contact);
public void updateItemPosition(ContactInfo contactInfo) {
Log.e(TAG, "updateItemPosition: " + contactInfo);
Observable.create(new ObservableOnSubscribe<Integer>() {
@Override
public void subscribe(@NonNull ObservableEmitter<Integer> emitter) throws Throwable {
int id = mRepository.update(contact);
int id = mRepository.update(contactInfo);
emitter.onNext(id);
emitter.onComplete();
}
@@ -4,14 +4,19 @@ import android.util.Log;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.Observer;
import androidx.loader.app.LoaderManager;
import com.tencent.mmkv.MMKV;
import com.ttstd.dialer.R;
import com.ttstd.dialer.base.mvvm.BaseMvvmActivity;
import com.ttstd.dialer.config.CommonConfig;
import com.ttstd.dialer.databinding.ActivityMainBinding;
import com.ttstd.dialer.db.app.AppInfo;
import com.ttstd.dialer.fragment.app.AppFragment;
import com.ttstd.dialer.fragment.contact.ContactFragment;
import com.ttstd.dialer.fragment.home.HomeFragment;
import com.ttstd.dialer.view.ApkPagerAdapter;
import com.ttstd.dialer.view.BaseFragmentPagerAdapter;
import com.ttstd.dialer.view.ScaleCircleNavigator;
@@ -25,7 +30,8 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
protected MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
private FragmentManager mFragmentManager = getSupportFragmentManager();
private BaseFragmentPagerAdapter mBaseFragmentPagerAdapter;
// private BaseFragmentPagerAdapter mBaseFragmentPagerAdapter;
private ApkPagerAdapter mApkPagerAdapter;
private List<Fragment> mFragments = new ArrayList<>();
private HomeFragment mHomeFragment;
@@ -34,8 +40,12 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
private int mCurrentIndex = 0;
private int mFragmentSize = 0;
private int APK_PER_FRAGMENT = 9;
private ScaleCircleNavigator mScaleCircleNavigator;
private List<AppInfo> mAppInfos;
@Override
public boolean setNightMode() {
@@ -62,18 +72,21 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
@Override
protected void initView() {
// mBaseFragmentPagerAdapter = new BaseFragmentPagerAdapter(mFragmentManager, mFragments);
mApkPagerAdapter = new ApkPagerAdapter(mFragmentManager);
mScaleCircleNavigator = new ScaleCircleNavigator(this);
boolean contactHome = mMMKV.decodeBool(CommonConfig.CONTACT_HOME_PAGE, false);
if (!contactHome) {
mCurrentIndex += 1;
}
if (mContactFragment == null) {
mContactFragment = new ContactFragment();
mFragments.add(mContactFragment);
mFragmentSize += 1;
}
boolean contactHome = mMMKV.decodeBool(CommonConfig.CONTACT_HOME_PAGE, false);
if (!contactHome) {
mCurrentIndex += 1;
}
if (mHomeFragment == null) {
mHomeFragment = new HomeFragment();
mFragments.add(mHomeFragment);
@@ -91,28 +104,64 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
mViewDataBinding.viewPager.setCurrentItem(index);
}
});
mBaseFragmentPagerAdapter = new BaseFragmentPagerAdapter(mFragmentManager, mFragments);
mViewDataBinding.viewPager.setAdapter(mBaseFragmentPagerAdapter);
mViewDataBinding.viewPager.setAdapter(mApkPagerAdapter);
mViewDataBinding.viewPager.setOffscreenPageLimit(10);
mViewDataBinding.viewPager.setCurrentItem(mCurrentIndex);
mViewDataBinding.magicIndicator.setNavigator(mScaleCircleNavigator);
ViewPagerHelper.bind(mViewDataBinding.magicIndicator, mViewDataBinding.viewPager);
Log.e(TAG, "initView: mCurrentIndex = " + mCurrentIndex);
Log.e(TAG, "initView: mFragmentSize = " + mFragmentSize);
}
@Override
protected void initData() {
mViewModel.mDesktopSortAppData.observe(this, new Observer<List<AppInfo>>() {
@Override
public void onChanged(List<AppInfo> appInfos) {
mAppInfos = appInfos;
Log.e(TAG, "onChanged: mAppInfos size = " + mAppInfos.size());
setAppList();
}
});
mViewModel.getOutsideApp();
}
@Override
protected void onResume() {
super.onResume();
Log.e(TAG, "onResume: ");
setAppList();
mViewModel.getOutsideApp();
}
private void setAppList() {
Log.e(TAG, "setAppList: mFragments size = " + mFragments.size());
mFragments = mFragments.subList(0, mFragmentSize);
Log.e(TAG, "setAppList: subList mFragments size = " + mFragments.size());
int fragmentCount = (int) Math.ceil((double) mAppInfos.size() / APK_PER_FRAGMENT);
for (int i = 0; i < fragmentCount; i++) {
int start = i * APK_PER_FRAGMENT;
int end = Math.min(start + APK_PER_FRAGMENT, mAppInfos.size());
List<AppInfo> subList = new ArrayList<>(mAppInfos.subList(start, end));
Log.e(TAG, "setAppList: subList size = " + subList.size());
// AppFragment fragment = AppFragment.newInstance(subList);
AppFragment fragment = new AppFragment(subList);
fragment.setUpdateCallback(new AppFragment.UpdateCallback() {
@Override
public void onUpdate() {
mViewModel.getOutsideApp();
}
});
mFragments.add(fragment);
Log.e(TAG, "setAppList: add mFragments size = " + mFragments.size());
}
mScaleCircleNavigator.setCircleCount(mFragments.size());
mScaleCircleNavigator.notifyDataSetChanged();
mApkPagerAdapter.setFragments(mFragments);
mApkPagerAdapter.notifyDataSetChanged();
}
@@ -1,12 +1,28 @@
package com.ttstd.dialer.activity.main;
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.trello.rxlifecycle4.android.FragmentEvent;
import com.ttstd.dialer.base.mvvm.BaseViewModel;
import com.ttstd.dialer.databinding.ActivityMainBinding;
import com.ttstd.dialer.db.app.AppInfo;
import com.ttstd.dialer.db.app.AppRepository;
import java.util.List;
import java.util.concurrent.Callable;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.Observer;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.schedulers.Schedulers;
public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEvent> {
private static final String TAG = "MainViewModel";
@@ -18,4 +34,38 @@ public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEv
mAppRepository = new AppRepository(context);
}
public MutableLiveData<List<AppInfo>> mDesktopSortAppData = new MutableLiveData<>();
public void getOutsideApp() {
Observable.fromCallable(new Callable<List<AppInfo>>() {
@Override
public List<AppInfo> call() throws Exception {
return mAppRepository.getOutsideApp();
}
}).compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<List<AppInfo>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Log.e("getOutsideApp", "onSubscribe: ");
}
@Override
public void onNext(@NonNull List<AppInfo> appInfos) {
Log.e("getOutsideApp", "onNext: " + appInfos);
mDesktopSortAppData.setValue(appInfos);
}
@Override
public void onError(@NonNull Throwable e) {
Log.e("getOutsideApp", "onError: " + e.getMessage());
}
@Override
public void onComplete() {
Log.e("getOutsideApp", "onComplete: ");
}
});
}
}