邓琴文 3 gadi atpakaļ
vecāks
revīzija
98f5adfcae
77 mainītis faili ar 213 papildinājumiem un 167 dzēšanām
  1. 3 2
      BaseLibrary/src/main/java/com/cooleshow/base/ui/video/VideoPlayActivity.java
  2. 1 1
      BaseLibrary/src/main/java/com/cooleshow/base/utils/UtilsBridge.java
  3. 2 2
      live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/TopOperateControlFragment.java
  4. 3 2
      rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/CreateGroupActivity.java
  5. 4 3
      rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/ImAppealActivity.java
  6. 5 4
      rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/NoticeEditActivity.java
  7. 3 2
      rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/SelectScoreChatActivity.java
  8. 3 2
      rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/SetRemarksActivity.java
  9. 1 1
      student/src/main/java/com/cooleshow/student/presenter/mine/AddressListPresenter.java
  10. 1 1
      student/src/main/java/com/cooleshow/student/presenter/mine/CheckModifyPhoneNumPresenter.java
  11. 2 2
      student/src/main/java/com/cooleshow/student/presenter/mine/EditAddressPresenter.java
  12. 1 1
      student/src/main/java/com/cooleshow/student/presenter/mine/FeedBackPresenter.java
  13. 2 2
      student/src/main/java/com/cooleshow/student/presenter/mine/ModifyPasswordPresenter.java
  14. 1 1
      student/src/main/java/com/cooleshow/student/presenter/mine/ModifyPhoneNumPresenter.java
  15. 1 1
      student/src/main/java/com/cooleshow/student/presenter/mine/PersonalCertificationPresenter.java
  16. 1 1
      student/src/main/java/com/cooleshow/student/ui/course/EvaluateTeacherActivity.java
  17. 1 1
      student/src/main/java/com/cooleshow/student/ui/course/PracticeCourseDetailActivity.java
  18. 1 1
      student/src/main/java/com/cooleshow/student/ui/main/MallFragment.java
  19. 2 2
      student/src/main/java/com/cooleshow/student/ui/mine/CheckModifyPhoneNumActivity.java
  20. 6 6
      student/src/main/java/com/cooleshow/student/ui/mine/EditAddressActivity.java
  21. 3 3
      student/src/main/java/com/cooleshow/student/ui/mine/FeedBackActivity.java
  22. 1 1
      student/src/main/java/com/cooleshow/student/ui/mine/ModifyNickNameActivity.java
  23. 3 3
      student/src/main/java/com/cooleshow/student/ui/mine/ModifyPasswordActivity.java
  24. 3 3
      student/src/main/java/com/cooleshow/student/ui/mine/ModifyPhoneNumActivity.java
  25. 4 4
      student/src/main/java/com/cooleshow/student/ui/mine/PayTestActivity.java
  26. 2 2
      student/src/main/java/com/cooleshow/student/ui/mine/PersonalCertificationActivity.java
  27. 1 1
      student/src/main/java/com/cooleshow/student/ui/mine/PersonalSettingActivity.java
  28. 2 1
      student/src/main/java/com/cooleshow/student/ui/mine/TeachableInstrumentActivity.java
  29. 3 3
      student/src/main/java/com/cooleshow/student/ui/web/AccompanyActivity.java
  30. 10 10
      student/src/main/java/com/cooleshow/student/ui/web/AccompanyFragment.java
  31. 1 1
      student/src/main/java/com/cooleshow/student/ui/web/HtmlActivity.java
  32. 1 1
      student/src/main/java/com/cooleshow/student/ui/web/HtmlHorizontalScreenActivity.java
  33. 1 1
      student/src/main/java/com/cooleshow/student/widgets/CourseSetCommentDialog.java
  34. 2 2
      student/src/main/java/com/cooleshow/student/wxapi/WXPayEntryActivity.java
  35. 2 1
      teacher/src/main/java/com/cooleshow/teacher/presenter/income/MineIncomePresenter.java
  36. 3 2
      teacher/src/main/java/com/cooleshow/teacher/presenter/income/WithdrawalPresenter.java
  37. 2 1
      teacher/src/main/java/com/cooleshow/teacher/presenter/mine/AddressListPresenter.java
  38. 3 2
      teacher/src/main/java/com/cooleshow/teacher/presenter/mine/BindBankCardPresenter.java
  39. 2 1
      teacher/src/main/java/com/cooleshow/teacher/presenter/mine/CheckModifyPhoneNumPresenter.java
  40. 3 2
      teacher/src/main/java/com/cooleshow/teacher/presenter/mine/EditAddressPresenter.java
  41. 2 1
      teacher/src/main/java/com/cooleshow/teacher/presenter/mine/FeedBackPresenter.java
  42. 4 3
      teacher/src/main/java/com/cooleshow/teacher/presenter/mine/InputBankVCodePresenter.java
  43. 3 2
      teacher/src/main/java/com/cooleshow/teacher/presenter/mine/ModifyPasswordPresenter.java
  44. 2 1
      teacher/src/main/java/com/cooleshow/teacher/presenter/mine/ModifyPhoneNumPresenter.java
  45. 2 1
      teacher/src/main/java/com/cooleshow/teacher/presenter/mine/PersonalCertificationPresenter.java
  46. 2 1
      teacher/src/main/java/com/cooleshow/teacher/presenter/score/MineScoreActPresenter.java
  47. 2 1
      teacher/src/main/java/com/cooleshow/teacher/ui/comment/CourseCommentDetailActivity.java
  48. 3 2
      teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalActivity.java
  49. 4 3
      teacher/src/main/java/com/cooleshow/teacher/ui/live/CreateLiveActivity.java
  50. 2 1
      teacher/src/main/java/com/cooleshow/teacher/ui/main/MallFragment.java
  51. 7 6
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/BindBankCardActivity.java
  52. 3 2
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/CheckModifyPhoneNumActivity.java
  53. 7 6
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/EditAddressActivity.java
  54. 4 3
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/FeedBackActivity.java
  55. 2 1
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/ModifyNickNameActivity.java
  56. 3 3
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/ModifyPasswordActivity.java
  57. 4 3
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/ModifyPhoneNumActivity.java
  58. 2 1
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/MyBankCardActivity.java
  59. 5 4
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/PayTestActivity.java
  60. 3 2
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/PersonalCertificationActivity.java
  61. 1 1
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/PersonalSettingActivity.java
  62. 1 1
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/UnBindBankCardActivity.java
  63. 4 4
      teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreActivity.java
  64. 4 3
      teacher/src/main/java/com/cooleshow/teacher/ui/web/AccompanyActivity.java
  65. 11 10
      teacher/src/main/java/com/cooleshow/teacher/ui/web/AccompanyFragment.java
  66. 2 1
      teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlActivity.java
  67. 2 1
      teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlHorizontalScreenActivity.java
  68. 3 2
      teacher/src/main/java/com/cooleshow/teacher/ui/web/WebActivity.java
  69. 2 1
      teacher/src/main/java/com/cooleshow/teacher/widgets/CourseSetCommentDialog.java
  70. 3 2
      teacher/src/main/java/com/cooleshow/teacher/widgets/DialogUtils.java
  71. 3 2
      teacher/src/main/java/com/cooleshow/teacher/wxapi/WXPayEntryActivity.java
  72. 4 3
      usercenter/src/main/java/com/cooleshow/usercenter/helper/PhoneCheckHelper.java
  73. 2 1
      usercenter/src/main/java/com/cooleshow/usercenter/presenter/BindPasswordPresenter.java
  74. 2 1
      usercenter/src/main/java/com/cooleshow/usercenter/presenter/LoginPresenter.kt
  75. 3 2
      usercenter/src/main/java/com/cooleshow/usercenter/presenter/VerifyLoginPresenter.java
  76. 2 1
      usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/BindPasswordActivity.java
  77. 2 1
      usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/VerifyCodeInputActivity.java

+ 3 - 2
BaseLibrary/src/main/java/com/cooleshow/base/ui/video/VideoPlayActivity.java

@@ -11,6 +11,7 @@ import android.widget.MediaController;
 import com.cooleshow.base.R;
 import com.cooleshow.base.databinding.ActivityVideoPlayLayoutBinding;
 import com.cooleshow.base.ui.activity.BaseActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.Utils;
 import com.umeng.socialize.utils.CommonUtil;
@@ -33,7 +34,7 @@ public class VideoPlayActivity extends BaseActivity<ActivityVideoPlayLayoutBindi
         Utils.setHeadView(viewBinding.viewStatusBar, this, 0);
         String videoPath = getIntent().getStringExtra(VIDEO_PATH_KEY);
         if (TextUtils.isEmpty(videoPath)) {
-            ToastUtils.showShort("视频地址不可为空");
+            ToastUtil.getInstance().showShort("视频地址不可为空");
             finish();
             return;
         }
@@ -83,7 +84,7 @@ public class VideoPlayActivity extends BaseActivity<ActivityVideoPlayLayoutBindi
      */
     @Override
     public boolean onError(MediaPlayer mp, int what, int extra) {
-        ToastUtils.showShort("视频加载失败");
+        ToastUtil.getInstance().showShort("视频加载失败");
         return false;
     }
 

