feat: 系统功能抽象
This commit is contained in:
1 parent
b0ea6eff0a
commit
4dcb82b9f4
82 files changed
+4758
-1019
No files matched your search
@@ -1,9 +1,6 @@
|
||||
package com.ttstd.dialer.activity.app;
|
||||
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.pm.ResolveInfo;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
|
||||
@@ -13,21 +10,16 @@ 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.utils.ApkUtils;
|
||||
import com.ttstd.dialer.utils.Logger;
|
||||
|
||||
import java.text.Collator;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.concurrent.Callable;
|
||||
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.Observer;
|
||||
import io.reactivex.rxjava3.disposables.Disposable;
|
||||
import io.reactivex.rxjava3.functions.Function;
|
||||
import io.reactivex.rxjava3.schedulers.Schedulers;
|
||||
|
||||
public class AppListViewModel extends BaseViewModel<ActivityAppListBinding, ActivityEvent> {
|
||||
@@ -55,23 +47,23 @@ public class AppListViewModel extends BaseViewModel<ActivityAppListBinding, Acti
|
||||
.subscribe(new Observer<List<AppInfo>>() {
|
||||
@Override
|
||||
public void onSubscribe(@NonNull Disposable d) {
|
||||
Log.e("getDbAppList", "onSubscribe: ");
|
||||
Logger.e("getDbAppList", "onSubscribe: ");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(@NonNull List<AppInfo> appInfos) {
|
||||
Log.e("getDbAppList", "onNext: " + appInfos);
|
||||
Logger.e("getDbAppList", "onNext: " + appInfos);
|
||||
mDesktopSortAppData.setValue(appInfos);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(@NonNull Throwable e) {
|
||||
Log.e("getDbAppList", "onError: " + e.getMessage());
|
||||
Logger.e("getDbAppList", "onError: " + e.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onComplete() {
|
||||
Log.e("getDbAppList", "onComplete: ");
|
||||
Logger.e("getDbAppList", "onComplete: ");
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -90,23 +82,23 @@ public class AppListViewModel extends BaseViewModel<ActivityAppListBinding, Acti
|
||||
.subscribe(new Observer<Integer>() {
|
||||
@Override
|
||||
public void onSubscribe(@NonNull Disposable d) {
|
||||
Log.e("updateAppInfo", "onSubscribe: ");
|
||||
Logger.e("updateAppInfo", "onSubscribe: ");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(@NonNull Integer row) {
|
||||
Log.e("updateAppInfo", "onNext: " + row);
|
||||
Logger.e("updateAppInfo", "onNext: " + row);
|
||||
mAppUpdateData.setValue(row);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(@NonNull Throwable e) {
|
||||
Log.e("updateAppInfo", "onError: " + e.getMessage());
|
||||
Logger.e("updateAppInfo", "onError: " + e.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onComplete() {
|
||||
Log.e("updateAppInfo", "onComplete: ");
|
||||
Logger.e("updateAppInfo", "onComplete: ");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.ttstd.dialer.activity.contact.add;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
|
||||
@@ -11,6 +10,7 @@ import com.ttstd.dialer.base.mvvm.BaseViewModel;
|
||||
import com.ttstd.dialer.databinding.ActivityContactAddBinding;
|
||||
import com.ttstd.dialer.db.contact.ContactInfo;
|
||||
import com.ttstd.dialer.db.contact.ContactRepository;
|
||||
import com.ttstd.dialer.utils.Logger;
|
||||
|
||||
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
|
||||
import io.reactivex.rxjava3.annotations.NonNull;
|
||||
@@ -39,7 +39,7 @@ public class ContactAddViewModel extends BaseViewModel<ActivityContactAddBinding
|
||||
public void subscribe(@NonNull ObservableEmitter<Long> emitter) throws Throwable {
|
||||
int count = mRepository.getTotalCount() + 1;
|
||||
ContactInfo contactInfo = new ContactInfo(name, phone, count);
|
||||
Log.e(TAG, "saveContact: " + contactInfo);
|
||||
Logger.e(TAG, "saveContact: " + contactInfo);
|
||||
emitter.onNext(mRepository.insert(contactInfo));
|
||||
emitter.onComplete();
|
||||
}
|
||||
@@ -49,23 +49,23 @@ public class ContactAddViewModel extends BaseViewModel<ActivityContactAddBinding
|
||||
.subscribe(new Observer<Long>() {
|
||||
@Override
|
||||
public void onSubscribe(@NonNull Disposable d) {
|
||||
Log.e("saveContact", "onSubscribe: ");
|
||||
Logger.e("saveContact", "onSubscribe: ");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(@NonNull Long aLong) {
|
||||
Log.e("saveContact", "onNext: " + aLong);
|
||||
Logger.e("saveContact", "onNext: " + aLong);
|
||||
mIntegerMutableLiveData.setValue(aLong);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(@NonNull Throwable e) {
|
||||
Log.e("saveContact", "onError: " + e.getMessage());
|
||||
Logger.e("saveContact", "onError: " + e.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onComplete() {
|
||||
Log.e("saveContact", "onComplete: ");
|
||||
Logger.e("saveContact", "onComplete: ");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@ package com.ttstd.dialer.activity.contact.list;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
@@ -17,6 +16,7 @@ import com.ttstd.dialer.base.mvvm.BaseMvvmActivity;
|
||||
import com.ttstd.dialer.databinding.ActivityContactListBinding;
|
||||
import com.ttstd.dialer.db.contact.ContactInfo;
|
||||
import com.ttstd.dialer.fragment.dialog.call.CallFragment;
|
||||
import com.ttstd.dialer.utils.Logger;
|
||||
import com.ttstd.dialer.view.ItemTouchHelperCallback;
|
||||
|
||||
import java.util.List;
|
||||
@@ -59,7 +59,7 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
|
||||
mContactInfoAdapter.setItemMoveCallback(new ContactInfoAdapter.ItemMoveCallback() {
|
||||
@Override
|
||||
public void onItemMove(int fromPosition, int toPosition) {
|
||||
Log.e(TAG, "onItemMove: ");
|
||||
Logger.e(TAG, "onItemMove: ");
|
||||
ContactInfo fromContactInfo = mContactInfos.get(fromPosition);
|
||||
int fromContactPosition = fromContactInfo.getPosition();
|
||||
ContactInfo toContactInfo = mContactInfos.get(toPosition);
|
||||
@@ -72,7 +72,7 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
|
||||
|
||||
@Override
|
||||
public void onItemRemoved(int position) {
|
||||
Log.e(TAG, "onItemRemoved: ");
|
||||
Logger.e(TAG, "onItemRemoved: ");
|
||||
|
||||
}
|
||||
});
|
||||
@@ -98,7 +98,7 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
|
||||
mViewModel.mContactListData.observe(this, new Observer<List<ContactInfo>>() {
|
||||
@Override
|
||||
public void onChanged(List<ContactInfo> contactInfos) {
|
||||
Log.e(TAG, "mContactListData: " + contactInfos);
|
||||
Logger.e(TAG, "mContactListData: " + contactInfos);
|
||||
mContactInfos = contactInfos;
|
||||
mContactInfoAdapter.setContactInfos(mContactInfos);
|
||||
}
|
||||
|
||||
+10
-10
@@ -1,7 +1,6 @@
|
||||
package com.ttstd.dialer.activity.contact.list;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
|
||||
@@ -11,6 +10,7 @@ import com.ttstd.dialer.base.mvvm.BaseViewModel;
|
||||
import com.ttstd.dialer.databinding.ActivityContactListBinding;
|
||||
import com.ttstd.dialer.db.contact.ContactInfo;
|
||||
import com.ttstd.dialer.db.contact.ContactRepository;
|
||||
import com.ttstd.dialer.utils.Logger;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -49,12 +49,12 @@ public class ContactListViewModel extends BaseViewModel<ActivityContactListBindi
|
||||
.subscribe(new Observer<List<ContactInfo>>() {
|
||||
@Override
|
||||
public void onSubscribe(@NonNull Disposable d) {
|
||||
Log.e("getAllContacts", "onSubscribe: ");
|
||||
Logger.e("getAllContacts", "onSubscribe: ");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(@NonNull List<ContactInfo> contactInfos) {
|
||||
Log.e("getAllContacts", "onNext: ");
|
||||
Logger.e("getAllContacts", "onNext: ");
|
||||
mContactListData.setValue(contactInfos);
|
||||
|
||||
// List<Contact> sorted = contacts.stream().sorted(new Comparator<Contact>() {
|
||||
@@ -68,18 +68,18 @@ public class ContactListViewModel extends BaseViewModel<ActivityContactListBindi
|
||||
|
||||
@Override
|
||||
public void onError(@NonNull Throwable e) {
|
||||
Log.e("getAllContacts", "onError: " + e.getMessage());
|
||||
Logger.e("getAllContacts", "onError: " + e.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onComplete() {
|
||||
Log.e("getAllContacts", "onComplete: ");
|
||||
Logger.e("getAllContacts", "onComplete: ");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void updateItemPosition(ContactInfo contactInfo) {
|
||||
Log.e(TAG, "updateItemPosition: " + contactInfo);
|
||||
Logger.e(TAG, "updateItemPosition: " + contactInfo);
|
||||
Observable.create(new ObservableOnSubscribe<Integer>() {
|
||||
@Override
|
||||
public void subscribe(@NonNull ObservableEmitter<Integer> emitter) throws Throwable {
|
||||
@@ -93,22 +93,22 @@ public class ContactListViewModel extends BaseViewModel<ActivityContactListBindi
|
||||
.subscribe(new Observer<Integer>() {
|
||||
@Override
|
||||
public void onSubscribe(@NonNull Disposable d) {
|
||||
Log.e("updateItemPosition", "onComplete: ");
|
||||
Logger.e("updateItemPosition", "onComplete: ");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(@NonNull Integer integer) {
|
||||
Log.e("updateItemPosition", "onNext: " + integer);
|
||||
Logger.e("updateItemPosition", "onNext: " + integer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(@NonNull Throwable e) {
|
||||
Log.e("updateItemPosition", "onError: " + e.getMessage());
|
||||
Logger.e("updateItemPosition", "onError: " + e.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onComplete() {
|
||||
Log.e("updateItemPosition", "onComplete: ");
|
||||
Logger.e("updateItemPosition", "onComplete: ");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.util.Log;
|
||||
import android.view.KeyEvent;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
@@ -22,6 +22,7 @@ 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.service.main.MainService;
|
||||
import com.ttstd.dialer.utils.Logger;
|
||||
import com.ttstd.dialer.view.ApkPagerAdapter;
|
||||
import com.ttstd.dialer.view.ScaleCircleNavigator;
|
||||
|
||||
@@ -124,7 +125,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
mViewDataBinding.viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
|
||||
@Override
|
||||
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
|
||||
Log.e(TAG, "onPageScrolled: position = " + position);
|
||||
Logger.e(TAG, "onPageScrolled: position = " + position);
|
||||
if (mCurrentIndex == -1 && position == 0) {
|
||||
mViewDataBinding.viewPager.setCurrentItem(mDefaultIndex);
|
||||
mCurrentIndex = mDefaultIndex;
|
||||
@@ -135,21 +136,21 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
|
||||
@Override
|
||||
public void onPageSelected(int position) {
|
||||
Log.e(TAG, "onPageSelected: position = " + position);
|
||||
Logger.e(TAG, "onPageSelected: position = " + position);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPageScrollStateChanged(int state) {
|
||||
Log.e(TAG, "onPageScrollStateChanged: state = " + state);
|
||||
Logger.e(TAG, "onPageScrollStateChanged: state = " + state);
|
||||
}
|
||||
});
|
||||
mViewDataBinding.magicIndicator.setNavigator(mScaleCircleNavigator);
|
||||
ViewPagerHelper.bind(mViewDataBinding.magicIndicator, mViewDataBinding.viewPager);
|
||||
mViewDataBinding.viewPager.setCurrentItem(mDefaultIndex);
|
||||
|
||||
Log.e(TAG, "initView: mCurrentIndex = " + mCurrentIndex);
|
||||
Log.e(TAG, "initView: mDefaultIndex = " + mDefaultIndex);
|
||||
Log.e(TAG, "initView: mFragmentSize = " + mFragmentSize);
|
||||
Logger.e(TAG, "initView: mCurrentIndex = " + mCurrentIndex);
|
||||
Logger.e(TAG, "initView: mDefaultIndex = " + mDefaultIndex);
|
||||
Logger.e(TAG, "initView: mFragmentSize = " + mFragmentSize);
|
||||
|
||||
Intent intent = new Intent(this, MainService.class);
|
||||
startService(intent);
|
||||
@@ -163,25 +164,37 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
@Override
|
||||
public void onChanged(List<AppInfo> appInfos) {
|
||||
mAppInfos = appInfos;
|
||||
Log.e(TAG, "onChanged: mAppInfos size = " + mAppInfos.size());
|
||||
Logger.e(TAG, "onChanged: mAppInfos size = " + mAppInfos.size());
|
||||
setAppList();
|
||||
}
|
||||
});
|
||||
mViewModel.getOutsideApp();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onKeyDown(int keyCode, KeyEvent event) {
|
||||
Logger.e(TAG, "onKeyDown: keyCode = " + keyCode);
|
||||
if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
|
||||
return false;
|
||||
}
|
||||
if (keyCode == KeyEvent.KEYCODE_HOME) {
|
||||
|
||||
}
|
||||
return super.onKeyDown(keyCode, event);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
//修补autozie fragment item大小不一致
|
||||
Log.e(TAG, "onResume: ");
|
||||
Logger.e(TAG, "onResume: ");
|
||||
mViewModel.getOutsideApp();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDestroy() {
|
||||
super.onDestroy();
|
||||
Log.e(TAG, "onDestroy: ");
|
||||
Logger.e(TAG, "onDestroy: ");
|
||||
unregisterReceivers();
|
||||
}
|
||||
|
||||
@@ -213,23 +226,23 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
private class PackageChangedReceiver extends BroadcastReceiver {
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
Log.e(TAG, "onReceive: " + intent.getAction());
|
||||
Logger.e(TAG, "onReceive: " + intent.getAction());
|
||||
}
|
||||
}
|
||||
|
||||
private void setAppList() {
|
||||
Log.e(TAG, "setAppList: mFragments size = " + mFragments.size());
|
||||
Logger.e(TAG, "setAppList: mFragments size = " + mFragments.size());
|
||||
mFragments = mFragments.subList(0, mFragmentSize);
|
||||
Log.e(TAG, "setAppList: subList mFragments size = " + mFragments.size());
|
||||
Logger.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());
|
||||
Logger.e(TAG, "setAppList: subList size = " + subList.size());
|
||||
// AppFragment appFragment = AppFragment.newInstance(subList);
|
||||
AppFragment appFragment = new AppFragment(subList);
|
||||
Log.e(TAG, "setAppList: appFragment hashCode = " + appFragment.hashCode());
|
||||
Logger.e(TAG, "setAppList: appFragment hashCode = " + appFragment.hashCode());
|
||||
appFragment.setUpdateCallback(new AppFragment.UpdateCallback() {
|
||||
@Override
|
||||
public void onUpdate() {
|
||||
@@ -237,7 +250,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
}
|
||||
});
|
||||
mFragments.add(appFragment);
|
||||
Log.e(TAG, "setAppList: add mFragments size = " + mFragments.size());
|
||||
Logger.e(TAG, "setAppList: add mFragments size = " + mFragments.size());
|
||||
}
|
||||
mScaleCircleNavigator.setCircleCount(mFragments.size());
|
||||
mScaleCircleNavigator.notifyDataSetChanged();
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
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 com.ttstd.dialer.utils.Logger;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.concurrent.Callable;
|
||||
@@ -48,24 +47,25 @@ public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEv
|
||||
.subscribe(new Observer<List<AppInfo>>() {
|
||||
@Override
|
||||
public void onSubscribe(@NonNull Disposable d) {
|
||||
Log.e("getOutsideApp", "onSubscribe: ");
|
||||
Logger.e("getOutsideApp", "onSubscribe: ");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(@NonNull List<AppInfo> appInfos) {
|
||||
Log.e("getOutsideApp", "onNext: " + appInfos);
|
||||
Logger.e("getOutsideApp", "onNext: " + appInfos);
|
||||
mDesktopSortAppData.setValue(appInfos);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(@NonNull Throwable e) {
|
||||
Log.e("getOutsideApp", "onError: " + e.getMessage());
|
||||
Logger.e("getOutsideApp", "onError: " + e.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onComplete() {
|
||||
Log.e("getOutsideApp", "onComplete: ");
|
||||
Logger.e("getOutsideApp", "onComplete: ");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
@@ -42,6 +42,7 @@ public class SettingsActivity extends BaseMvvmActivity<SettingsViewModel, Activi
|
||||
|
||||
@Override
|
||||
protected void initData() {
|
||||
mViewModel.snRegister();
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -2,9 +2,41 @@ package com.ttstd.dialer.activity.settings.home;
|
||||
|
||||
import com.trello.rxlifecycle4.android.ActivityEvent;
|
||||
import com.ttstd.dialer.base.mvvm.BaseViewModel;
|
||||
import com.ttstd.dialer.bean.BaseResponse;
|
||||
import com.ttstd.dialer.databinding.ActivitySettingsBinding;
|
||||
import com.ttstd.dialer.databinding.ActivityTemplateBinding;
|
||||
import com.ttstd.dialer.network.OkHttpManager;
|
||||
import com.ttstd.dialer.utils.Logger;
|
||||
|
||||
import io.reactivex.rxjava3.annotations.NonNull;
|
||||
import io.reactivex.rxjava3.core.Observer;
|
||||
import io.reactivex.rxjava3.disposables.Disposable;
|
||||
|
||||
public class SettingsViewModel extends BaseViewModel<ActivitySettingsBinding, ActivityEvent> {
|
||||
|
||||
public void snRegister() {
|
||||
OkHttpManager.getInstance().getSnRegisterObservable(getLifecycle())
|
||||
.subscribe(new Observer<BaseResponse>() {
|
||||
@Override
|
||||
public void onSubscribe(@NonNull Disposable d) {
|
||||
Logger.e("snRegister", "onSubscribe: ");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(@NonNull BaseResponse baseResponse) {
|
||||
Logger.e("snRegister", "onNext: " + baseResponse);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(@NonNull Throwable e) {
|
||||
Logger.e("snRegister", "onError: " + e.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onComplete() {
|
||||
Logger.e("snRegister", "onComplete: ");
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
+81
-8
@@ -2,7 +2,7 @@ package com.ttstd.dialer.activity.settings.utils;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.graphics.Bitmap;
|
||||
import android.util.Log;
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.view.View;
|
||||
|
||||
import com.tencent.mmkv.MMKV;
|
||||
@@ -13,9 +13,21 @@ import com.ttstd.dialer.base.mvvm.BaseMvvmActivity;
|
||||
import com.ttstd.dialer.config.CommonConfig;
|
||||
import com.ttstd.dialer.databinding.ActivitySettingsUtilsBinding;
|
||||
import com.ttstd.dialer.service.main.MainService;
|
||||
import com.ttstd.dialer.utils.CameraUtil;
|
||||
import com.ttstd.dialer.utils.Logger;
|
||||
import com.ttstd.dialer.utils.SystemUtils;
|
||||
import com.ttstd.dialer.view.ToggleButton;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import io.reactivex.rxjava3.annotations.NonNull;
|
||||
import io.reactivex.rxjava3.internal.observers.BlockingBaseObserver;
|
||||
import okhttp3.MediaType;
|
||||
import okhttp3.MultipartBody;
|
||||
import okhttp3.RequestBody;
|
||||
|
||||
public class SettingsUtilsActivity extends BaseMvvmActivity<SettingsUtilsViewModel, ActivitySettingsUtilsBinding> {
|
||||
private static final String TAG = "SettingsActivity";
|
||||
|
||||
@@ -97,15 +109,15 @@ public class SettingsUtilsActivity extends BaseMvvmActivity<SettingsUtilsViewMod
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
int enableFloatWindow = mMMKV.decodeInt(CommonConfig.FLOAT_WINDOW_ENABLE, 0);
|
||||
Log.e(TAG, "initView: enableFloatWindow = " + enableFloatWindow);
|
||||
Logger.e(TAG, "initView: enableFloatWindow = " + enableFloatWindow);
|
||||
mViewDataBinding.siFloatWindow.setToggleStatu(enableFloatWindow == 1);
|
||||
|
||||
int floatWindowKillApp = mMMKV.decodeInt(CommonConfig.FLOAT_WINDOW_KILL_APP, 0);
|
||||
Log.e(TAG, "initView: floatWindowKillApp = " + floatWindowKillApp);
|
||||
Logger.e(TAG, "initView: floatWindowKillApp = " + floatWindowKillApp);
|
||||
mViewDataBinding.siFloatWindowKill.setToggleStatu(floatWindowKillApp == 1);
|
||||
|
||||
boolean defaultLauncher = SystemUtils.isDefaultLauncher(SettingsUtilsActivity.this, MainActivity.class);
|
||||
Log.e(TAG, "initView: defaultLauncher = " + defaultLauncher);
|
||||
Logger.e(TAG, "initView: defaultLauncher = " + defaultLauncher);
|
||||
mViewDataBinding.siDefaultLauncher.setToggleStatu(defaultLauncher);
|
||||
}
|
||||
|
||||
@@ -116,10 +128,71 @@ public class SettingsUtilsActivity extends BaseMvvmActivity<SettingsUtilsViewMod
|
||||
|
||||
public void screenshotSnap(View view) {
|
||||
// Bitmap bitmap = SystemUtils.takeFullScreenshot(SettingsUtilsActivity.this);
|
||||
Bitmap bitmap = SystemUtils.takeScreenshotHighVersion();
|
||||
if (bitmap != null) {
|
||||
mViewDataBinding.ivSnap.setImageBitmap(bitmap);
|
||||
}
|
||||
// Bitmap bitmap = SystemUtils.takeScreenshotHighVersion();
|
||||
// if (bitmap != null) {
|
||||
// mViewDataBinding.ivSnap.setImageBitmap(bitmap);
|
||||
// }
|
||||
String filepath = getExternalCacheDir().getAbsolutePath() + File.separator + "screenshot_" + System.currentTimeMillis() + ".png";
|
||||
SystemUtils.screenshotCmd(filepath, new BlockingBaseObserver<Integer>() {
|
||||
@Override
|
||||
public void onNext(@NonNull Integer integer) {
|
||||
if (integer == 0) {
|
||||
Bitmap bitmap = BitmapFactory.decodeFile(filepath);
|
||||
mViewDataBinding.ivSnap.setImageBitmap(bitmap);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(@NonNull Throwable e) {
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void getCameraSnap(View view) {
|
||||
long createTime = System.currentTimeMillis() / 1000;
|
||||
CameraUtil cameraUtil = new CameraUtil(SettingsUtilsActivity.this, new CameraUtil.CameraCallBack() {
|
||||
@Override
|
||||
public void onErr(String msg) {
|
||||
Logger.e("CameraUtil", "onErr: " + msg);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTakePhotoOk(String path) {
|
||||
Logger.e("CameraUtil", "onTakePhotoOk: " + path);
|
||||
File file = new File(path);
|
||||
Bitmap bitmap = BitmapFactory.decodeFile(path);
|
||||
mViewDataBinding.ivCamera.setImageBitmap(bitmap);
|
||||
|
||||
MediaType mediaType = MediaType.Companion.parse("image/png");
|
||||
RequestBody fileBody = RequestBody.Companion.create(file, mediaType);
|
||||
//设置一个file文件
|
||||
MultipartBody.Part body = MultipartBody.Part.createFormData("file", file.getName(), fileBody);
|
||||
Map<String, String> params = new HashMap<>();
|
||||
params.put("sn", SystemUtils.getSerial());
|
||||
params.put("createtime", String.valueOf(createTime));
|
||||
// Call<BaseResponse> call = NetInterfaceManager.getInstance().getScreenshotCall().sendScreenshot(params, body);
|
||||
// call.enqueue(new RetryCallback<BaseResponse>(call, 10, 30 * 1000) {
|
||||
// @Override
|
||||
// public void onRequestResponse(Call call, Response response) {
|
||||
// Logger.e(TAG, "onRequestResponse: " + response.body().toString());
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onRequestFail(Call call, Throwable t) {
|
||||
// Logger.e(TAG, "onRequestFail: ");
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onStartRetry() {
|
||||
// Logger.e(TAG, "onStartRetry: ");
|
||||
// }
|
||||
// });
|
||||
|
||||
}
|
||||
});
|
||||
cameraUtil.startTakePicture(getExternalCacheDir().getAbsolutePath() + File.separator + createTime + ".jpg");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,8 @@
|
||||
package com.ttstd.dialer.activity.weather.main;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.lifecycle.Observer;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
|
||||
import com.baidu.location.BDLocation;
|
||||
import com.jeremyliao.liveeventbus.LiveEventBus;
|
||||
import com.qweather.sdk.response.weather.WeatherDaily;
|
||||
import com.qweather.sdk.response.weather.WeatherHourly;
|
||||
@@ -15,9 +12,11 @@ import com.ttstd.dialer.R;
|
||||
import com.ttstd.dialer.adapter.HourlyWeatherAdapter;
|
||||
import com.ttstd.dialer.adapter.WeatherAdapter;
|
||||
import com.ttstd.dialer.base.mvvm.BaseMvvmActivity;
|
||||
import com.ttstd.dialer.bean.req.SnLocationReq;
|
||||
import com.ttstd.dialer.config.CommonConfig;
|
||||
import com.ttstd.dialer.databinding.ActivityWeatherMainBinding;
|
||||
import com.ttstd.dialer.utils.DateUtil;
|
||||
import com.ttstd.dialer.utils.Logger;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
@@ -71,7 +70,7 @@ public class WeatherMainActivity extends BaseMvvmActivity<WeatherMainViewModel,
|
||||
|
||||
@Override
|
||||
protected void initData() {
|
||||
Log.e(TAG, "initData: ");
|
||||
Logger.e(TAG, "initData: ");
|
||||
|
||||
mViewModel.mWeatherNowData.observe(this, new Observer<WeatherNow>() {
|
||||
@Override
|
||||
@@ -108,14 +107,14 @@ public class WeatherMainActivity extends BaseMvvmActivity<WeatherMainViewModel,
|
||||
if (manually) {
|
||||
|
||||
} else {
|
||||
LiveEventBus.get(CommonConfig.LOCATION_CHANGED_KEY, BDLocation.class)
|
||||
.observeSticky(this, new Observer<BDLocation>() {
|
||||
LiveEventBus.get(CommonConfig.LOCATION_CHANGED_KEY, SnLocationReq.class)
|
||||
.observeSticky(this, new Observer<SnLocationReq>() {
|
||||
@Override
|
||||
public void onChanged(BDLocation bdLocation) {
|
||||
mViewDataBinding.tvLocation.setText(bdLocation.getDistrict());
|
||||
mViewModel.getWeatherNow(bdLocation.getAdCode());
|
||||
mViewModel.getWeather24h(bdLocation.getAdCode());
|
||||
mViewModel.getWeather10D(bdLocation.getAdCode());
|
||||
public void onChanged(SnLocationReq snLocationReq) {
|
||||
mViewDataBinding.tvLocation.setText(snLocationReq.getDistrict());
|
||||
mViewModel.getWeatherNow(snLocationReq.getAdCode());
|
||||
mViewModel.getWeather24h(snLocationReq.getAdCode());
|
||||
mViewModel.getWeather10D(snLocationReq.getAdCode());
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
+18
-19
@@ -1,7 +1,5 @@
|
||||
package com.ttstd.dialer.activity.weather.main;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
|
||||
import com.qweather.sdk.Callback;
|
||||
@@ -17,6 +15,7 @@ import com.ttstd.dialer.base.mvvm.BaseViewModel;
|
||||
import com.ttstd.dialer.databinding.ActivityWeatherMainBinding;
|
||||
import com.ttstd.dialer.gson.GsonUtils;
|
||||
import com.ttstd.dialer.manager.WeatherManager;
|
||||
import com.ttstd.dialer.utils.Logger;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -26,25 +25,25 @@ public class WeatherMainViewModel extends BaseViewModel<ActivityWeatherMainBindi
|
||||
public MutableLiveData<WeatherNow> mWeatherNowData = new MutableLiveData<>();
|
||||
|
||||
public void getWeatherNow(String adCode) {
|
||||
Log.e(TAG, "getWeatherNow: " + adCode);
|
||||
Logger.e(TAG, "getWeatherNow: " + adCode);
|
||||
WeatherManager.getInstance().getWeatherNow(adCode, new Callback<WeatherNowResponse>() {
|
||||
@Override
|
||||
public void onSuccess(WeatherNowResponse response) {
|
||||
Log.e("getWeatherNow", "onSuccess: " + response);
|
||||
Logger.e("getWeatherNow", "onSuccess: " + response);
|
||||
WeatherNow weatherNow = response.getNow();
|
||||
Log.e("getWeatherNow", "onSuccess: " + weatherNow);
|
||||
Logger.e("getWeatherNow", "onSuccess: " + weatherNow);
|
||||
mWeatherNowData.postValue(weatherNow);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(ErrorResponse errorResponse) {
|
||||
Log.e("getWeatherNow", "onFailure: " + errorResponse.getError().getStatus());
|
||||
Log.e("getWeatherNow", "onFailure: " + errorResponse.getError().getDetail());
|
||||
Logger.e("getWeatherNow", "onFailure: " + errorResponse.getError().getStatus());
|
||||
Logger.e("getWeatherNow", "onFailure: " + errorResponse.getError().getDetail());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onException(Throwable e) {
|
||||
Log.e("getWeatherNow", "onException: " + e.getMessage());
|
||||
Logger.e("getWeatherNow", "onException: " + e.getMessage());
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -52,25 +51,25 @@ public class WeatherMainViewModel extends BaseViewModel<ActivityWeatherMainBindi
|
||||
public MutableLiveData<List<WeatherHourly>> mWeather24hData = new MutableLiveData<>();
|
||||
|
||||
public void getWeather24h(String adCode) {
|
||||
Log.e(TAG, "getWeather24h: " + adCode);
|
||||
Logger.e(TAG, "getWeather24h: " + adCode);
|
||||
WeatherManager.getInstance().getWeather24h(adCode, new Callback<WeatherHourlyResponse>() {
|
||||
@Override
|
||||
public void onSuccess(WeatherHourlyResponse weatherHourlyResponse) {
|
||||
Log.e("getWeather24h", "onSuccess: " + weatherHourlyResponse);
|
||||
Logger.e("getWeather24h", "onSuccess: " + weatherHourlyResponse);
|
||||
List<WeatherHourly> weatherHourlies = weatherHourlyResponse.getHourly();
|
||||
Log.e("getWeather24h", "onSuccess: " + GsonUtils.toJSONString(weatherHourlies));
|
||||
Logger.e("getWeather24h", "onSuccess: " + GsonUtils.toJSONString(weatherHourlies));
|
||||
mWeather24hData.postValue(weatherHourlies);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(ErrorResponse errorResponse) {
|
||||
Log.e("getWeather24h", "onFailure: " + errorResponse.getError().getStatus());
|
||||
Log.e("getWeather24h", "onFailure: " + errorResponse.getError().getDetail());
|
||||
Logger.e("getWeather24h", "onFailure: " + errorResponse.getError().getStatus());
|
||||
Logger.e("getWeather24h", "onFailure: " + errorResponse.getError().getDetail());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onException(Throwable throwable) {
|
||||
Log.e("getWeather24h", "onException: " + throwable.getMessage());
|
||||
Logger.e("getWeather24h", "onException: " + throwable.getMessage());
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -79,24 +78,24 @@ public class WeatherMainViewModel extends BaseViewModel<ActivityWeatherMainBindi
|
||||
public MutableLiveData<List<WeatherDaily>> mWeatherDailyListData = new MutableLiveData<>();
|
||||
|
||||
public void getWeather10D(String adCode) {
|
||||
Log.e(TAG, "getWeather10D: " + adCode);
|
||||
Logger.e(TAG, "getWeather10D: " + adCode);
|
||||
WeatherManager.getInstance().getWeather10D(adCode, new Callback<WeatherDailyResponse>() {
|
||||
@Override
|
||||
public void onSuccess(WeatherDailyResponse weatherDailyResponse) {
|
||||
Log.e("getWeather10D", "onSuccess: ");
|
||||
Logger.e("getWeather10D", "onSuccess: ");
|
||||
List<WeatherDaily> weatherDailyList = weatherDailyResponse.getDaily();
|
||||
Log.e("getWeather10D", "onSuccess: " + GsonUtils.toJSONString(weatherDailyList));
|
||||
Logger.e("getWeather10D", "onSuccess: " + GsonUtils.toJSONString(weatherDailyList));
|
||||
mWeatherDailyListData.postValue(weatherDailyList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(ErrorResponse errorResponse) {
|
||||
Log.e("getWeather10D", "onFailure: ");
|
||||
Logger.e("getWeather10D", "onFailure: ");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onException(Throwable throwable) {
|
||||
Log.e("getWeather10D", "onException: " + throwable.getMessage());
|
||||
Logger.e("getWeather10D", "onException: " + throwable.getMessage());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user