feat: 联系人增加头像选择
This commit is contained in:
1 parent
87903b7216
commit
1c89943459
52 files changed
+1892
-226
No files matched your search
@@ -0,0 +1,73 @@
|
||||
package com.ttstd.dialer.activity.alarm;
|
||||
|
||||
import android.media.AudioAttributes;
|
||||
import android.media.Ringtone;
|
||||
import android.media.RingtoneManager;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.view.WindowManager;
|
||||
import android.widget.Button;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import com.ttstd.dialer.R;
|
||||
|
||||
public class AlarmAlertActivity extends AppCompatActivity {
|
||||
|
||||
private Ringtone ringtone;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
// 允许在锁屏上显示并点亮屏幕
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
|
||||
setShowWhenLocked(true);
|
||||
setTurnScreenOn(true);
|
||||
} else {
|
||||
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
|
||||
| WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
|
||||
| WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
|
||||
}
|
||||
|
||||
setContentView(R.layout.activity_alarm_alert);
|
||||
|
||||
Button btnStop = findViewById(R.id.btn_stop_alarm);
|
||||
btnStop.setOnClickListener(v -> {
|
||||
if (ringtone != null && ringtone.isPlaying()) {
|
||||
ringtone.stop();
|
||||
}
|
||||
finish();
|
||||
});
|
||||
|
||||
playAlarmRingtone();
|
||||
}
|
||||
|
||||
private void playAlarmRingtone() {
|
||||
Uri alarmUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM);
|
||||
if (alarmUri == null) {
|
||||
alarmUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);
|
||||
}
|
||||
|
||||
ringtone = RingtoneManager.getRingtone(this, alarmUri);
|
||||
if (ringtone != null) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
||||
AudioAttributes aa = new AudioAttributes.Builder()
|
||||
.setUsage(AudioAttributes.USAGE_ALARM)
|
||||
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
|
||||
.build();
|
||||
ringtone.setAudioAttributes(aa);
|
||||
}
|
||||
ringtone.play();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDestroy() {
|
||||
super.onDestroy();
|
||||
if (ringtone != null && ringtone.isPlaying()) {
|
||||
ringtone.stop();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11,8 +11,10 @@ import com.ttstd.dialer.R;
|
||||
import com.ttstd.dialer.adapter.MoreAppAdapter;
|
||||
import com.ttstd.dialer.base.mvvm.BaseMvvmActivity;
|
||||
import com.ttstd.dialer.config.CommonConfig;
|
||||
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 java.util.List;
|
||||
|
||||
@@ -64,6 +66,11 @@ public class AppListActivity extends BaseMvvmActivity<AppListViewModel, Activity
|
||||
|
||||
@Override
|
||||
protected void initData() {
|
||||
LiveDataBus.get().<String>on(LiveDataAction.ACTION_UPDATE_APPS)
|
||||
.observe(this, event -> {
|
||||
mViewModel.getDbAppList();
|
||||
});
|
||||
|
||||
mViewModel.mDesktopSortAppData.observe(this, new Observer<List<AppInfo>>() {
|
||||
@Override
|
||||
public void onChanged(List<AppInfo> appInfos) {
|
||||
|
||||
@@ -1,21 +1,55 @@
|
||||
package com.ttstd.dialer.activity.contact.add;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.text.InputFilter;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.activity.result.ActivityResult;
|
||||
import androidx.activity.result.ActivityResultCallback;
|
||||
import androidx.activity.result.ActivityResultLauncher;
|
||||
import androidx.activity.result.contract.ActivityResultContracts;
|
||||
import androidx.lifecycle.Observer;
|
||||
|
||||
import com.hjq.toast.Toaster;
|
||||
import com.kongzue.dialogx.dialogs.PopTip;
|
||||
import com.kongzue.dialogx.dialogs.WaitDialog;
|
||||
import com.luck.picture.lib.basic.PictureSelector;
|
||||
import com.luck.picture.lib.config.SelectMimeType;
|
||||
import com.luck.picture.lib.entity.LocalMedia;
|
||||
import com.ttstd.dialer.R;
|
||||
import com.ttstd.dialer.base.mvvm.BaseMvvmActivity;
|
||||
import com.ttstd.dialer.databinding.ActivityContactAddBinding;
|
||||
import com.ttstd.dialer.db.contact.ContactInfo;
|
||||
import com.ttstd.dialer.filter.NoSpaceInputFilter;
|
||||
import com.ttstd.dialer.mdm.DeviceManagerService;
|
||||
import com.ttstd.dialer.utils.GlideUtils;
|
||||
import com.ttstd.dialer.utils.PhoneUtils;
|
||||
import com.ttstd.dialer.view.GlideEngine;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class ContactAddActivity extends BaseMvvmActivity<ContactAddViewModel, ActivityContactAddBinding> {
|
||||
|
||||
private static final String TAG = "ContactAddActivity";
|
||||
|
||||
private ActivityResultLauncher<Intent> launcherResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
|
||||
new ActivityResultCallback<ActivityResult>() {
|
||||
@Override
|
||||
public void onActivityResult(ActivityResult result) {
|
||||
int resultCode = result.getResultCode();
|
||||
if (resultCode == RESULT_OK) {
|
||||
ArrayList<LocalMedia> selectList = PictureSelector.obtainSelectorList(result.getData());
|
||||
// analyticalSelectResults(selectList);
|
||||
Log.i(TAG, "onActivityResult PictureSelector size = " + selectList.size());
|
||||
GlideUtils.loadBitmapSafe(ContactAddActivity.this, selectList.get(0).getRealPath(), mViewDataBinding.nvAvatar);
|
||||
} else if (resultCode == RESULT_CANCELED) {
|
||||
Log.i(TAG, "onActivityResult PictureSelector Cancel");
|
||||
}
|
||||
}
|
||||
});
|
||||
;
|
||||
|
||||
@Override
|
||||
public boolean setNightMode() {
|
||||
return true;
|
||||
@@ -44,6 +78,8 @@ public class ContactAddActivity extends BaseMvvmActivity<ContactAddViewModel, Ac
|
||||
mViewDataBinding.etName.setFilters(new InputFilter[]{new NoSpaceInputFilter()});
|
||||
mViewDataBinding.etPhone.setFilters(new InputFilter[]{new NoSpaceInputFilter()});
|
||||
mViewDataBinding.etRemark.setFilters(new InputFilter[]{new NoSpaceInputFilter()});
|
||||
|
||||
mViewDataBinding.sbPinned.setEnabled(false);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -52,7 +88,7 @@ public class ContactAddActivity extends BaseMvvmActivity<ContactAddViewModel, Ac
|
||||
@Override
|
||||
public void onChanged(Long aLong) {
|
||||
if (aLong > 0) {
|
||||
Toaster.show("添加成功");
|
||||
PopTip.show("添加成功").iconSuccess();
|
||||
finish();
|
||||
} else {
|
||||
|
||||
@@ -62,6 +98,7 @@ public class ContactAddActivity extends BaseMvvmActivity<ContactAddViewModel, Ac
|
||||
mViewModel.mDbIdData.observe(this, new Observer<Long>() {
|
||||
@Override
|
||||
public void onChanged(Long aLong) {
|
||||
PopTip.show("添加成功").iconSuccess();
|
||||
finish();
|
||||
}
|
||||
});
|
||||
@@ -76,20 +113,26 @@ public class ContactAddActivity extends BaseMvvmActivity<ContactAddViewModel, Ac
|
||||
|
||||
public void save(View view) {
|
||||
if (mViewDataBinding.etName.getText() == null) {
|
||||
Toaster.show("请输入姓名");
|
||||
PopTip.show("请输入姓名").iconWarning();
|
||||
return;
|
||||
}
|
||||
String name = mViewDataBinding.etName.getText().toString();
|
||||
|
||||
if (mViewDataBinding.etPhone.getText() == null) {
|
||||
Toaster.show("请输入手机号码");
|
||||
if (TextUtils.isEmpty(name)) {
|
||||
PopTip.show("请输入姓名").iconWarning();
|
||||
return;
|
||||
}
|
||||
|
||||
if (mViewDataBinding.etPhone.getText() == null) {
|
||||
PopTip.show("请输入手机号码").iconWarning();
|
||||
return;
|
||||
}
|
||||
String phone = mViewDataBinding.etPhone.getText().toString();
|
||||
|
||||
if (TextUtils.isEmpty(phone)) {
|
||||
PopTip.show("请输入手机号码").iconWarning();
|
||||
return;
|
||||
}
|
||||
if (!PhoneUtils.isValidPhone(phone)) {
|
||||
Toaster.show("手机号码格式错误");
|
||||
PopTip.show("手机号码格式错误").iconWarning();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -105,7 +148,7 @@ public class ContactAddActivity extends BaseMvvmActivity<ContactAddViewModel, Ac
|
||||
contactInfo.setCreateTime(System.currentTimeMillis());
|
||||
contactInfo.setUpdateTime(System.currentTimeMillis());
|
||||
mViewModel.addContact(contactInfo);
|
||||
|
||||
WaitDialog.show("正在上传联系人");
|
||||
}
|
||||
|
||||
public void saveLocalDb(View view) {
|
||||
@@ -121,7 +164,17 @@ public class ContactAddActivity extends BaseMvvmActivity<ContactAddViewModel, Ac
|
||||
contactInfo.setBindSn(DeviceManagerService.getInstance().getSerial());
|
||||
contactInfo.setCreateTime(System.currentTimeMillis());
|
||||
contactInfo.setUpdateTime(System.currentTimeMillis());
|
||||
mViewModel.saveContact(contactInfo);
|
||||
mViewModel.saveContactDb(contactInfo);
|
||||
}
|
||||
|
||||
public void openSelector(View view) {
|
||||
PictureSelector.create(ContactAddActivity.this)
|
||||
.openGallery(SelectMimeType.ofImage())
|
||||
.setImageEngine(GlideEngine.createGlideEngine())
|
||||
// .setVideoPlayerEngine(videoPlayerEngine)
|
||||
.forResult(launcherResult);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -46,12 +46,12 @@ public class ContactAddViewModel extends BaseViewModel<ActivityContactAddBinding
|
||||
return Observable.just(id);
|
||||
} else {
|
||||
Logger.w(TAG, "业务失败,降级到本地保存: " + baseResponse.getMsg());
|
||||
return saveContactObservable(contactInfo);
|
||||
return saveContactDbObservable(contactInfo);
|
||||
}
|
||||
})
|
||||
.onErrorResumeNext(throwable -> {
|
||||
Logger.e(TAG, "网络异常,降级到本地保存: " + throwable.getMessage());
|
||||
return saveContactObservable(contactInfo);
|
||||
return saveContactDbObservable(contactInfo);
|
||||
})
|
||||
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
|
||||
.subscribe(new Observer<Long>() {
|
||||
@@ -80,7 +80,7 @@ public class ContactAddViewModel extends BaseViewModel<ActivityContactAddBinding
|
||||
});
|
||||
}
|
||||
|
||||
private Observable<Long> saveContactObservable(ContactInfo contactInfo) {
|
||||
private Observable<Long> saveContactDbObservable(ContactInfo contactInfo) {
|
||||
return Observable.create((ObservableOnSubscribe<Long>) emitter -> {
|
||||
Logger.d(TAG, "执行本地保存: " + contactInfo);
|
||||
contactInfo.setPosition(mRepository.getTotalCount() + 1);
|
||||
@@ -92,8 +92,8 @@ public class ContactAddViewModel extends BaseViewModel<ActivityContactAddBinding
|
||||
}).subscribeOn(Schedulers.io());
|
||||
}
|
||||
|
||||
public void saveContact(ContactInfo contactInfo) {
|
||||
saveContactObservable(contactInfo)
|
||||
public void saveContactDb(ContactInfo contactInfo) {
|
||||
saveContactDbObservable(contactInfo)
|
||||
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new Observer<Long>() {
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
package com.ttstd.dialer.activity.main;
|
||||
|
||||
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 android.view.Window;
|
||||
@@ -20,12 +17,14 @@ 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.config.LiveDataAction;
|
||||
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.fragment.settings.SettingsFragment;
|
||||
import com.ttstd.dialer.livedata.LiveDataBus;
|
||||
import com.ttstd.dialer.manager.AppManager;
|
||||
import com.ttstd.dialer.manager.WeatherUpdateManager;
|
||||
import com.ttstd.dialer.service.main.MainService;
|
||||
@@ -157,7 +156,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
mViewDataBinding.viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
|
||||
@Override
|
||||
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
|
||||
Logger.e(TAG, "onPageScrolled: position = " + position);
|
||||
Logger.v(TAG, "onPageScrolled: position = " + position);
|
||||
if (mCurrentIndex == -1 && position == 0) {
|
||||
mViewDataBinding.viewPager.setCurrentItem(mDefaultIndex, true);
|
||||
mCurrentIndex = mDefaultIndex;
|
||||
@@ -168,12 +167,12 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
|
||||
@Override
|
||||
public void onPageSelected(int position) {
|
||||
Logger.e(TAG, "onPageSelected: position = " + position);
|
||||
Logger.v(TAG, "onPageSelected: position = " + position);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPageScrollStateChanged(int state) {
|
||||
Logger.e(TAG, "onPageScrollStateChanged: state = " + state);
|
||||
Logger.v(TAG, "onPageScrollStateChanged: state = " + state);
|
||||
}
|
||||
});
|
||||
mViewDataBinding.magicIndicator.setNavigator(mScaleCircleNavigator);
|
||||
@@ -213,6 +212,12 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
}
|
||||
});
|
||||
|
||||
LiveDataBus.get().<String>on(LiveDataAction.ACTION_UPDATE_APPS)
|
||||
.observe(this, event -> {
|
||||
mViewModel.getOutsideApp();
|
||||
mViewModel.getHotseatApp();
|
||||
});
|
||||
|
||||
mViewModel.mDesktopSortAppData.observe(this, new Observer<List<AppInfo>>() {
|
||||
@Override
|
||||
public void onChanged(List<AppInfo> appInfos) {
|
||||
@@ -319,35 +324,11 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
|
||||
}
|
||||
|
||||
private void registerReceivers() {
|
||||
registerAppChangedReceive();
|
||||
|
||||
}
|
||||
|
||||
private void unregisterReceivers() {
|
||||
if (mPackageChangedReceiver != null) {
|
||||
unregisterReceiver(mPackageChangedReceiver);
|
||||
}
|
||||
}
|
||||
|
||||
private PackageChangedReceiver mPackageChangedReceiver;
|
||||
|
||||
private void registerAppChangedReceive() {
|
||||
if (null == mPackageChangedReceiver) {
|
||||
mPackageChangedReceiver = new PackageChangedReceiver();
|
||||
}
|
||||
IntentFilter filter = new IntentFilter();
|
||||
filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
|
||||
filter.addAction(Intent.ACTION_PACKAGE_ADDED);
|
||||
filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
|
||||
filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
|
||||
filter.addDataScheme("package");
|
||||
registerReceiver(mPackageChangedReceiver, filter);
|
||||
}
|
||||
|
||||
private class PackageChangedReceiver extends BroadcastReceiver {
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
Logger.e(TAG, "onReceive: " + intent.getAction());
|
||||
}
|
||||
}
|
||||
|
||||
private void setAppList() {
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
package com.ttstd.dialer.activity.settings.home;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.browser.customtabs.CustomTabsIntent;
|
||||
import androidx.core.content.ContextCompat;
|
||||
|
||||
import com.ttstd.dialer.R;
|
||||
import com.ttstd.dialer.activity.settings.call.SettingsCallActivity;
|
||||
import com.ttstd.dialer.activity.settings.utils.SettingsUtilsActivity;
|
||||
@@ -58,5 +62,14 @@ public class SettingsActivity extends BaseMvvmActivity<SettingsViewModel, Activi
|
||||
public void openUtilsSettings(View view) {
|
||||
startActivity(new Intent(SettingsActivity.this, SettingsUtilsActivity.class));
|
||||
}
|
||||
|
||||
public void aboutUs(View view) {
|
||||
String url = "https://www.ttstd.com";
|
||||
CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
|
||||
// (可选)自定义配置
|
||||
builder.setToolbarColor(ContextCompat.getColor(SettingsActivity.this, R.color.colorPrimary));
|
||||
CustomTabsIntent customTabsIntent = builder.build();
|
||||
customTabsIntent.launchUrl(SettingsActivity.this, Uri.parse(url));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -59,15 +59,22 @@ public class SettingsUtilsActivity extends BaseMvvmActivity<SettingsUtilsViewMod
|
||||
|
||||
@Override
|
||||
protected void initView() {
|
||||
if (mViewDataBinding.siFloatWindow.isChecked()) {
|
||||
mViewDataBinding.siFloatWindowKill.setEnabled(true);
|
||||
} else {
|
||||
mViewDataBinding.siFloatWindowKill.setEnabled(false);
|
||||
}
|
||||
|
||||
mViewDataBinding.siFloatWindow.setOnToggleChanged(new ToggleButton.OnToggleChanged() {
|
||||
@Override
|
||||
public void onToggle(boolean on) {
|
||||
Intent intent = new Intent(SettingsUtilsActivity.this, MainService.class);
|
||||
if (on) {
|
||||
mViewDataBinding.siFloatWindowKill.setEnabled(true);
|
||||
intent.setAction(MainService.SHOW_FLOAT_WINDOW_ACTION);
|
||||
mMMKV.encode(CommonConfig.FLOAT_WINDOW_ENABLE, 1);
|
||||
} else {
|
||||
mViewDataBinding.siFloatWindowKill.setEnabled(false);
|
||||
intent.setAction(MainService.HIDE_FLOAT_WINDOW_ACTION);
|
||||
mMMKV.encode(CommonConfig.FLOAT_WINDOW_ENABLE, 0);
|
||||
}
|
||||
@@ -99,6 +106,7 @@ public class SettingsUtilsActivity extends BaseMvvmActivity<SettingsUtilsViewMod
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -79,7 +79,7 @@ public class WeatherMainViewModel extends BaseViewModel<ActivityWeatherMainBindi
|
||||
|
||||
public void getWeather10D(String adCode) {
|
||||
Logger.e(TAG, "getWeather10D: " + adCode);
|
||||
WeatherManager.getInstance().getWeather10Day(adCode, new Callback<WeatherDailyResponse>() {
|
||||
WeatherManager.getInstance().getWeather10DayAdCode(adCode, new Callback<WeatherDailyResponse>() {
|
||||
@Override
|
||||
public void onSuccess(WeatherDailyResponse weatherDailyResponse) {
|
||||
Logger.e("getWeather10D", "onSuccess: ");
|
||||
|
||||
Reference in new issue
Block a user