+ 1 - 1
BaseLibrary/src/main/java/com/cooleshow/base/utils/UtilsBridge.java

@@ -576,7 +576,7 @@ class UtilsBridge {
     // ToastUtils
     ///////////////////////////////////////////////////////////////////////////
     static void toastShowShort(final CharSequence text) {
-        ToastUtils.showShort(text);
+        ToastUtil.getInstance().showShort(text.toString());
     }
 
     static void toastCancel() {

+ 2 - 2
live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/TopOperateControlFragment.java

@@ -464,7 +464,7 @@ public class TopOperateControlFragment extends BaseFragment<FragmentTopOperateCo
                             allowRefresh = false;
                             showRefreshDialog();
                         } else {
-                            ToastUtils.showShort("线路切换中,请稍后");
+                            ToastUtil.getInstance().showShort("线路切换中,请稍后");
                         }
                         break;
                     case COMPLAINT:
@@ -615,7 +615,7 @@ public class TopOperateControlFragment extends BaseFragment<FragmentTopOperateCo
 
     // 切换线路
     public void leaveRoom(final String roomId, boolean isRefresh) {
-        ToastUtils.showShort("线路切换中,请稍后");
+        ToastUtil.getInstance().showShort("线路切换中,请稍后");
         VideoViewManager.getInstance().clear();
         if (classViewModel != null) {
             classViewModel.leaveRoom(roomId, userInfoValue.getUserId());

+ 3 - 2
rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/CreateGroupActivity.java

@@ -10,6 +10,7 @@ import com.common.im.contract.CreateGroupContract;
 import com.common.im.presenter.CreateGroupPresenter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 
 /**
@@ -25,7 +26,7 @@ public class CreateGroupActivity extends BaseMVPActivity<ActivityCreateGroupBind
         if (view.getId() == R.id.tv_create) {
             String groupName = viewBinding.etGroupName.getText().toString().trim();
             if (TextUtils.isEmpty(groupName)){
-                ToastUtils.showShort("请输入粉丝群名称!");
+                ToastUtil.getInstance().showShort("请输入粉丝群名称!");
                 return;
             }
             String introduction = viewBinding.etIntroduction.getText().toString().trim();
@@ -51,7 +52,7 @@ public class CreateGroupActivity extends BaseMVPActivity<ActivityCreateGroupBind
 
     @Override
     public void createImGroupSuccess() {
-        ToastUtils.showShort("创建成功");
+        ToastUtil.getInstance().showShort("创建成功");
         finish();
     }
 }

+ 4 - 3
rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/ImAppealActivity.java

@@ -23,6 +23,7 @@ import com.common.im_ui.R;
 import com.common.im_ui.databinding.ActivityImAppealBinding;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.daya.live_teaching.utils.GlideEngine;
@@ -96,12 +97,12 @@ public class ImAppealActivity extends BaseMVPActivity<ActivityImAppealBinding, I
         });
         btn_commit.setOnClickListener(view -> {
             if (null == selectList || selectList.size() <= 0) {
-                ToastUtils.showShort("请选择聊天截图");
+                ToastUtil.getInstance().showShort("请选择聊天截图");
                 return;
             }
             memo = et_content.getText().toString().trim();
             if (TextUtils.isEmpty(memo)) {
-                ToastUtils.showShort("请输入投诉的理由");
+                ToastUtil.getInstance().showShort("请输入投诉的理由");
                 return;
             }
             for (int i = 0; i < selectList.size(); i++) {
@@ -198,7 +199,7 @@ public class ImAppealActivity extends BaseMVPActivity<ActivityImAppealBinding, I
 
     @Override
     public void sysImComplaintSuccess() {
-        ToastUtils.showShort("已收到您的投诉,我们会认真审核并处理");
+        ToastUtil.getInstance().showShort("已收到您的投诉,我们会认真审核并处理");
         finish();
     }
 }

+ 5 - 4
rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/NoticeEditActivity.java

@@ -13,6 +13,7 @@ import com.common.im.presenter.NoticeEditPresenter;
 import com.common.im_ui.databinding.ActivityNoticeEditBinding;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 
 /**
@@ -59,12 +60,12 @@ public class NoticeEditActivity extends BaseMVPActivity<ActivityNoticeEditBindin
         btnCommit.setOnClickListener(v -> {
             String title = etTitle.getText().toString().trim();
             if (TextUtils.isEmpty(title)) {
-                ToastUtils.showShort("请输入标题");
+                ToastUtil.getInstance().showShort("请输入标题");
                 return;
             }
             String notice = etNotice.getText().toString().trim();
             if (TextUtils.isEmpty(notice)) {
-                ToastUtils.showShort("请填写群公告,1-255字");
+                ToastUtil.getInstance().showShort("请填写群公告,1-255字");
                 return;
             }
             if (TextUtils.isEmpty(NoticeEditActivity.this.title)) {
@@ -87,13 +88,13 @@ public class NoticeEditActivity extends BaseMVPActivity<ActivityNoticeEditBindin
 
     @Override
     public void updateGroupNoticeSuccess() {
-        ToastUtils.showShort("发布成功");
+        ToastUtil.getInstance().showShort("发布成功");
         finish();
     }
 
     @Override
     public void createGroupNoticeSuccess() {
-        ToastUtils.showShort("发布成功");
+        ToastUtil.getInstance().showShort("发布成功");
         finish();
     }
 }

+ 3 - 2
rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/SelectScoreChatActivity.java

@@ -20,6 +20,7 @@ import com.common.im.presenter.SelectScoreChatPresenter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.common.im.adapter.MineScoreAdapter;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.rong.io.live.manager.RCChatRoomMessageManager;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
@@ -164,12 +165,12 @@ public class SelectScoreChatActivity extends BaseMVPActivity<ActivitySelectScore
 
             @Override
             public void onSuccess(Message message) {
-                ToastUtils.showShort("发送成功");
+                ToastUtil.getInstance().showShort("发送成功");
             }
 
             @Override
             public void onError(Message message, RongIMClient.ErrorCode errorCode) {
-                ToastUtils.showShort("发送失败");
+                ToastUtil.getInstance().showShort("发送失败");
             }
         });
     }

+ 3 - 2
rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/SetRemarksActivity.java

@@ -15,6 +15,7 @@ import com.common.im_ui.R;
 import com.common.im_ui.databinding.ActivitySetRemarkBinding;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 
 /**
@@ -31,7 +32,7 @@ public class SetRemarksActivity extends BaseMVPActivity<ActivitySetRemarkBinding
         if (id == com.cooleshow.base.R.id.tv_right_text) {
             remarks = et_remarks.getText().toString().trim();
             if (TextUtils.isEmpty(remarks)) {
-                ToastUtils.showShort("请输入备注名");
+                ToastUtil.getInstance().showShort("请输入备注名");
                 return;
             }
             presenter.updateGroupInfo(targetId, remarks);
@@ -93,7 +94,7 @@ public class SetRemarksActivity extends BaseMVPActivity<ActivitySetRemarkBinding
 
     @Override
     public void updateGroupInfoSuccess() {
-        ToastUtils.showShort("设置成功");
+        ToastUtil.getInstance().showShort("设置成功");
         Intent intent = new Intent();
         intent.putExtra("remarks", remarks);
         setResult(RESULT_OK,intent);

+ 1 - 1
student/src/main/java/com/cooleshow/student/presenter/mine/AddressListPresenter.java

@@ -39,7 +39,7 @@ public class AddressListPresenter extends BasePresenter<AddressListContract.Addr
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 1 - 1
student/src/main/java/com/cooleshow/student/presenter/mine/CheckModifyPhoneNumPresenter.java

@@ -39,7 +39,7 @@ public class CheckModifyPhoneNumPresenter extends BasePresenter<CheckModifyPhone
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 2 - 2
student/src/main/java/com/cooleshow/student/presenter/mine/EditAddressPresenter.java

@@ -39,7 +39,7 @@ public class EditAddressPresenter extends BasePresenter<EditAddressContract.Edit
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });
@@ -67,7 +67,7 @@ public class EditAddressPresenter extends BasePresenter<EditAddressContract.Edit
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 1 - 1
student/src/main/java/com/cooleshow/student/presenter/mine/FeedBackPresenter.java

@@ -40,7 +40,7 @@ public class FeedBackPresenter extends BasePresenter<FeedBackContract.FeedBackVi
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 2 - 2
student/src/main/java/com/cooleshow/student/presenter/mine/ModifyPasswordPresenter.java

@@ -40,7 +40,7 @@ public class ModifyPasswordPresenter extends BasePresenter<ModifyPasswordContrac
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });
@@ -67,7 +67,7 @@ public class ModifyPasswordPresenter extends BasePresenter<ModifyPasswordContrac
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 1 - 1
student/src/main/java/com/cooleshow/student/presenter/mine/ModifyPhoneNumPresenter.java

@@ -36,7 +36,7 @@ public class ModifyPhoneNumPresenter extends BasePresenter<ModifyPhoneNumContrac
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 1 - 1
student/src/main/java/com/cooleshow/student/presenter/mine/PersonalCertificationPresenter.java

@@ -38,7 +38,7 @@ public class PersonalCertificationPresenter extends BasePresenter<PersonalCertif
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 1 - 1
student/src/main/java/com/cooleshow/student/ui/course/EvaluateTeacherActivity.java

@@ -32,7 +32,7 @@ public class EvaluateTeacherActivity extends BaseMVPActivity<ActivityEvaluateTea
             case R.id.tv_confirm:
                 String inputContent = viewBinding.etInput.getText().toString().trim();
                 if (TextUtils.isEmpty(inputContent)) {
-                    ToastUtils.showShort("请输入您对本次课程老师的评价");
+                    ToastUtil.getInstance().showShort("请输入您对本次课程老师的评价");
                     break;
                 }
                 presenter.submitSparringCourseComment(inputContent,mCourseId,mCourseGroupId);

+ 1 - 1
student/src/main/java/com/cooleshow/student/ui/course/PracticeCourseDetailActivity.java

@@ -65,7 +65,7 @@ public class PracticeCourseDetailActivity extends BaseMVPActivity<ActivityPracti
                 switch (courseStatus) {
                     case CourseConstants.COURSE_STATUS_NOT_START:
                         //课程未开始
-                        ToastUtils.showShort("课程还未开始,请在上课前5分钟进入");
+                        ToastUtil.getInstance().showShort("课程还未开始,请在上课前5分钟进入");
                         break;
                     case CourseConstants.COURSE_STATUS_ING:
                         //课程进行中

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
student/src/main/java/com/cooleshow/student/ui/main/MallFragment.java


+ 2 - 2
student/src/main/java/com/cooleshow/student/ui/mine/CheckModifyPhoneNumActivity.java

@@ -36,12 +36,12 @@ public class CheckModifyPhoneNumActivity extends BaseMVPActivity<ActivityCheckMo
             case R.id.tv_confirm:
                 String phoneNum = viewBinding.etPhoneNum.getText().toString().trim();
                 if (TextUtils.isEmpty(phoneNum)) {
-                    ToastUtils.showShort("请输入手机号");
+                    ToastUtil.getInstance().showShort("请输入手机号");
                     break;
                 }
                 String password = viewBinding.etPassword.getText().toString().trim();
                 if (TextUtils.isEmpty(password)) {
-                    ToastUtils.showShort("请输入密码");
+                    ToastUtil.getInstance().showShort("请输入密码");
                     break;
                 }
                 presenter.checkUser(phoneNum, password);

+ 6 - 6
student/src/main/java/com/cooleshow/student/ui/mine/EditAddressActivity.java

@@ -77,31 +77,31 @@ public class EditAddressActivity extends BaseMVPActivity<ActivityEditAddressBind
                 if (isLoaded) {
                     showPickerView();
                 } else {
-                    ToastUtils.showShort("数据加载中,请稍后重试!");
+                    ToastUtil.getInstance().showShort("数据加载中,请稍后重试!");
                 }
                 break;
             case R.id.tv_save:
                 String name = viewBinding.etName.getText().toString().trim();
                 if (TextUtils.isEmpty(name)) {
-                    ToastUtils.showShort("请输入姓名");
+                    ToastUtil.getInstance().showShort("请输入姓名");
                     break;
                 }
                 String phoneNumber = viewBinding.etPhone.getText().toString().trim();
                 if (TextUtils.isEmpty(phoneNumber)) {
-                    ToastUtils.showShort("请输入收件人电话号码");
+                    ToastUtil.getInstance().showShort("请输入收件人电话号码");
                     break;
                 }
                 if (phoneNumber.length() != 11) {
-                    ToastUtils.showShort("请输入正确电话号码");
+                    ToastUtil.getInstance().showShort("请输入正确电话号码");
                     break;
                 }
                 if (TextUtils.isEmpty(province)) {
-                    ToastUtils.showShort("请选择所在地区");
+                    ToastUtil.getInstance().showShort("请选择所在地区");
                     break;
                 }
                 String detailAddress = viewBinding.etDetailAddress.getText().toString().trim();
                 if (TextUtils.isEmpty(detailAddress)) {
-                    ToastUtils.showShort("请输入详细地址");
+                    ToastUtil.getInstance().showShort("请输入详细地址");
                     break;
                 }
 

+ 3 - 3
student/src/main/java/com/cooleshow/student/ui/mine/FeedBackActivity.java

@@ -37,12 +37,12 @@ public class FeedBackActivity extends BaseMVPActivity<ActivityFeedbackBinding, F
             case R.id.tv_submit:
                 String content = viewBinding.etContent.getText().toString().trim();
                 if (TextUtils.isEmpty(content)) {
-                    ToastUtils.showShort("请输入您的反馈意见");
+                    ToastUtil.getInstance().showShort("请输入您的反馈意见");
                     break;
                 }
                 String mobileNo = viewBinding.etConnect.getText().toString().trim();
                 if (TextUtils.isEmpty(mobileNo)) {
-                    ToastUtils.showShort("请输入您的邮箱或手机号");
+                    ToastUtil.getInstance().showShort("请输入您的邮箱或手机号");
                     break;
                 }
                 Map<String, String> params = new HashMap<>();
@@ -78,7 +78,7 @@ public class FeedBackActivity extends BaseMVPActivity<ActivityFeedbackBinding, F
 
     @Override
     public void addSuggestionSuccess(Object object) {
-        ToastUtils.showShort("提交成功");
+        ToastUtil.getInstance().showShort("提交成功");
         finish();
     }
 }

+ 1 - 1
student/src/main/java/com/cooleshow/student/ui/mine/ModifyNickNameActivity.java

@@ -39,7 +39,7 @@ public class ModifyNickNameActivity extends BaseMVPActivity<ActivityModifyNickna
             case R.id.tv_right_text:
                 String userName = viewBinding.etNickname.getText().toString().trim();
                 if (TextUtils.isEmpty(userName)){
-                    ToastUtils.showShort("请输入昵称!");
+                    ToastUtil.getInstance().showShort("请输入昵称!");
                     break;
                 }
                 JSONObject jsonObject = new JSONObject();

+ 3 - 3
student/src/main/java/com/cooleshow/student/ui/mine/ModifyPasswordActivity.java

@@ -48,12 +48,12 @@ public class ModifyPasswordActivity extends BaseMVPActivity<ActivityModifyPasswo
             case R.id.tv_confirm:
                 String password = viewBinding.etPassword.getText().toString().trim();
                 if (TextUtils.isEmpty(password) || password.length() < 6 || password.length() > 20) {
-                    ToastUtils.showShort("请输入6-20位密码");
+                    ToastUtil.getInstance().showShort("请输入6-20位密码");
                     break;
                 }
                 String authCode = viewBinding.etAuthCode.getText().toString().trim();
                 if (TextUtils.isEmpty(authCode)) {
-                    ToastUtils.showShort("请输入验证码");
+                    ToastUtil.getInstance().showShort("请输入验证码");
                     break;
                 }
                 Map<String, String> params = new HashMap<>();
@@ -121,7 +121,7 @@ public class ModifyPasswordActivity extends BaseMVPActivity<ActivityModifyPasswo
 
 
     public void getCodeSuccess() {
-        ToastUtils.showShort("验证码发送成功,请注意查收!");
+        ToastUtil.getInstance().showShort("验证码发送成功,请注意查收!");
         startTimer();
     }
 

+ 3 - 3
student/src/main/java/com/cooleshow/student/ui/mine/ModifyPhoneNumActivity.java

@@ -44,12 +44,12 @@ public class ModifyPhoneNumActivity extends BaseMVPActivity<ActivityModifyPhonen
             case R.id.tv_save:
                 String phoneNum = viewBinding.etPhoneNum.getText().toString().trim();
                 if (TextUtils.isEmpty(phoneNum)){
-                    ToastUtils.showShort("请输入手机号");
+                    ToastUtil.getInstance().showShort("请输入手机号");
                     break;
                 }
                 String authCode = viewBinding.etAuthCode.getText().toString().trim();
                 if (TextUtils.isEmpty(authCode)){
-                    ToastUtils.showShort("请输入验证码");
+                    ToastUtil.getInstance().showShort("请输入验证码");
                     break;
                 }
                 presenter.updatePhone(oldPhone,phoneNum,authCode);
@@ -90,7 +90,7 @@ public class ModifyPhoneNumActivity extends BaseMVPActivity<ActivityModifyPhonen
     }
 
     public void getCodeSuccess() {
-        ToastUtils.showShort("验证码发送成功,请注意查收!");
+        ToastUtil.getInstance().showShort("验证码发送成功,请注意查收!");
         startTimer();
     }
 

+ 4 - 4
student/src/main/java/com/cooleshow/student/ui/mine/PayTestActivity.java

@@ -54,7 +54,7 @@ public class PayTestActivity extends BaseMVPActivity<ActivityPayTestBinding, Pay
         switch (view.getId()) {
             case R.id.tv_weixin:
                 if (TextUtils.isEmpty(orderNo)) {
-                    ToastUtils.showShort("输入订单号");
+                    ToastUtil.getInstance().showShort("输入订单号");
                     break;
                 }
                 doWeixinPay(orderNo);
@@ -63,7 +63,7 @@ public class PayTestActivity extends BaseMVPActivity<ActivityPayTestBinding, Pay
                 break;
             case R.id.tv_alipay:
                 if (TextUtils.isEmpty(orderNo)) {
-                    ToastUtils.showShort("输入订单号");
+                    ToastUtil.getInstance().showShort("输入订单号");
                     break;
                 }
                 doAliPay(orderNo);
@@ -182,12 +182,12 @@ public class PayTestActivity extends BaseMVPActivity<ActivityPayTestBinding, Pay
                     if (TextUtils.equals(resultStatus, "9000")) {
                         // 该笔订单是否真实支付成功,需要依赖服务端的异步通知。
 //                        isAlipayOk = true;
-                        ToastUtils.showShort("支付成功");
+                        ToastUtil.getInstance().showShort("支付成功");
                     } else {
 //                        isAlipayOk = false;
                         // 该笔订单真实的支付结果,需要依赖服务端的异步通知。
 //                        showAlert(VipInfoActivity.this, getString(R.string.pay_failed) + payResult.getMemo());
-                        ToastUtils.showShort("支付失败"+resultStatus);
+                        ToastUtil.getInstance().showShort("支付失败"+resultStatus);
                     }
                     break;
                 }

+ 2 - 2
student/src/main/java/com/cooleshow/student/ui/mine/PersonalCertificationActivity.java

@@ -35,12 +35,12 @@ public class PersonalCertificationActivity extends BaseMVPActivity<ActivityPerso
             case R.id.tv_confirm:
                 String name = viewBinding.etName.getText().toString().trim();
                 if (TextUtils.isEmpty(name)){
-                    ToastUtils.showShort("请输入真实姓名");
+                    ToastUtil.getInstance().showShort("请输入真实姓名");
                     break;
                 }
                 String certificateNum = viewBinding.etCertificateNum.getText().toString().trim();
                 if (TextUtils.isEmpty(certificateNum)){
-                    ToastUtils.showShort("请输入身份证号");
+                    ToastUtil.getInstance().showShort("请输入身份证号");
                     break;
                 }
                 JSONObject jsonObjectC = new JSONObject();

+ 1 - 1
student/src/main/java/com/cooleshow/student/ui/mine/PersonalSettingActivity.java

@@ -426,7 +426,7 @@ public class PersonalSettingActivity extends BaseMVPActivity<ActivityPersonalSet
         }else{
             viewBinding.tvBirthday.setText("");
         }
-        ToastUtils.showShort("修改成功");
+        ToastUtil.getInstance().showShort("修改成功");
         GlideUtils.INSTANCE.loadImage(this, setDetailBean.avatar, viewBinding.imHeader, R.drawable.icon_student_default_head);
 
 

+ 2 - 1
student/src/main/java/com/cooleshow/student/ui/mine/TeachableInstrumentActivity.java

@@ -13,6 +13,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.TeachableInstrumentAdapter;
@@ -56,7 +57,7 @@ public class TeachableInstrumentActivity extends BaseMVPActivity<ActivityTeachab
                     }
                 }
                 if (selectTeachableInstrument.size() == 0) {
-                    ToastUtils.showShort("请选择乐器");
+                    ToastUtil.getInstance().showShort("请选择乐器");
                     break;
                 }
                 presenter.setSubject(selectTeachableInstrument.get(0).id + "");

+ 3 - 3
student/src/main/java/com/cooleshow/student/ui/web/AccompanyActivity.java

@@ -148,7 +148,7 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
                                 filePath = file.getPath();
                                 sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.fromFile(new File(filePath))));
                                 hideLoading();
-                                ToastUtils.showShort("保存成功");
+                                ToastUtil.getInstance().showShort("保存成功");
                             } catch (Exception e) {
                             }
 
@@ -190,7 +190,7 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
                 File file = new File(recordVideFilePath);
 
                 if (!file.exists()) {
-                    ToastUtils.showShort("未找到该视频,请重试");
+                    ToastUtil.getInstance().showShort("未找到该视频,请重试");
                     FileUtils.deleteFile(recordVideFilePath);
                 }
                 UploadHelper uploadHelper = new UploadHelper(AccompanyActivity.this);
@@ -214,7 +214,7 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
                     @Override
                     public void onFailure() {
                         upLoadFileFaile();
-                        ToastUtils.showShort("上传失败,请重新选择");
+                        ToastUtil.getInstance().showShort("上传失败,请重新选择");
                     }
                 });
 

+ 10 - 10
student/src/main/java/com/cooleshow/student/ui/web/AccompanyFragment.java

@@ -1403,7 +1403,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
         public void onResult(SHARE_MEDIA platform) {
 
             if (platform.name().equals("WEIXIN_FAVORITE")) {
-                ToastUtils.showShort("收藏成功啦");
+                ToastUtil.getInstance().showShort("收藏成功啦");
             } else {
                 if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
                         && platform != SHARE_MEDIA.EMAIL
@@ -1417,7 +1417,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                         && platform != SHARE_MEDIA.GOOGLEPLUS
                         && platform != SHARE_MEDIA.YNOTE
                         && platform != SHARE_MEDIA.EVERNOTE) {
-                    ToastUtils.showShort("分享成功啦");
+                    ToastUtil.getInstance().showShort("分享成功啦");
                 }
 
             }
@@ -1437,7 +1437,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                     && platform != SHARE_MEDIA.GOOGLEPLUS
                     && platform != SHARE_MEDIA.YNOTE
                     && platform != SHARE_MEDIA.EVERNOTE) {
-                ToastUtils.showShort("分享失败啦");
+                ToastUtil.getInstance().showShort("分享失败啦");
 
             }
 
@@ -1445,7 +1445,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
 
         @Override
         public void onCancel(SHARE_MEDIA platform) {
-            ToastUtils.showShort("分享取消了");
+            ToastUtil.getInstance().showShort("分享取消了");
         }
     }
 
@@ -1518,7 +1518,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
             midiFileDuration = obj.optLong("duration");
             processInterval = obj.optInt("interval", 16);
             if (TextUtils.isEmpty(midiFile)) {
-                ToastUtils.showShort("文件异常");
+                ToastUtil.getInstance().showShort("文件异常");
                 return;
             }
             new RxPermissions(this)
@@ -1528,7 +1528,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                             try {
                                 String type = midiFile.substring(midiFile.lastIndexOf(".") + 1);
                                 if (TextUtils.isEmpty(type)) {
-                                    ToastUtils.showShort("文件异常");
+                                    ToastUtil.getInstance().showShort("文件异常");
                                     return;
                                 }
                                 String path = FileUtils.getPublicDirectory("file");
@@ -1576,7 +1576,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                                                         });
                                                     } else {
                                                         runOnUiThread(() -> {
-                                                            ToastUtils.showShort("获取文件失败");
+                                                            ToastUtil.getInstance().showShort("获取文件失败");
                                                             midiFilePath = null;
                                                             onSendMessage(message.toString());
                                                         });
@@ -1587,7 +1587,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                                                 public void onError(Throwable e) {
                                                     runOnUiThread(() -> {
                                                         hideLoading();
-                                                        ToastUtils.showShort("文件异常");
+                                                        ToastUtil.getInstance().showShort("文件异常");
                                                         midiFilePath = null;
                                                         onSendMessage(message.toString());
                                                     });
@@ -1916,11 +1916,11 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                     if (TextUtils.equals(resultStatus, "9000")) {
                         // 该笔订单是否真实支付成功,需要依赖服务端的异步通知。
 //                        isAlipayOk = true;
-                        ToastUtils.showShort("支付成功");
+                        ToastUtil.getInstance().showShort("支付成功");
                         sendPayResult(Constants.PAY_SUCCESS);
                     } else {
                         // 该笔订单真实的支付结果,需要依赖服务端的异步通知。
-                        ToastUtils.showShort("支付失败" + resultInfo);
+                        ToastUtil.getInstance().showShort("支付失败" + resultInfo);
                         sendPayResult(Constants.PAY_ERROR);
                     }
                     break;

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
student/src/main/java/com/cooleshow/student/ui/web/HtmlActivity.java


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
student/src/main/java/com/cooleshow/student/ui/web/HtmlHorizontalScreenActivity.java


+ 1 - 1
student/src/main/java/com/cooleshow/student/widgets/CourseSetCommentDialog.java

@@ -97,7 +97,7 @@ public class CourseSetCommentDialog extends Dialog implements View.OnClickListen
             //提交
             String content = mViewBinding.etContent.getText().toString();
             if (TextUtils.isEmpty(content)) {
-                ToastUtils.showShort("请输入需要提交的内容");
+                ToastUtil.getInstance().showShort("请输入需要提交的内容");
                 return;
             }
             if (mListener != null) {

+ 2 - 2
student/src/main/java/com/cooleshow/student/wxapi/WXPayEntryActivity.java

@@ -53,11 +53,11 @@ public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {
             EventBus.getDefault().post(payResult);
             if (resp.errCode == 0) {
                 //成功
-                ToastUtils.showShort("支付成功");
+                ToastUtil.getInstance().showShort("支付成功");
                 EventBus.getDefault().post("PAY_SUCCESS");
 
             } else {
-                ToastUtils.showShort("支付失败:" + resp.errCode);
+                ToastUtil.getInstance().showShort("支付失败:" + resp.errCode);
                 EventBus.getDefault().post("PAY_ERROR");
             }
 			/*AlertDialog.Builder builder = new AlertDialog.Builder(this);

+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/presenter/income/MineIncomePresenter.java

@@ -5,6 +5,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
@@ -44,7 +45,7 @@ public class MineIncomePresenter extends BasePresenter<MineIncomeContract.MineIn
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 3 - 2
teacher/src/main/java/com/cooleshow/teacher/presenter/income/WithdrawalPresenter.java

@@ -4,6 +4,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
@@ -43,7 +44,7 @@ public class WithdrawalPresenter extends BasePresenter<WithdrawalContract.Withdr
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });
@@ -78,7 +79,7 @@ public class WithdrawalPresenter extends BasePresenter<WithdrawalContract.Withdr
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/presenter/mine/AddressListPresenter.java

@@ -3,6 +3,7 @@ package com.cooleshow.teacher.presenter.mine;
 import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
@@ -39,7 +40,7 @@ public class AddressListPresenter extends BasePresenter<AddressListContract.Addr
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 3 - 2
teacher/src/main/java/com/cooleshow/teacher/presenter/mine/BindBankCardPresenter.java

@@ -4,6 +4,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
@@ -42,7 +43,7 @@ public class BindBankCardPresenter extends BasePresenter<BindBankCardContract.Bi
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });
@@ -69,7 +70,7 @@ public class BindBankCardPresenter extends BasePresenter<BindBankCardContract.Bi
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/presenter/mine/CheckModifyPhoneNumPresenter.java

@@ -3,6 +3,7 @@ package com.cooleshow.teacher.presenter.mine;
 import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
@@ -38,7 +39,7 @@ public class CheckModifyPhoneNumPresenter extends BasePresenter<CheckModifyPhone
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 3 - 2
teacher/src/main/java/com/cooleshow/teacher/presenter/mine/EditAddressPresenter.java

@@ -4,6 +4,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
@@ -39,7 +40,7 @@ public class EditAddressPresenter extends BasePresenter<EditAddressContract.Edit
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });
@@ -67,7 +68,7 @@ public class EditAddressPresenter extends BasePresenter<EditAddressContract.Edit
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/presenter/mine/FeedBackPresenter.java

@@ -4,6 +4,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
@@ -41,7 +42,7 @@ public class FeedBackPresenter extends BasePresenter<FeedBackContract.FeedBackVi
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 4 - 3
teacher/src/main/java/com/cooleshow/teacher/presenter/mine/InputBankVCodePresenter.java

@@ -4,6 +4,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
@@ -42,7 +43,7 @@ public class InputBankVCodePresenter extends BasePresenter<InputBankVCodeContrac
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });
@@ -77,7 +78,7 @@ public class InputBankVCodePresenter extends BasePresenter<InputBankVCodeContrac
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });
@@ -105,7 +106,7 @@ public class InputBankVCodePresenter extends BasePresenter<InputBankVCodeContrac
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 3 - 2
teacher/src/main/java/com/cooleshow/teacher/presenter/mine/ModifyPasswordPresenter.java

@@ -4,6 +4,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
@@ -40,7 +41,7 @@ public class ModifyPasswordPresenter extends BasePresenter<ModifyPasswordContrac
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });
@@ -67,7 +68,7 @@ public class ModifyPasswordPresenter extends BasePresenter<ModifyPasswordContrac
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/presenter/mine/ModifyPhoneNumPresenter.java

@@ -3,6 +3,7 @@ package com.cooleshow.teacher.presenter.mine;
 import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
@@ -36,7 +37,7 @@ public class ModifyPhoneNumPresenter extends BasePresenter<ModifyPhoneNumContrac
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/presenter/mine/PersonalCertificationPresenter.java

@@ -4,6 +4,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
@@ -38,7 +39,7 @@ public class PersonalCertificationPresenter extends BasePresenter<PersonalCertif
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/presenter/score/MineScoreActPresenter.java

@@ -3,6 +3,7 @@ package com.cooleshow.teacher.presenter.score;
 import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
@@ -38,7 +39,7 @@ public class MineScoreActPresenter extends BasePresenter<MineScoreActContract.Mi
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/comment/CourseCommentDetailActivity.java

@@ -8,6 +8,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GlideUtils;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
@@ -166,7 +167,7 @@ public class CourseCommentDetailActivity extends BaseMVPActivity<ActivityCourseC
         if (!checkActivityExist()) {
             return;
         }
-        ToastUtils.showShort(getString(R.string.submit_comment_success));
+        ToastUtil.getInstance().showShort(getString(R.string.submit_comment_success));
         refreshMainData();
     }
 

+ 3 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalActivity.java

@@ -12,6 +12,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.WithdrawalInfoBean;
@@ -47,11 +48,11 @@ public class WithdrawalActivity extends BaseMVPActivity<ActivityWithdrawalBindin
                     return;
                 }
                 if (Double.parseDouble(amountWithdrawal) <= mWithdrawalInfo.withdrawalServiceFee) {
-                    ToastUtils.showShort("结算金额需要大于手续费");
+                    ToastUtil.getInstance().showShort("结算金额需要大于手续费");
                     break;
                 }
                 if (null == mWithdrawalInfo.userBankCard) {
-                    ToastUtils.showShort("请先绑定银行卡");
+                    ToastUtil.getInstance().showShort("请先绑定银行卡");
                     ARouter.getInstance().build(RouterPath.MineCenter.MINE_MY_BANKCARD)
                             .navigation();
                     break;

+ 4 - 3
teacher/src/main/java/com/cooleshow/teacher/ui/live/CreateLiveActivity.java

@@ -10,6 +10,7 @@ import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
 import com.bigkoo.pickerview.view.OptionsPickerView;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
@@ -72,12 +73,12 @@ public class CreateLiveActivity extends BaseMVPActivity<ActivityCreateLiveBindin
             //创建直播间
             String liveTitle = viewBinding.etTitle.getText().toString().trim();
             if (TextUtils.isEmpty(liveTitle)) {
-                ToastUtils.showShort("请输入直播间标题");
+                ToastUtil.getInstance().showShort("请输入直播间标题");
                 return;
             }
             String liveContent = viewBinding.etContent.getText().toString().trim();
             if (TextUtils.isEmpty(liveContent)) {
-                ToastUtils.showShort("请输入直播间内容");
+                ToastUtil.getInstance().showShort("请输入直播间内容");
                 return;
             }
             presenter.createTempLive(liveContent, liveTitle,currentLimitTime);
@@ -121,7 +122,7 @@ public class CreateLiveActivity extends BaseMVPActivity<ActivityCreateLiveBindin
      */
     @Override
     public void onCreateLiveSuccess(String roomId) {
-        ToastUtils.showShort("创建成功");
+        ToastUtil.getInstance().showShort("创建成功");
         TeacherLiveRoomActivity.start(this, roomId);
         finish();
     }

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/main/MallFragment.java


+ 7 - 6
teacher/src/main/java/com/cooleshow/teacher/ui/mine/BindBankCardActivity.java

@@ -15,6 +15,7 @@ import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
 import com.bigkoo.pickerview.view.OptionsPickerView;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.ResponseBindCardBean;
@@ -44,26 +45,26 @@ public class BindBankCardActivity extends BaseMVPActivity<ActivityBindBankcardBi
             case R.id.tv_bind:
                 String realName = viewBinding.etRealName.getText().toString().trim();
                 if (TextUtils.isEmpty(realName)) {
-                    ToastUtils.showShort("请输入您的真实姓名");
+                    ToastUtil.getInstance().showShort("请输入您的真实姓名");
                     break;
                 }
                 String idCardNo = viewBinding.etRealIdcard.getText().toString().trim();
                 if (TextUtils.isEmpty(idCardNo)) {
-                    ToastUtils.showShort("请输入您的身份证号");
+                    ToastUtil.getInstance().showShort("请输入您的身份证号");
                     break;
                 }
                 if (TextUtils.isEmpty(selectBankName)) {
-                    ToastUtils.showShort("请选择开户行");
+                    ToastUtil.getInstance().showShort("请选择开户行");
                     break;
                 }
                 String bankNum = viewBinding.etBankNum.getText().toString().trim();
                 if (TextUtils.isEmpty(bankNum)) {
-                    ToastUtils.showShort("请输入银行卡号");
+                    ToastUtil.getInstance().showShort("请输入银行卡号");
                     break;
                 }
                 String bankPhone = viewBinding.etBankPhone.getText().toString().trim();
                 if (TextUtils.isEmpty(bankPhone)) {
-                    ToastUtils.showShort("请输入手机号");
+                    ToastUtil.getInstance().showShort("请输入手机号");
                     break;
                 }
                 JSONObject jsonObject = new JSONObject();
@@ -131,7 +132,7 @@ public class BindBankCardActivity extends BaseMVPActivity<ActivityBindBankcardBi
 
     @Override
     public void bindBankCardSuccess(ResponseBindCardBean data) {
-        ToastUtils.showShort("绑卡成功");
+        ToastUtil.getInstance().showShort("绑卡成功");
         ARouter.getInstance().build(RouterPath.MineCenter.MINE_BIND_CARD_SUCCESS)
                 .navigation();
         setResult(RESULT_OK);

+ 3 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/mine/CheckModifyPhoneNumActivity.java

@@ -11,6 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.CheckModifyPhoneNumContract;
@@ -35,12 +36,12 @@ public class CheckModifyPhoneNumActivity extends BaseMVPActivity<ActivityCheckMo
             case R.id.tv_confirm:
                 String phoneNum = viewBinding.etPhoneNum.getText().toString().trim();
                 if (TextUtils.isEmpty(phoneNum)) {
-                    ToastUtils.showShort("请输入手机号");
+                    ToastUtil.getInstance().showShort("请输入手机号");
                     break;
                 }
                 String password = viewBinding.etPassword.getText().toString().trim();
                 if (TextUtils.isEmpty(password)) {
-                    ToastUtils.showShort("请输入密码");
+                    ToastUtil.getInstance().showShort("请输入密码");
                     break;
                 }
                 presenter.checkUser(phoneNum, password);

+ 7 - 6
teacher/src/main/java/com/cooleshow/teacher/ui/mine/EditAddressActivity.java

@@ -22,6 +22,7 @@ import com.cooleshow.base.bean.JsonBean;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GetJsonDataUtil;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.AddressBean;
@@ -76,31 +77,31 @@ public class EditAddressActivity extends BaseMVPActivity<ActivityEditAddressBind
                 if (isLoaded) {
                     showPickerView();
                 } else {
-                    ToastUtils.showShort("数据加载中,请稍后重试!");
+                    ToastUtil.getInstance().showShort("数据加载中,请稍后重试!");
                 }
                 break;
             case R.id.tv_save:
                 String name = viewBinding.etName.getText().toString().trim();
                 if (TextUtils.isEmpty(name)) {
-                    ToastUtils.showShort("请输入姓名");
+                    ToastUtil.getInstance().showShort("请输入姓名");
                     break;
                 }
                 String phoneNumber = viewBinding.etPhone.getText().toString().trim();
                 if (TextUtils.isEmpty(phoneNumber)) {
-                    ToastUtils.showShort("请输入收件人电话号码");
+                    ToastUtil.getInstance().showShort("请输入收件人电话号码");
                     break;
                 }
                 if (phoneNumber.length() != 11) {
-                    ToastUtils.showShort("请输入正确电话号码");
+                    ToastUtil.getInstance().showShort("请输入正确电话号码");
                     break;
                 }
                 if (TextUtils.isEmpty(province)) {
-                    ToastUtils.showShort("请选择所在地区");
+                    ToastUtil.getInstance().showShort("请选择所在地区");
                     break;
                 }
                 String detailAddress = viewBinding.etDetailAddress.getText().toString().trim();
                 if (TextUtils.isEmpty(detailAddress)) {
-                    ToastUtils.showShort("请输入详细地址");
+                    ToastUtil.getInstance().showShort("请输入详细地址");
                     break;
                 }
 

+ 4 - 3
teacher/src/main/java/com/cooleshow/teacher/ui/mine/FeedBackActivity.java

@@ -9,6 +9,7 @@ import androidx.annotation.Nullable;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.FeedBackContract;
@@ -37,12 +38,12 @@ public class FeedBackActivity extends BaseMVPActivity<ActivityFeedbackBinding, F
             case R.id.tv_submit:
                 String content = viewBinding.etContent.getText().toString().trim();
                 if (TextUtils.isEmpty(content)){
-                    ToastUtils.showShort("请输入您的反馈意见");
+                    ToastUtil.getInstance().showShort("请输入您的反馈意见");
                     break;
                 }
 //                String mobileNo = viewBinding.etConnect.getText().toString().trim();
 //                if (TextUtils.isEmpty(mobileNo)){
-//                    ToastUtils.showShort("请输入您的邮箱或手机号");
+//                    ToastUtil.getInstance().showShort("请输入您的邮箱或手机号");
 //                    break;
 //                }
                 Map<String, String> params = new HashMap<>();
@@ -76,7 +77,7 @@ public class FeedBackActivity extends BaseMVPActivity<ActivityFeedbackBinding, F
 
     @Override
     public void addSuggestionSuccess(Object object) {
-        ToastUtils.showShort("提交成功");
+        ToastUtil.getInstance().showShort("提交成功");
         finish();
     }
 }

+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/mine/ModifyNickNameActivity.java

@@ -11,6 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.ModifyNickNameContract;
@@ -38,7 +39,7 @@ public class ModifyNickNameActivity extends BaseMVPActivity<ActivityModifyNickna
             case R.id.tv_right_text:
                 String userName = viewBinding.etNickname.getText().toString().trim();
                 if (TextUtils.isEmpty(userName)){
-                    ToastUtils.showShort("请输入昵称!");
+                    ToastUtil.getInstance().showShort("请输入昵称!");
                     break;
                 }
                 JSONObject jsonObject = new JSONObject();

+ 3 - 3
teacher/src/main/java/com/cooleshow/teacher/ui/mine/ModifyPasswordActivity.java

@@ -56,12 +56,12 @@ public class ModifyPasswordActivity extends BaseMVPActivity<ActivityModifyPasswo
             case R.id.tv_confirm:
                 String password = viewBinding.etPassword.getText().toString().trim();
                 if (TextUtils.isEmpty(password) || password.length() < 6 || password.length() > 20) {
-                    ToastUtils.showShort("请输入6-20位密码");
+                    ToastUtil.getInstance().showShort("请输入6-20位密码");
                     break;
                 }
                 String authCode = viewBinding.etAuthCode.getText().toString().trim();
                 if (TextUtils.isEmpty(authCode)) {
-                    ToastUtils.showShort("请输入验证码");
+                    ToastUtil.getInstance().showShort("请输入验证码");
                     break;
                 }
 
@@ -132,7 +132,7 @@ public class ModifyPasswordActivity extends BaseMVPActivity<ActivityModifyPasswo
 
 
     public void getCodeSuccess() {
-        ToastUtils.showShort("验证码发送成功,请注意查收!");
+        ToastUtil.getInstance().showShort("验证码发送成功,请注意查收!");
         startTimer();
 
     }

+ 4 - 3
teacher/src/main/java/com/cooleshow/teacher/ui/mine/ModifyPhoneNumActivity.java

@@ -15,6 +15,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.ModifyPhoneNumContract;
@@ -43,12 +44,12 @@ public class ModifyPhoneNumActivity extends BaseMVPActivity<ActivityModifyPhonen
             case R.id.tv_save:
                 String phoneNum = viewBinding.etPhoneNum.getText().toString().trim();
                 if (TextUtils.isEmpty(phoneNum)){
-                    ToastUtils.showShort("请输入手机号");
+                    ToastUtil.getInstance().showShort("请输入手机号");
                     break;
                 }
                 String authCode = viewBinding.etAuthCode.getText().toString().trim();
                 if (TextUtils.isEmpty(authCode)){
-                    ToastUtils.showShort("请输入验证码");
+                    ToastUtil.getInstance().showShort("请输入验证码");
                     break;
                 }
                 presenter.updatePhone(oldPhone,phoneNum,authCode);
@@ -89,7 +90,7 @@ public class ModifyPhoneNumActivity extends BaseMVPActivity<ActivityModifyPhonen
     }
 
     public void getCodeSuccess() {
-        ToastUtils.showShort("验证码发送成功,请注意查收!");
+        ToastUtil.getInstance().showShort("验证码发送成功,请注意查收!");
         startTimer();
     }
 

+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/mine/MyBankCardActivity.java

@@ -8,6 +8,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.PermissionUtils;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.widgets.CommonDialog;
 import com.cooleshow.base.widgets.CommonTipDialog;
@@ -44,7 +45,7 @@ public class MyBankCardActivity extends BaseMVPActivity<ActivityMyBankCardBindin
                 break;
             case R.id.tv_unbind:
                 if (null == rowsBean) {
-                    ToastUtils.showShort("还未绑定银行卡");
+                    ToastUtil.getInstance().showShort("还未绑定银行卡");
                     break;
                 }
                 CommonTipDialog.getInstance(this)

+ 5 - 4
teacher/src/main/java/com/cooleshow/teacher/ui/mine/PayTestActivity.java

@@ -14,6 +14,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alipay.sdk.app.PayTask;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.PayTestBean;
@@ -53,7 +54,7 @@ public class PayTestActivity extends BaseMVPActivity<ActivityPayTestBinding, Pay
         switch (view.getId()) {
             case R.id.tv_weixin:
                 if (TextUtils.isEmpty(orderNo)) {
-                    ToastUtils.showShort("输入订单号");
+                    ToastUtil.getInstance().showShort("输入订单号");
                     break;
                 }
                 doWeixinPay(orderNo);
@@ -77,7 +78,7 @@ public class PayTestActivity extends BaseMVPActivity<ActivityPayTestBinding, Pay
                 break;
             case R.id.tv_alipay:
                 if (TextUtils.isEmpty(orderNo)) {
-                    ToastUtils.showShort("输入订单号");
+                    ToastUtil.getInstance().showShort("输入订单号");
                     break;
                 }
                 doAliPay(orderNo);
@@ -193,12 +194,12 @@ public class PayTestActivity extends BaseMVPActivity<ActivityPayTestBinding, Pay
                     if (TextUtils.equals(resultStatus, "9000")) {
                         // 该笔订单是否真实支付成功,需要依赖服务端的异步通知。
 //                        isAlipayOk = true;
-                        ToastUtils.showShort("支付成功");
+                        ToastUtil.getInstance().showShort("支付成功");
                     } else {
 //                        isAlipayOk = false;
                         // 该笔订单真实的支付结果,需要依赖服务端的异步通知。
 //                        showAlert(VipInfoActivity.this, getString(R.string.pay_failed) + payResult.getMemo());
-                        ToastUtils.showShort("支付失败" + resultStatus);
+                        ToastUtil.getInstance().showShort("支付失败" + resultStatus);
                     }
                     break;
                 }

+ 3 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/mine/PersonalCertificationActivity.java

@@ -9,6 +9,7 @@ import androidx.annotation.Nullable;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.PersonalCertificationContract;
@@ -34,12 +35,12 @@ public class PersonalCertificationActivity extends BaseMVPActivity<ActivityPerso
             case R.id.tv_confirm:
                 String name = viewBinding.etName.getText().toString().trim();
                 if (TextUtils.isEmpty(name)){
-                    ToastUtils.showShort("请输入真实姓名");
+                    ToastUtil.getInstance().showShort("请输入真实姓名");
                     break;
                 }
                 String certificateNum = viewBinding.etCertificateNum.getText().toString().trim();
                 if (TextUtils.isEmpty(certificateNum)){
-                    ToastUtils.showShort("请输入身份证号");
+                    ToastUtil.getInstance().showShort("请输入身份证号");
                     break;
                 }
                 JSONObject jsonObjectC = new JSONObject();

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/mine/PersonalSettingActivity.java

@@ -294,7 +294,7 @@ public class PersonalSettingActivity extends BaseMVPActivity<ActivityPersonalSet
             //男
             viewBinding.tvSex.setText("男");
         }
-        ToastUtils.showShort("修改成功");
+        ToastUtil.getInstance().showShort("修改成功");
         GlideUtils.INSTANCE.loadImage(this, setDetailBean.avatar, viewBinding.imHeader, R.drawable.icon_teacher_default_head);
 
 

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/mine/UnBindBankCardActivity.java

@@ -72,7 +72,7 @@ public class UnBindBankCardActivity extends BaseMVPActivity<ActivityUnBindBankCa
             return;
         }
         if (TextUtils.isEmpty(realIdCard)) {
-            ToastUtils.showShort("请输入您的身份证号");
+            ToastUtil.getInstance().showShort("请输入您的身份证号");
             return;
         }
         presenter.unBindBankCard(bankCardId, realName, realIdCard);

