refactor(ui): 替换 Toaster 为 DialogX PopTip
This commit is contained in:
@@ -23,7 +23,7 @@ import android.view.accessibility.AccessibilityNodeInfo;
|
||||
import android.view.accessibility.AccessibilityWindowInfo;
|
||||
|
||||
import com.blankj.utilcode.util.ToastUtils;
|
||||
import com.hjq.toast.Toaster;
|
||||
import com.kongzue.dialogx.dialogs.PopTip;
|
||||
import com.tencent.mmkv.MMKV;
|
||||
import com.ttstd.dialer.config.CommonConfig;
|
||||
import com.ttstd.dialer.db.contact.ContactInfo;
|
||||
@@ -216,7 +216,7 @@ public class DialerAccessibilityService extends AccessibilityService {
|
||||
break;
|
||||
case "com.tencent.mm.plugin.account.ui.WelcomeActivity":
|
||||
case "com.tencent.mm.plugin.account.ui.LoginPasswordUI":
|
||||
Toaster.showLong("请先登录微信");
|
||||
PopTip.show("请先登录微信").iconWarning();
|
||||
mCurrentStep = Step.WAITING;
|
||||
break;
|
||||
case "com.tencent.mm.plugin.label.ui.ContactLabelManagerUI":
|
||||
@@ -269,7 +269,7 @@ public class DialerAccessibilityService extends AccessibilityService {
|
||||
if (findNodesByViewId("com.tencent.mm:id/gzf").size() > 0) {
|
||||
findSearchContactAndClick("com.tencent.mm:id/odf", Step.CLICK_QUICK_WECHAT_CALL);
|
||||
} else {
|
||||
Toaster.show("没有找到联系人");
|
||||
PopTip.show("没有找到联系人").iconError();
|
||||
mCurrentStep = Step.WAITING;
|
||||
}
|
||||
break;
|
||||
@@ -299,7 +299,7 @@ public class DialerAccessibilityService extends AccessibilityService {
|
||||
break;
|
||||
case CLICK_TAG:
|
||||
if (!findAndClick(Property.TEXT, mTagName, false, Step.CLICK_NAME)) {
|
||||
Toaster.show("没有找到标签");
|
||||
PopTip.show("没有找到标签").iconError();
|
||||
mCurrentStep = Step.WAITING;
|
||||
}
|
||||
break;
|
||||
@@ -607,7 +607,7 @@ public class DialerAccessibilityService extends AccessibilityService {
|
||||
mCurrentStep = nextStep;
|
||||
sendProcessStepMessage(WAIT_TIME);
|
||||
} else {
|
||||
Toaster.show("没有找到搜索框");
|
||||
PopTip.show("没有找到搜索框").iconError();
|
||||
mCurrentStep = Step.WAITING;
|
||||
}
|
||||
}
|
||||
@@ -619,7 +619,7 @@ public class DialerAccessibilityService extends AccessibilityService {
|
||||
if (optional.isPresent()) {
|
||||
sendDelayClickMessage(optional.get(), false, nextStep);
|
||||
} else {
|
||||
Toaster.show("没有找到联系人");
|
||||
PopTip.show("没有找到联系人").iconError();
|
||||
mCurrentStep = Step.WAITING;
|
||||
}
|
||||
}
|
||||
@@ -648,7 +648,7 @@ public class DialerAccessibilityService extends AccessibilityService {
|
||||
sendProcessStepMessage(WAIT_TIME);
|
||||
} else {
|
||||
mCurrentStep = Step.WAITING;
|
||||
Toaster.show("点击失败,请重试");
|
||||
PopTip.show("点击失败,请重试").iconError();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import android.view.View;
|
||||
|
||||
import androidx.lifecycle.Observer;
|
||||
|
||||
import com.hjq.toast.Toaster;
|
||||
import com.kongzue.dialogx.dialogs.PopTip;
|
||||
import com.ttstd.dialer.R;
|
||||
import com.ttstd.dialer.base.mvvm.BaseMvvmActivity;
|
||||
import com.ttstd.dialer.databinding.ActivityContactEditBinding;
|
||||
@@ -56,7 +56,7 @@ public class ContactEditActivity extends BaseMvvmActivity<ContactEditViewModel,
|
||||
@Override
|
||||
public void onChanged(Boolean aBoolean) {
|
||||
if (aBoolean) {
|
||||
Toaster.show("编辑成功");
|
||||
PopTip.show("编辑成功").iconSuccess();
|
||||
finish();
|
||||
}
|
||||
}
|
||||
@@ -72,20 +72,20 @@ public class ContactEditActivity extends BaseMvvmActivity<ContactEditViewModel,
|
||||
public void update(View view) {
|
||||
ContactInfo contactInfo = new ContactInfo(mContactInfo);
|
||||
if (mViewDataBinding.etName.getText() == null) {
|
||||
Toaster.show("请输入姓名");
|
||||
PopTip.show("请输入姓名").iconWarning();
|
||||
return;
|
||||
}
|
||||
String name = mViewDataBinding.etName.getText().toString();
|
||||
|
||||
if (mViewDataBinding.etPhone.getText() == null) {
|
||||
Toaster.show("请输入手机号码");
|
||||
PopTip.show("请输入手机号码").iconWarning();
|
||||
return;
|
||||
}
|
||||
|
||||
String phone = mViewDataBinding.etPhone.getText().toString();
|
||||
|
||||
if (!PhoneUtils.isValidPhone(phone)) {
|
||||
Toaster.show("手机号码格式错误");
|
||||
PopTip.show("手机号码格式错误").iconError();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import android.util.Log;
|
||||
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
|
||||
import com.hjq.toast.Toaster;
|
||||
import com.kongzue.dialogx.dialogs.PopTip;
|
||||
import com.trello.rxlifecycle4.android.ActivityEvent;
|
||||
import com.ttstd.dialer.base.mvvm.BaseViewModel;
|
||||
import com.ttstd.dialer.bean.BaseResponse;
|
||||
@@ -27,7 +27,7 @@ public class ContactEditViewModel extends BaseViewModel<ActivityContactEditBindi
|
||||
mBooleanMutableLiveData.postValue(true);
|
||||
} else {
|
||||
mBooleanMutableLiveData.postValue(false);
|
||||
Toaster.show(baseResponse.getMsg());
|
||||
PopTip.show(baseResponse.getMsg()).iconError();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class ContactEditViewModel extends BaseViewModel<ActivityContactEditBindi
|
||||
public void onFailure(Throwable e) {
|
||||
Log.e("updateContact", "onFailure: " + e.getMessage());
|
||||
mBooleanMutableLiveData.postValue(false);
|
||||
Toaster.show("网络错误,请稍后再试");
|
||||
PopTip.show("网络错误,请稍后再试").iconError();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -13,7 +13,6 @@ import androidx.multidex.MultiDex;
|
||||
|
||||
import com.alibaba.android.arouter.launcher.ARouter;
|
||||
import com.arialyy.aria.core.Aria;
|
||||
import com.hjq.toast.Toaster;
|
||||
import com.kongzue.dialogx.DialogX;
|
||||
import com.tencent.bugly.crashreport.CrashReport;
|
||||
import com.tencent.mmkv.MMKV;
|
||||
@@ -115,8 +114,6 @@ public class BaseApplication extends Application {
|
||||
}
|
||||
ARouter.init(this); // 尽可能早,推荐在Application中初始化
|
||||
|
||||
// 初始化 Toast 框架
|
||||
Toaster.init(this);
|
||||
DialogX.init(this);
|
||||
|
||||
Logger.e(TAG, "slowInit: ");
|
||||
|
||||
@@ -19,7 +19,7 @@ import androidx.fragment.app.DialogFragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
|
||||
import com.hjq.toast.Toaster;
|
||||
import com.kongzue.dialogx.dialogs.PopTip;
|
||||
import com.ttstd.dialer.R;
|
||||
import com.ttstd.dialer.base.mvvm.fragment.BaseMvvmDialogFragment;
|
||||
import com.ttstd.dialer.databinding.DialogFragmentContactCallBinding;
|
||||
@@ -134,7 +134,7 @@ public class CallFragment extends BaseMvvmDialogFragment<CallViewModel, DialogFr
|
||||
intent.putExtra("callType", type);
|
||||
requireContext().startService(intent);
|
||||
} else {
|
||||
Toaster.show("微信未安装,请安装后使用");
|
||||
PopTip.show("微信未安装,请安装后使用").iconWarning();
|
||||
ApkUtils.openAppStore(requireContext(), "com.tencent.mm");
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -13,7 +13,7 @@ import androidx.fragment.app.DialogFragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
|
||||
import com.hjq.toast.Toaster;
|
||||
import com.kongzue.dialogx.dialogs.PopTip;
|
||||
import com.ttstd.dialer.R;
|
||||
import com.ttstd.dialer.base.mvvm.fragment.BaseMvvmDialogFragment;
|
||||
import com.ttstd.dialer.databinding.DialogFragmentDeleteContactBinding;
|
||||
@@ -60,7 +60,7 @@ public class ContactDeleteDialogFragment extends BaseMvvmDialogFragment<ContactD
|
||||
mViewDataBinding.setContactInfo(mContactInfo);
|
||||
GlideUtils.loadImageSafe(requireContext(), mContactInfo.getAvatar(), mViewDataBinding.contactAvatar, AvatarCacheUtil.getAvatar(requireContext(), mContactInfo.getName()));
|
||||
} else {
|
||||
Toaster.show("无联系人信息");
|
||||
PopTip.show("无联系人信息").iconSuccess();
|
||||
dismiss();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ import androidx.fragment.app.DialogFragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
|
||||
import com.hjq.toast.Toaster;
|
||||
import com.kongzue.dialogx.dialogs.PopTip;
|
||||
import com.ttstd.dialer.R;
|
||||
import com.ttstd.dialer.base.mvvm.fragment.BaseMvvmDialogFragment;
|
||||
import com.ttstd.dialer.databinding.DialogFragmentEditContactBinding;
|
||||
@@ -60,7 +60,7 @@ public class EditDialogFragment extends BaseMvvmDialogFragment<EditViewModel, Di
|
||||
mViewDataBinding.setContactInfo(mContactInfo);
|
||||
GlideUtils.loadImageSafe(requireContext(), mContactInfo.getAvatar(), mViewDataBinding.contactAvatar, AvatarCacheUtil.getAvatar(requireContext(), mContactInfo.getName()));
|
||||
} else {
|
||||
Toaster.show("无联系人信息");
|
||||
PopTip.show("无联系人信息").iconWarning();
|
||||
dismiss();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ import android.view.View;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.lifecycle.Observer;
|
||||
|
||||
import com.hjq.toast.Toaster;
|
||||
import com.kongzue.dialogx.dialogs.PopTip;
|
||||
import com.jeremyliao.liveeventbus.LiveEventBus;
|
||||
import com.qweather.sdk.response.weather.WeatherDaily;
|
||||
import com.qweather.sdk.response.weather.WeatherDailyResponse;
|
||||
@@ -289,7 +289,7 @@ public class HomeFragment extends BaseMvvmFragment<HomeViewModel, FragmentHomeBi
|
||||
if (ApkUtils.isInstalled(mContext, "com.ss.android.ugc.aweme")) {
|
||||
ApkUtils.openPackage(mContext, "com.ss.android.ugc.aweme");
|
||||
} else {
|
||||
Toaster.show("抖音未安装,请安装后使用");
|
||||
PopTip.show("抖音未安装,请安装后使用").iconWarning();
|
||||
ApkUtils.openAppStore(mContext, "com.ss.android.ugc.aweme");
|
||||
}
|
||||
}
|
||||
@@ -308,11 +308,11 @@ public class HomeFragment extends BaseMvvmFragment<HomeViewModel, FragmentHomeBi
|
||||
startActivity(intent);
|
||||
} catch (Exception e) {
|
||||
Logger.e(TAG, "launchWeChat: " + e.getMessage());
|
||||
Toaster.show("打开微信失败");
|
||||
PopTip.show("打开微信失败").iconError();
|
||||
ApkUtils.openAppStore(mContext, "com.tencent.mm");
|
||||
}
|
||||
} else {
|
||||
Toaster.show("微信未安装,请安装后使用");
|
||||
PopTip.show("微信未安装,请安装后使用").iconWarning();
|
||||
ApkUtils.openAppStore(mContext, "com.tencent.mm");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ import androidx.annotation.Nullable;
|
||||
import androidx.lifecycle.Observer;
|
||||
|
||||
import com.blankj.utilcode.util.NetworkUtils;
|
||||
import com.hjq.toast.Toaster;
|
||||
import com.kongzue.dialogx.dialogs.PopTip;
|
||||
import com.jeremyliao.liveeventbus.LiveEventBus;
|
||||
import com.shehuan.niv.NiceImageView;
|
||||
import com.tencent.mmkv.MMKV;
|
||||
@@ -260,7 +260,7 @@ public class MainService extends BaseService implements NetworkUtils.OnNetworkSt
|
||||
i++;
|
||||
SystemUtils.killBackgroundProcesses(MainService.this, pkg);
|
||||
}
|
||||
Toaster.show(String.format(getString(R.string.kill_app_number), i));
|
||||
PopTip.show(String.format(getString(R.string.kill_app_number), i)).iconError();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -13,7 +13,7 @@ import android.graphics.drawable.Drawable;
|
||||
import android.net.Uri;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import com.hjq.toast.Toaster;
|
||||
import com.kongzue.dialogx.dialogs.PopTip;
|
||||
import com.ttstd.dialer.R;
|
||||
|
||||
import java.util.List;
|
||||
@@ -41,7 +41,7 @@ public class ApkUtils {
|
||||
return true;
|
||||
}
|
||||
Logger.e(TAG, "openPackage: can not open " + packageName);
|
||||
Toaster.show("打开失败");
|
||||
PopTip.show("打开失败").iconError();
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user