build: 电脑损坏,不知道改了啥

This commit is contained in:
tongtong committed 2026-06-11 01:20:13 +08:00
1 parent d7346e478a
commit aac6b98c92
16 files changed
+914 -376

No files matched your search

@@ -1,5 +1,6 @@
package com.ttstd.dialer.activity.app;
import android.view.DragEvent;
import android.view.View;
import androidx.lifecycle.Observer;
@@ -8,6 +9,7 @@ import androidx.recyclerview.widget.GridLayoutManager;
import com.tencent.mmkv.MMKV;
import com.ttstd.dialer.R;
import com.ttstd.dialer.adapter.AppGridAdapter;
import com.ttstd.dialer.adapter.MoreAppAdapter;
import com.ttstd.dialer.base.mvvm.BaseMvvmActivity;
import com.ttstd.dialer.config.CommonConfig;
@@ -15,6 +17,7 @@ import com.ttstd.dialer.config.LiveDataAction;
import com.ttstd.dialer.databinding.ActivityAppListBinding;
import com.ttstd.dialer.db.app.AppInfo;
import com.ttstd.dialer.livedata.LiveDataBus;
import com.ttstd.dialer.utils.Logger;
import java.util.List;
@@ -24,6 +27,7 @@ public class AppListActivity extends BaseMvvmActivity<AppListViewModel, Activity
private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
private MoreAppAdapter mMoreAppAdapter;
private AppGridAdapter mAppGridAdapter;
@Override
@@ -49,27 +53,95 @@ public class AppListActivity extends BaseMvvmActivity<AppListViewModel, Activity
mViewDataBinding.setClick(new BtnClick());
}
@Override
protected void initView() {
mAppGridAdapter = new AppGridAdapter(this, LoaderManager.getInstance(this));
mViewDataBinding.gvApp.setAdapter(mAppGridAdapter);
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);
mViewDataBinding.recyclerView.setOnDragListener(new View.OnDragListener() {
@Override
public boolean onDrag(View v, DragEvent event) {
switch (event.getAction()) {
case DragEvent.ACTION_DRAG_STARTED:
return true;
case DragEvent.ACTION_DRAG_ENTERED:
v.setAlpha(0.7f);
break;
case DragEvent.ACTION_DRAG_EXITED:
case DragEvent.ACTION_DRAG_ENDED:
v.setAlpha(1.0f);
break;
case DragEvent.ACTION_DROP:
AppInfo appInfo = (AppInfo) event.getLocalState();
if (appInfo != null && appInfo.getHotseat() == 1) {
appInfo.setHotseat(0);
appInfo.setOutside(0);
appInfo.setPosition(mMoreAppAdapter.getItemCount());
mViewModel.updateAppInfo(appInfo);
}
return true;
}
return true;
}
});
mViewDataBinding.clHotseat.setOnDragListener(new View.OnDragListener() {
@Override
public boolean onDrag(View v, DragEvent event) {
switch (event.getAction()) {
case DragEvent.ACTION_DRAG_STARTED:
return true;
case DragEvent.ACTION_DRAG_ENTERED:
v.setAlpha(0.7f);
break;
case DragEvent.ACTION_DRAG_EXITED:
case DragEvent.ACTION_DRAG_ENDED:
v.setAlpha(1.0f);
break;
case DragEvent.ACTION_DROP:
AppInfo appInfo = (AppInfo) event.getLocalState();
if (appInfo != null && appInfo.getHotseat() == 0) {
// 检查数量限制
if (mAppGridAdapter.getCount() >= 5) {
android.widget.Toast.makeText(AppListActivity.this, "快捷栏最多只能添加5个应用", android.widget.Toast.LENGTH_SHORT).show();
return true;
}
appInfo.setHotseat(1);
appInfo.setOutside(1);
appInfo.setHotseatPosition(mAppGridAdapter.getCount());
mViewModel.updateAppInfo(appInfo);
}
return true;
}
return true;
}
});
}
@Override
protected void initData() {
LiveDataBus.get().<String>on(LiveDataAction.ACTION_UPDATE_APPS)
.observe(this, event -> {
mViewModel.getDbAppList();
mViewModel.getHotseatApp();
});
mViewModel.mHotseatAppData.observe(this, new Observer<List<AppInfo>>() {
@Override
public void onChanged(List<AppInfo> appInfos) {
mViewDataBinding.gvApp.setNumColumns(appInfos.size());
mAppGridAdapter.setAppInfos(appInfos);
}
});
mViewModel.getHotseatApp();
mViewModel.mDesktopSortAppData.observe(this, new Observer<List<AppInfo>>() {
@Override
@@ -84,7 +156,7 @@ public class AppListActivity extends BaseMvvmActivity<AppListViewModel, Activity
@Override
public void onChanged(Integer integer) {
if (integer > 0) {
mViewModel.getHotseatApp();
}
mViewModel.getDbAppList();
}
@@ -33,6 +33,41 @@ public class AppListViewModel extends BaseViewModel<ActivityAppListBinding, Acti
mAppRepository = new AppRepository(context);
}
public MutableLiveData<List<AppInfo>> mHotseatAppData = new MutableLiveData<>();
public void getHotseatApp() {
Observable.fromCallable(new Callable<List<AppInfo>>() {
@Override
public List<AppInfo> call() throws Exception {
return mAppRepository.getHotseatApp();
}
}).compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<List<AppInfo>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Logger.e("getHotseatApp", "onSubscribe: ");
}
@Override
public void onNext(@NonNull List<AppInfo> appInfos) {
Logger.e("getHotseatApp", "onNext: " + appInfos);
mHotseatAppData.setValue(appInfos);
}
@Override
public void onError(@NonNull Throwable e) {
Logger.e("getHotseatApp", "onError: " + e.getMessage());
}
@Override
public void onComplete() {
Logger.e("getHotseatApp", "onComplete: ");
}
});
}
public MutableLiveData<List<AppInfo>> mDesktopSortAppData = new MutableLiveData<>();
public void getDbAppList() {
@@ -77,15 +77,7 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
mContactInfoAdapter.setItemMoveCallback(new ContactInfoAdapter.ItemMoveCallback() {
@Override
public void onItemMove(int fromPosition, int toPosition) {
Logger.e(TAG, "onItemMove: ");
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);
Logger.e(TAG, "onItemMove: from " + fromPosition + " to " + toPosition);
}
@Override
@@ -93,6 +85,17 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
Logger.e(TAG, "onItemRemoved: ");
}
@Override
public void onItemMoveFinished() {
Logger.e(TAG, "onItemMoveFinished: ");
if (mContactInfos != null) {
for (int i = 0; i < mContactInfos.size(); i++) {
mContactInfos.get(i).setPosition(i + 1);
}
mViewModel.updateContacts(mContactInfos);
}
}
});
mContactInfoAdapter.setOnClickListener(new ContactInfoAdapter.ClickListener() {
@Override
@@ -131,6 +131,39 @@ public class ContactListViewModel extends BaseViewModel<ActivityContactListBindi
});
}
public void updateContacts(List<ContactInfo> contactInfos) {
Logger.e(TAG, "updateContacts: " + contactInfos.size());
Observable.create(new ObservableOnSubscribe<Boolean>() {
@Override
public void subscribe(@NonNull ObservableEmitter<Boolean> emitter) throws Throwable {
mRepository.update(contactInfos);
emitter.onNext(true);
emitter.onComplete();
}
}).compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<Boolean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull Boolean aBoolean) {
}
@Override
public void onError(@NonNull Throwable e) {
Logger.e("updateContacts", "onError: " + e.getMessage());
}
@Override
public void onComplete() {
Logger.e("updateContacts", "onComplete: ");
}
});
}
public MutableLiveData<Boolean> mDeleteLiveData = new MutableLiveData<>();
public void deleteContact(long id) {
@@ -79,6 +79,11 @@ public class ContactTestActivity extends BaseMvvmActivity<ContactTestViewModel,
Logger.e(TAG, "mOnlineContactInfoAdapter onItemRemoved: ");
}
@Override
public void onItemMoveFinished() {
}
});
mOnlineContactInfoAdapter.setOnClickListener(new ContactInfoAdapter.ClickListener() {
@Override
@@ -126,6 +131,11 @@ public class ContactTestActivity extends BaseMvvmActivity<ContactTestViewModel,
Logger.e(TAG, "mLocalContactInfoAdapter onItemRemoved: ");
}
@Override
public void onItemMoveFinished() {
}
});
mLocalContactInfoAdapter.setOnClickListener(new ContactInfoAdapter.ClickListener() {
@Override
@@ -188,12 +188,6 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
mAppGridAdapter = new AppGridAdapter(this, LoaderManager.getInstance(this));
mViewDataBinding.gvApp.setAdapter(mAppGridAdapter);
mAppGridAdapter.setShortcutCallback(new AppGridAdapter.ShortcutCallback() {
@Override
public void setAppInside(AppInfo appInfo) {
// 处理回调
}
});
}
@Override
@@ -266,6 +260,8 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
//修补autozie fragment item大小不一致
Logger.e(TAG, "onResume: ");
mViewModel.getOutsideApp();
mViewModel.getHotseatApp();
if (wallpaperScrollHelper != null) {
wallpaperScrollHelper.onResume();
}