+ 4 - 4
teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreActivity.java

@@ -161,7 +161,7 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
         public void onResult(SHARE_MEDIA platform) {
 
             if (platform.name().equals("WEIXIN_FAVORITE")) {
-                ToastUtils.showShort("收藏成功啦");
+                ToastUtil.getInstance().showShort("收藏成功啦");
             } else {
                 if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
                         && platform != SHARE_MEDIA.EMAIL
@@ -175,7 +175,7 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
                         && platform != SHARE_MEDIA.GOOGLEPLUS
                         && platform != SHARE_MEDIA.YNOTE
                         && platform != SHARE_MEDIA.EVERNOTE) {
-                    ToastUtils.showShort("分享成功啦");
+                    ToastUtil.getInstance().showShort("分享成功啦");
                 }
 
             }
@@ -195,7 +195,7 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
                     && platform != SHARE_MEDIA.GOOGLEPLUS
                     && platform != SHARE_MEDIA.YNOTE
                     && platform != SHARE_MEDIA.EVERNOTE) {
-                ToastUtils.showShort("分享失败啦");
+                ToastUtil.getInstance().showShort("分享失败啦");
 
             }
 
@@ -203,7 +203,7 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
 
         @Override
         public void onCancel(SHARE_MEDIA platform) {
-            ToastUtils.showShort("分享取消了");
+            ToastUtil.getInstance().showShort("分享取消了");
         }
     }
 

