diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index c92382fa..cbe9cf46 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -63,7 +63,7 @@ public class RetrofitClient { private static RetrofitClient INSTANCE; private static ApiServer sApiServer; - public static final int DEFAULT_TIME_OUT = 10; + public static final int DEFAULT_TIME_OUT = 30; private static OkHttpClient client; private final Retrofit mRetrofit; diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java index 58e4d81d..33526d94 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java @@ -846,6 +846,7 @@ public class MainActivity extends BaseMvpActivity(), override fun onNext() { // ToastUtils.showShort("下一首"); // 切换歌曲 -// List musicSongBeans = AgoraManager.getInstance(RoomActivity.this).getMusicList(); +// List musicSongBeans = AgoraManager.getInstance(RoomActivity.this).getMusicList(); AgoraManager.getInstance().nextSong() } }) diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomBackgroundPresenter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomBackgroundPresenter.java index c0bcd3fd..1a8885ea 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomBackgroundPresenter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomBackgroundPresenter.java @@ -7,22 +7,27 @@ import com.xscm.modulemain.activity.room.contacts.RoomBackgroundContacts; import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.bean.RoomBgBean; import com.xscm.moduleutil.http.BaseObserver; +import com.xscm.moduleutil.http.RetrofitClient; import com.xscm.moduleutil.presenter.BasePresenter; import com.xscm.moduleutil.utils.cos.CosUploadManager; import com.xscm.moduleutil.utils.oss.OSSOperUtils; import java.io.File; +import java.lang.ref.WeakReference; import io.reactivex.disposables.Disposable; public class RoomBackgroundPresenter extends BasePresenter implements RoomBackgroundContacts.RoomBackgroudPre { + + private RoomBackgroundContacts.View mView; public RoomBackgroundPresenter(RoomBackgroundContacts.View view, Context context) { super(view, context); + mView = view; } @Override public void getBackgroundList() { - api.getBackgroundList(new BaseObserver() { + RetrofitClient.getInstance().getBackgroundList(new BaseObserver() { @Override public void onSubscribe(Disposable d) { addDisposable(d); @@ -30,6 +35,9 @@ public class RoomBackgroundPresenter extends BasePresenter(mView); + } MvpRef.get().getBackgroundList(roomBgBeans); } }); @@ -42,6 +50,9 @@ public class RoomBackgroundPresenter extends BasePresenter(mView); + } MvpRef.get().upLoadSuccess(url, type, index, size); } @@ -58,26 +69,11 @@ public class RoomBackgroundPresenter extends BasePresenter() { + RetrofitClient.getInstance().uploadBgImage(id, image_url, new BaseObserver() { @Override public void onSubscribe(Disposable d) { addDisposable(d); @@ -85,6 +81,9 @@ public class RoomBackgroundPresenter extends BasePresenter(mView); + } MvpRef.get().uploadBgImage(); } }); @@ -92,7 +91,7 @@ public class RoomBackgroundPresenter extends BasePresenter() { + RetrofitClient.getInstance().editRoom(room_id, room_name, room_cover, room_intro, room_background, new BaseObserver() { @Override public void onSubscribe(Disposable d) { addDisposable(d); @@ -100,6 +99,9 @@ public class RoomBackgroundPresenter extends BasePresenter(mView); + } MvpRef.get().editRoom(); } }); diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java index 603f882b..60051616 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java @@ -332,9 +332,13 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter { // 再次检查视图状态 if (uniqueId.equals(emojiImageView.getTag())) { - Glide.with(mContext) - .load(emMessage.getText().getEmoji().getImage()) - .into(emojiImageView); + try { + Glide.with(mContext) + .load(emMessage.getText().getEmoji().getImage()) + .into(emojiImageView); + }catch (Exception e){ + LogUtils.e("e:"+e); + } } }, 1500); } diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/DialogSignType.kt b/MainModule/src/main/java/com/xscm/modulemain/dialog/DialogSignType.kt index b74bde3a..cb0bae76 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/DialogSignType.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/DialogSignType.kt @@ -1,5 +1,6 @@ package com.xscm.modulemain.dialog +import android.app.Activity import android.content.Context import android.graphics.drawable.Drawable import android.view.Gravity @@ -20,7 +21,7 @@ import com.xscm.modulemain.databinding.DialogSignTypeBinding import com.xscm.moduleutil.utils.ImageUtils import com.xscm.moduleutil.widget.dialog.BaseDialog -class DialogSignType(context:Context) : BaseDialog(context){ +class DialogSignType(context:Activity) : BaseDialog(context){ init { window?.apply { setGravity(Gravity.TOP) @@ -58,7 +59,13 @@ class DialogSignType(context:Context) : BaseDialog(contex } fun show(type:Int){ - super.show() + if (context is Activity) { + val activity = context as Activity + if (!activity.isFinishing && !activity.isDestroyed) { + super.show() + } + } + //0:开始 1：成功 2:失败 when(type){ 0 ->{ @@ -85,9 +92,6 @@ class DialogSignType(context:Context) : BaseDialog(contex }, 1500) } } - - - } var webpDrawable:WebpDrawable? = null fun loadWebpOneStart(webp_anim: Int, mAnimView: ImageView?) { diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java index 1fe5539f..917eaaab 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java @@ -830,19 +830,24 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment textMap = new HashMap<>(); - textMap.put("is_manager", userInfo.getIs_manager().equals("1") ? "取消管理" : "设为管理"); - textMap.put("is_host", userInfo.getIs_host().equals("1") ? "取消主持" : "设为主持"); - textMap.put("is_mute", userInfo.getIs_mute_pit().equals("1") ? "开麦" : "禁麦"); - textMap.put("is_mute_pit", userInfo.getIs_mute().equals("1") ? "解除禁言" : "禁言"); + try { + Map textMap = new HashMap<>(); + textMap.put("is_manager", userInfo.getIs_manager().equals("1") ? "取消管理" : "设为管理"); + textMap.put("is_host", userInfo.getIs_host().equals("1") ? "取消主持" : "设为主持"); + textMap.put("is_mute", userInfo.getIs_mute_pit().equals("1") ? "开麦" : "禁麦"); + textMap.put("is_mute_pit", userInfo.getIs_mute().equals("1") ? "解除禁言" : "禁言"); - switch (type) { - case 1://房主 - if ("is_manager".equals(key)) return textMap.get("is_manager"); - if ("is_host".equals(key)) return textMap.get("is_host"); - if ("is_mute".equals(key)) return textMap.get("is_mute"); - if ("is_mute_pit".equals(key)) return textMap.get("is_mute_pit"); - break; - case 2: - if ("is_host".equals(key)) return textMap.get("is_host"); - if ("is_mute".equals(key)) return textMap.get("is_mute"); - if ("is_mute_pit".equals(key)) return textMap.get("is_mute_pit"); - break; - case 3: - if ("is_mute".equals(key)) return textMap.get("is_mute"); - if ("is_mute_pit".equals(key)) return textMap.get("is_mute_pit"); - break; - default: - break; + switch (type) { + case 1://房主 + if ("is_manager".equals(key)) return textMap.get("is_manager"); + if ("is_host".equals(key)) return textMap.get("is_host"); + if ("is_mute".equals(key)) return textMap.get("is_mute"); + if ("is_mute_pit".equals(key)) return textMap.get("is_mute_pit"); + break; + case 2: + if ("is_host".equals(key)) return textMap.get("is_host"); + if ("is_mute".equals(key)) return textMap.get("is_mute"); + if ("is_mute_pit".equals(key)) return textMap.get("is_mute_pit"); + break; + case 3: + if ("is_mute".equals(key)) return textMap.get("is_mute"); + if ("is_mute_pit".equals(key)) return textMap.get("is_mute_pit"); + break; + default: + break; + } + + return ""; + }catch (Exception e){ + e.printStackTrace(); + return ""; } - return ""; } @Override diff --git a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIBaseChatActivity.java b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIBaseChatActivity.java index 0df7588f..518c25f9 100644 --- a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIBaseChatActivity.java +++ b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIBaseChatActivity.java @@ -54,7 +54,7 @@ public abstract class TUIBaseChatActivity extends BaseLightActivity { if (chatInfo != null) { initChat(chatInfo); } else { - ToastUtil.toastShortMessage("init chat failed , chatInfo is empty."); +// ToastUtil.toastShortMessage("init chat failed , chatInfo is empty."); TUIChatLog.e(TAG, "init chat failed , chatInfo is empty."); finish(); } diff --git a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIBaseChatMinimalistActivity.java b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIBaseChatMinimalistActivity.java index df2198ab..0c8517ed 100644 --- a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIBaseChatMinimalistActivity.java +++ b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIBaseChatMinimalistActivity.java @@ -54,7 +54,7 @@ public abstract class TUIBaseChatMinimalistActivity extends BaseMinimalistLightA if (chatInfo != null) { initChat(chatInfo); } else { - ToastUtil.toastShortMessage("init chat failed , chatInfo is empty."); +// ToastUtil.toastShortMessage("init chat failed , chatInfo is empty."); TUIChatLog.e(TAG, "init chat failed , chatInfo is empty."); finish(); }