feat: 增加壁纸显示,增加天气事件分发,增加HotSeat
This commit is contained in:
1 parent
59539d048d
commit
da83e852e0
55 files changed
+1776
-419
No files matched your search
@@ -5,14 +5,18 @@ import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.view.KeyEvent;
|
||||
import android.view.Window;
|
||||
import android.view.WindowManager;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.lifecycle.Observer;
|
||||
import androidx.loader.app.LoaderManager;
|
||||
import androidx.viewpager.widget.ViewPager;
|
||||
|
||||
import com.tencent.mmkv.MMKV;
|
||||
import com.ttstd.dialer.R;
|
||||
import com.ttstd.dialer.adapter.AppGridAdapter;
|
||||
import com.ttstd.dialer.base.mvvm.BaseMvvmActivity;
|
||||
import com.ttstd.dialer.config.CommonConfig;
|
||||
import com.ttstd.dialer.databinding.ActivityMainBinding;
|
||||
@@ -21,16 +25,25 @@ 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.fragment.settings.SettingsFragment;
|
||||
import com.ttstd.dialer.manager.AppManager;
|
||||
import com.ttstd.dialer.manager.WeatherUpdateManager;
|
||||
import com.ttstd.dialer.service.main.MainService;
|
||||
import com.ttstd.dialer.utils.Logger;
|
||||
import com.ttstd.dialer.view.ApkPagerAdapter;
|
||||
import com.ttstd.dialer.view.ScaleCircleNavigator;
|
||||
import com.ttstd.dialer.wallpager.WallpaperScrollHelper;
|
||||
|
||||
import net.lucode.hackware.magicindicator.ViewPagerHelper;
|
||||
|
||||
import java.util.concurrent.CancellationException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import kotlinx.coroutines.CoroutineScope;
|
||||
import kotlinx.coroutines.CoroutineScopeKt;
|
||||
import kotlinx.coroutines.Job;
|
||||
import kotlinx.coroutines.flow.FlowKt;
|
||||
|
||||
public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBinding> {
|
||||
private static final String TAG = "MainActivity";
|
||||
private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
|
||||
@@ -38,7 +51,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
private FragmentManager mFragmentManager = getSupportFragmentManager();
|
||||
// private BaseFragmentPagerAdapter mBaseFragmentPagerAdapter;
|
||||
private ApkPagerAdapter mApkPagerAdapter;
|
||||
|
||||
private AppGridAdapter mAppGridAdapter;
|
||||
private List<Fragment> mFragments = new ArrayList<>();
|
||||
private SettingsFragment mSettingsFragment;
|
||||
private ContactFragment mContactFragment;
|
||||
@@ -48,12 +61,17 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
private int mCurrentIndex = -1;
|
||||
private int mFragmentSize = 0;
|
||||
|
||||
private int APK_PER_FRAGMENT = 9;
|
||||
|
||||
private ScaleCircleNavigator mScaleCircleNavigator;
|
||||
|
||||
private List<AppInfo> mAppInfos;
|
||||
|
||||
private WallpaperScrollHelper wallpaperScrollHelper;
|
||||
|
||||
private WeatherUpdateManager weatherUpdateManager;
|
||||
private final CoroutineScope weatherScope = CoroutineScopeKt.MainScope();
|
||||
private Job weatherNowJob;
|
||||
private Job weatherHourlyJob;
|
||||
private Job weatherDailyJob;
|
||||
|
||||
@Override
|
||||
public boolean setNightMode() {
|
||||
@@ -76,11 +94,18 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
mViewModel.setVDBinding(mViewDataBinding);
|
||||
mViewModel.setLifecycle(getLifecycleSubject());
|
||||
mViewDataBinding.setClick(new BtnClick());
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initView() {
|
||||
// mBaseFragmentPagerAdapter = new BaseFragmentPagerAdapter(mFragmentManager, mFragments);
|
||||
weatherUpdateManager = WeatherUpdateManager.Companion.getInstance();
|
||||
observeWeatherUpdates();
|
||||
|
||||
showSystemWallpaperBehindActivity();
|
||||
|
||||
// mBaseFragmentPagerAdapter = new BaseFragmentPagerAdapter(mFragmentManager, mFragments);
|
||||
mApkPagerAdapter = new ApkPagerAdapter(mFragmentManager);
|
||||
|
||||
mScaleCircleNavigator = new ScaleCircleNavigator(this);
|
||||
@@ -108,6 +133,14 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
mFragmentSize += 1;
|
||||
}
|
||||
|
||||
wallpaperScrollHelper = new WallpaperScrollHelper(
|
||||
this,
|
||||
mViewDataBinding.viewPager,
|
||||
mFragmentSize
|
||||
);
|
||||
|
||||
mViewDataBinding.viewPager.setPageCount(mFragmentSize);
|
||||
mViewDataBinding.viewPager.setWallpaperScrollHelper(wallpaperScrollHelper);
|
||||
|
||||
mScaleCircleNavigator.setCircleCount(mFragments.size());
|
||||
mScaleCircleNavigator.notifyDataSetChanged();
|
||||
@@ -155,11 +188,31 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
Intent intent = new Intent(this, MainService.class);
|
||||
startService(intent);
|
||||
|
||||
mAppGridAdapter = new AppGridAdapter(this, LoaderManager.getInstance(this));
|
||||
mViewDataBinding.gvApp.setAdapter(mAppGridAdapter);
|
||||
mAppGridAdapter.setShortcutCallback(new AppGridAdapter.ShortcutCallback() {
|
||||
@Override
|
||||
public void setAppInside(AppInfo appInfo) {
|
||||
// 处理回调
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initData() {
|
||||
registerReceivers();
|
||||
AppManager.getInstance().addProgressCallback(new AppManager.ProgressCallback() {
|
||||
@Override
|
||||
public void onProgress(String step, int current, int total) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCompleted(boolean success, String message) {
|
||||
mViewModel.getOutsideApp();
|
||||
}
|
||||
});
|
||||
|
||||
mViewModel.mDesktopSortAppData.observe(this, new Observer<List<AppInfo>>() {
|
||||
@Override
|
||||
public void onChanged(List<AppInfo> appInfos) {
|
||||
@@ -169,6 +222,16 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
}
|
||||
});
|
||||
mViewModel.getOutsideApp();
|
||||
|
||||
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();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -189,6 +252,9 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
//修补autozie fragment item大小不一致
|
||||
Logger.e(TAG, "onResume: ");
|
||||
mViewModel.getOutsideApp();
|
||||
if (wallpaperScrollHelper != null) {
|
||||
wallpaperScrollHelper.onResume();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -196,6 +262,39 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
super.onDestroy();
|
||||
Logger.e(TAG, "onDestroy: ");
|
||||
unregisterReceivers();
|
||||
if (wallpaperScrollHelper != null) {
|
||||
wallpaperScrollHelper.onDestroy();
|
||||
}
|
||||
|
||||
if (weatherNowJob != null) {
|
||||
weatherNowJob.cancel(null);
|
||||
}
|
||||
if (weatherHourlyJob != null) {
|
||||
weatherHourlyJob.cancel(null);
|
||||
}
|
||||
if (weatherDailyJob != null) {
|
||||
weatherDailyJob.cancel(null);
|
||||
}
|
||||
}
|
||||
|
||||
private void observeWeatherUpdates() {
|
||||
// 观察当前天气更新
|
||||
weatherNowJob = weatherUpdateManager.observeWeatherNow(weatherScope, weatherNowResponse -> {
|
||||
if (weatherNowResponse != null) {
|
||||
Logger.e(TAG, "weatherNowResponse = " + weatherNowResponse);
|
||||
}
|
||||
return null;
|
||||
});
|
||||
}
|
||||
|
||||
private void showSystemWallpaperBehindActivity() {
|
||||
Window window = getWindow();
|
||||
|
||||
// 关键:让系统壁纸显示在当前窗口后面
|
||||
window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER);
|
||||
|
||||
// 窗口背景透明
|
||||
window.setBackgroundDrawableResource(android.R.color.transparent);
|
||||
}
|
||||
|
||||
private void registerReceivers() {
|
||||
@@ -231,6 +330,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
}
|
||||
|
||||
private void setAppList() {
|
||||
int APK_PER_FRAGMENT = CommonConfig.FRAGMENT_APP_ROW_DEFAULT_VALUE * CommonConfig.FRAGMENT_APP_COLUMN_DEFAULT_VALUE;
|
||||
Logger.e(TAG, "setAppList: mFragments size = " + mFragments.size());
|
||||
mFragments = mFragments.subList(0, mFragmentSize);
|
||||
Logger.e(TAG, "setAppList: subList mFragments size = " + mFragments.size());
|
||||
@@ -256,6 +356,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
mScaleCircleNavigator.notifyDataSetChanged();
|
||||
|
||||
mApkPagerAdapter.setFragments(mFragments);
|
||||
mViewDataBinding.viewPager.setPageCount(mFragments.size());
|
||||
mViewDataBinding.viewPager.setCurrentItem(mCurrentIndex);
|
||||
}
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEv
|
||||
Observable.fromCallable(new Callable<List<AppInfo>>() {
|
||||
@Override
|
||||
public List<AppInfo> call() throws Exception {
|
||||
return mAppRepository.getOutsideApp();
|
||||
return mAppRepository.getOutsideAppWithoutHotseat();
|
||||
}
|
||||
}).compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
|
||||
.subscribeOn(Schedulers.io())
|
||||
@@ -68,4 +68,39 @@ public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEv
|
||||
});
|
||||
}
|
||||
|
||||
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: ");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user