+ 4 - 3
teacher/src/main/java/com/cooleshow/teacher/ui/web/AccompanyActivity.java

@@ -19,6 +19,7 @@ import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.service.PlayMusicService;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.RequestBodyUtil;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.teacher.R;
@@ -152,7 +153,7 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
                                 filePath = file.getPath();
                                 sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.fromFile(new File(filePath))));
                                 hideLoading();
-                                ToastUtils.showShort("保存成功");
+                                ToastUtil.getInstance().showShort("保存成功");
                             } catch (Exception e) {
                             }
 
@@ -194,7 +195,7 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
                 File file = new File(recordVideFilePath);
 
                 if (!file.exists()) {
-                    ToastUtils.showShort("未找到该视频,请重试");
+                    ToastUtil.getInstance().showShort("未找到该视频,请重试");
                     FileUtils.deleteFile(recordVideFilePath);
                 }
                 UploadHelper uploadHelper = new UploadHelper(AccompanyActivity.this);
@@ -218,7 +219,7 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
                     @Override
                     public void onFailure() {
                         upLoadFileFaile();
-                        ToastUtils.showShort("上传失败,请重新选择");
+                        ToastUtil.getInstance().showShort("上传失败,请重新选择");
                     }
                 });
 

+ 11 - 10
teacher/src/main/java/com/cooleshow/teacher/ui/web/AccompanyFragment.java

@@ -49,6 +49,7 @@ import com.cooleshow.base.utils.AppUtils;
 import com.cooleshow.base.utils.HeadsetPlugListener;
 import com.cooleshow.base.utils.HeadsetPlugReceiver;
 import com.cooleshow.base.utils.PermissionUtils;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.websocket.JWebSocketClient;
 import com.cooleshow.base.widgets.BaseDialog;
@@ -1401,7 +1402,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
         public void onResult(SHARE_MEDIA platform) {
 
             if (platform.name().equals("WEIXIN_FAVORITE")) {
-                ToastUtils.showShort("收藏成功啦");
+                ToastUtil.getInstance().showShort("收藏成功啦");
             } else {
                 if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
                         && platform != SHARE_MEDIA.EMAIL
@@ -1415,7 +1416,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                         && platform != SHARE_MEDIA.GOOGLEPLUS
                         && platform != SHARE_MEDIA.YNOTE
                         && platform != SHARE_MEDIA.EVERNOTE) {
-                    ToastUtils.showShort("分享成功啦");
+                    ToastUtil.getInstance().showShort("分享成功啦");
                 }
 
             }
@@ -1435,7 +1436,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                     && platform != SHARE_MEDIA.GOOGLEPLUS
                     && platform != SHARE_MEDIA.YNOTE
                     && platform != SHARE_MEDIA.EVERNOTE) {
-                ToastUtils.showShort("分享失败啦");
+                ToastUtil.getInstance().showShort("分享失败啦");
 
             }
 
@@ -1443,7 +1444,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
 
         @Override
         public void onCancel(SHARE_MEDIA platform) {
-            ToastUtils.showShort("分享取消了");
+            ToastUtil.getInstance().showShort("分享取消了");
         }
     }
 
@@ -1516,7 +1517,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
             midiFileDuration = obj.optLong("duration");
             processInterval = obj.optInt("interval", 16);
             if (TextUtils.isEmpty(midiFile)) {
-                ToastUtils.showShort("文件异常");
+                ToastUtil.getInstance().showShort("文件异常");
                 return;
             }
             new RxPermissions(this)
@@ -1526,7 +1527,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                             try {
                                 String type = midiFile.substring(midiFile.lastIndexOf(".") + 1);
                                 if (TextUtils.isEmpty(type)) {
-                                    ToastUtils.showShort("文件异常");
+                                    ToastUtil.getInstance().showShort("文件异常");
                                     return;
                                 }
                                 String path = FileUtils.getPublicDirectory("file");
@@ -1574,7 +1575,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                                                         });
                                                     } else {
                                                         runOnUiThread(() -> {
-                                                            ToastUtils.showShort("获取文件失败");
+                                                            ToastUtil.getInstance().showShort("获取文件失败");
                                                             midiFilePath = null;
                                                             onSendMessage(message.toString());
                                                         });
@@ -1585,7 +1586,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                                                 public void onError(Throwable e) {
                                                     runOnUiThread(() -> {
                                                         hideLoading();
-                                                        ToastUtils.showShort("文件异常");
+                                                        ToastUtil.getInstance().showShort("文件异常");
                                                         midiFilePath = null;
                                                         onSendMessage(message.toString());
                                                     });
@@ -1914,11 +1915,11 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                     // 判断resultStatus 为9000则代表支付成功
                     if (TextUtils.equals(resultStatus, "9000")) {
                         // 该笔订单是否真实支付成功,需要依赖服务端的异步通知。
-                        ToastUtils.showShort("支付成功");
+                        ToastUtil.getInstance().showShort("支付成功");
                         sendPayResult(Constants.PAY_SUCCESS);
                     } else {
                         // 该笔订单真实的支付结果,需要依赖服务端的异步通知。
-                        ToastUtils.showShort("支付失败" + resultStatus);
+                        ToastUtil.getInstance().showShort("支付失败" + resultStatus);
                         sendPayResult(Constants.PAY_ERROR);
                     }
                     break;

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlActivity.java


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlHorizontalScreenActivity.java


+ 3 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/web/WebActivity.java

@@ -34,6 +34,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseActivity;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.PermissionUtils;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.UriUtils;
 import com.cooleshow.base.utils.Utils;
@@ -548,12 +549,12 @@ public class WebActivity extends BaseActivity<ActivityHtmlBinding> implements Js
 
                         @Override
                         public void onFailure() {
-                            ToastUtils.showShort("上传失败,请重新选择");
+                            ToastUtil.getInstance().showShort("上传失败,请重新选择");
                             selectFileFail();
                         }
                     });
                 } else {
-                    ToastUtils.showShort("文件损坏或不存在,请重新选择");
+                    ToastUtil.getInstance().showShort("文件损坏或不存在,请重新选择");
                     selectFileFail();
                 }
             }

+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/widgets/CourseSetCommentDialog.java

@@ -12,6 +12,7 @@ import android.view.Window;
 import android.view.WindowManager;
 
 import com.cooleshow.base.utils.KeyboardUtils;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.databinding.DialogSetCourseCommentLayoutBinding;
@@ -97,7 +98,7 @@ public class CourseSetCommentDialog extends Dialog implements View.OnClickListen
             //提交
             String content = mViewBinding.etContent.getText().toString();
             if (TextUtils.isEmpty(content)) {
-                ToastUtils.showShort("请输入需要提交的内容");
+                ToastUtil.getInstance().showShort("请输入需要提交的内容");
                 return;
             }
             if (mListener != null) {

+ 3 - 2
teacher/src/main/java/com/cooleshow/teacher/widgets/DialogUtils.java

@@ -22,6 +22,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.PopupUtil;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.widgets.dialog.CommonDialog;
 import com.cooleshow.teacher.R;
@@ -103,9 +104,9 @@ public class DialogUtils {
                 matrix.postScale(1.0f, 1.0f); //长和宽放大缩小的比例
                 bmp = Bitmap.createBitmap(bmp, 0, 0, bmp.getWidth(), bmp.getHeight(), matrix, true);
                 if (SavePicUtil.saveBitmap(BaseApplication.Companion.getContext(), bmp, System.currentTimeMillis() + "")) {
-                    ToastUtils.showShort("保存成功");
+                    ToastUtil.getInstance().showShort("保存成功");
                 } else {
-                    ToastUtils.showShort("保存失败");
+                    ToastUtil.getInstance().showShort("保存失败");
                 }
                 mAlertDialog.dismiss();
             }

+ 3 - 2
teacher/src/main/java/com/cooleshow/teacher/wxapi/WXPayEntryActivity.java

@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.util.Log;
 
 import com.cooleshow.base.bean.WxPayResult;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.teacher.R;
 import com.tencent.mm.opensdk.constants.ConstantsAPI;
@@ -53,10 +54,10 @@ public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {
             EventBus.getDefault().post(payResult);
             if (resp.errCode == 0) {
                 //成功
-                ToastUtils.showShort("支付成功");
+                ToastUtil.getInstance().showShort("支付成功");
 
             } else {
-                ToastUtils.showShort("支付失败:" + resp.errCode);
+                ToastUtil.getInstance().showShort("支付失败:" + resp.errCode);
             }
 			/*AlertDialog.Builder builder = new AlertDialog.Builder(this);
 			builder.setTitle("提示");

+ 4 - 3
usercenter/src/main/java/com/cooleshow/usercenter/helper/PhoneCheckHelper.java

@@ -2,6 +2,7 @@ package com.cooleshow.usercenter.helper;
 
 import android.text.TextUtils;
 
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 
 /**
@@ -10,7 +11,7 @@ import com.cooleshow.base.utils.ToastUtils;
 public class PhoneCheckHelper {
     public static boolean checkPhoneValidity(String phone) {
         if (TextUtils.isEmpty(phone)) {
-            ToastUtils.showShort("手机号不可为空");
+            ToastUtil.getInstance().showShort("手机号不可为空");
             return false;
         }
         return true;
@@ -18,11 +19,11 @@ public class PhoneCheckHelper {
 
     public static boolean checkPwdValidity(String pwd,String pwdAgain) {
         if(TextUtils.isEmpty(pwd) || TextUtils.isEmpty(pwdAgain)){
-            ToastUtils.showShort("请重新输入密码");
+            ToastUtil.getInstance().showShort("请重新输入密码");
             return false;
         }
         if (!TextUtils.equals(pwd,pwdAgain)) {
-            ToastUtils.showShort("两次输入密码不一样,请重新输入");
+            ToastUtil.getInstance().showShort("两次输入密码不一样,请重新输入");
             return false;
         }
         return true;

+ 2 - 1
usercenter/src/main/java/com/cooleshow/usercenter/presenter/BindPasswordPresenter.java

@@ -4,6 +4,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.ErrorParse;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.usercenter.data.api.UserApi;
 import com.cooleshow.usercenter.presenter.contract.BindPasswordContract;
@@ -33,7 +34,7 @@ public class BindPasswordPresenter extends BasePresenter<BindPasswordContract.Bi
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
             }
         });

+ 2 - 1
usercenter/src/main/java/com/cooleshow/usercenter/presenter/LoginPresenter.kt

@@ -5,6 +5,7 @@ import com.cooleshow.base.data.net.ApiException
 import com.cooleshow.base.presenter.BasePresenter
 import com.cooleshow.base.rx.BaseObserver
 import com.cooleshow.base.utils.ErrorParse
+import com.cooleshow.base.utils.ToastUtil
 import com.cooleshow.base.utils.ToastUtils
 import com.cooleshow.usercenter.bean.UserLoginInfo
 import com.cooleshow.usercenter.data.api.UserApi
@@ -36,7 +37,7 @@ class LoginPresenter constructor() : BasePresenter<LoginContract.LoginView>(),
                     super.onError(e)
                     if (e is ApiException) {
                         ErrorParse.getInstance().parseError(e)
-                        ToastUtils.showShort(e.errmsg)
+                        ToastUtil.getInstance().showShort(e.errmsg)
                     }
                 }
             })

+ 3 - 2
usercenter/src/main/java/com/cooleshow/usercenter/presenter/VerifyLoginPresenter.java

@@ -6,6 +6,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.ErrorParse;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.usercenter.bean.UserLoginInfo;
 import com.cooleshow.usercenter.constants.UserConstants;
@@ -54,7 +55,7 @@ public class VerifyLoginPresenter extends BasePresenter<VerifyLoginContract.Veri
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
                 if (getView() != null) {
                     getView().sendVerifyCodeFail();
@@ -83,7 +84,7 @@ public class VerifyLoginPresenter extends BasePresenter<VerifyLoginContract.Veri
                 if (e instanceof ApiException) {
                     ErrorParse.getInstance().parseError(e);
                     ApiException apiException = (ApiException) e;
-                    ToastUtils.showShort(apiException.getErrmsg());
+                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
                 }
                 if (getView() != null) {
                     getView().sendVerifyCodeFail();

+ 2 - 1
usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/BindPasswordActivity.java

@@ -7,6 +7,7 @@ import android.view.View;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.usercenter.R;
@@ -49,7 +50,7 @@ public class BindPasswordActivity extends BaseMVPActivity<ActivityBindPwdLayoutB
 
     @Override
     public void onBindSuccess() {
-        ToastUtils.showShort("设置成功");
+        ToastUtil.getInstance().showShort("设置成功");
         Intent intent = new Intent();
         intent.putExtra(UserConstants.TEMP_TOKEN, tempToken);
         setResult(RESULT_OK, intent);

+ 2 - 1
usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/VerifyCodeInputActivity.java

@@ -13,6 +13,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.KeyboardUtils;
+import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
@@ -170,7 +171,7 @@ public class VerifyCodeInputActivity extends BaseMVPActivity<ActivityInputCodeLa
      */
     @Override
     public void sendVerifyCodeSuccess() {
-        ToastUtils.showShort(getString(R.string.verify_code_send_success_tip));
+        ToastUtil.getInstance().showShort(getString(R.string.verify_code_send_success_tip));
         switchSendCodeButton(false);
         if (mCountDownTimer != null) {
             mCountDownTimer.start();

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels