diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java index 6af609cc..6dc2c4cf 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java @@ -257,6 +257,26 @@ public class CommonAppContext extends MultiDexApplication implements Application } } + public void clearLoginDialog(String msg){ + new ConfirmDialog(ActivityUtils.getTopActivity(), + "提示", + msg, + "", + "确定", + v -> { + // 点击“确认”按钮时执行删除操作 + + }, + v -> { + try { + clearLoginInfo(); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + // 点击“取消”按钮时什么都不做 + }, true, 4).show(); + } + // 更新未读消息数的方法 private void updateUnreadMessageCount() { V2TIMManager.getConversationManager().getTotalUnreadMessageCount(new V2TIMValueCallback() { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java b/BaseModule/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java index 7bbc3ce5..512cb82a 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java @@ -315,7 +315,11 @@ public class MessageListenerSingleton { simpleMsgListener = new V2TIMSimpleMsgListener() { @Override public void onRecvC2CTextMessage(String msgID, V2TIMUserInfo sender, String text) { - LogUtils.d("C2C 文本消息 " + sender.getNickName()); + LogUtils.d("C2C 文本消息 " + text); + RoomMessageEvent event = GsonUtils.fromJson(text, RoomMessageEvent.class); + if (event.getMsgType() == 404){ + CommonAppContext.getInstance().clearLoginDialog(event.getText().getText()); + } } @Override @@ -323,7 +327,9 @@ public class MessageListenerSingleton { LogUtils.d("C2C 自定义（信令）消息 " + sender.getNickName()); String message = new String(customData, StandardCharsets.UTF_8); RoomMessageEvent event = GsonUtils.fromJson(message, RoomMessageEvent.class); - if (event.getMsgType() == 130 || event.getMsgType() == 131) { + if (event.getMsgType() == 404){ + CommonAppContext.getInstance().clearLoginDialog(event.getText().getText()); + }else if (event.getMsgType() == 130 || event.getMsgType() == 131) { // EventBus.getDefault().post(event); RetrofitClient.getInstance().getCpListener().onReceiveMsg(event); } else if (event.getMsgType() == CustomMsgCode.INSTANCE.getCODE_TASK_APPRENTICE_JOIN_ROOM()) { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageLoader.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageLoader.java index a6a6d143..72d438e1 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageLoader.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageLoader.java @@ -55,7 +55,7 @@ public class ImageLoader { public static void loadHead(Context context, ImageView view, String url) { RequestOptions options = RequestOptions.circleCropTransform(); - Glide.with(context).load(url).apply(createUrlOnlyOptions(url)).error(com.xscm.moduleutil.R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar) + Glide.with(context).load(url).apply(options).apply(createUrlOnlyOptions(url)).error(com.xscm.moduleutil.R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar) .listener(new RequestListener() { @Override public boolean onResourceReady(Drawable resource, Object model, @@ -93,7 +93,7 @@ public class ImageLoader { public static void loadHead(ImageView view, String url) { RequestOptions options = RequestOptions.circleCropTransform(); - Glide.with(view).load(url).apply(createUrlOnlyOptions(url)).error(R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar) + Glide.with(view).load(url).apply(options).apply(createUrlOnlyOptions(url)).error(R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar) .listener(new RequestListener() { @Override public boolean onResourceReady(Drawable resource, Object model, @@ -131,7 +131,7 @@ public class ImageLoader { public static void loadImage(ImageView view, String url) { RequestOptions options = RequestOptions.circleCropTransform(); - Glide.with(view).load(url).apply(createUrlOnlyOptions(url)).error(R.mipmap.default_image).placeholder(R.mipmap.default_image) + Glide.with(view).load(url).apply(options).apply(createUrlOnlyOptions(url)).error(R.mipmap.default_image).placeholder(R.mipmap.default_image) .listener(new RequestListener() { @Override public boolean onResourceReady(Drawable resource, Object model, diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/logger/DataLoggingInterceptor.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/logger/DataLoggingInterceptor.java index 0bc51559..4ba337ee 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/logger/DataLoggingInterceptor.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/logger/DataLoggingInterceptor.java @@ -61,7 +61,8 @@ public class DataLoggingInterceptor implements Interceptor { Connection connection = chain.connection(); Protocol protocol = connection != null ? connection.protocol() : Protocol.HTTP_1_1; - String requestStartMessage = request.method() + " " + request.url() + " " + protocol; + // request.url().encodedPath() 这是只展示最后的url地址，没有带有前面的https对应的域名，只是展示路径 + String requestStartMessage = request.method() + " " + request.url().encodedPath() + " " + protocol; logger.log(requestStartMessage); if (hasRequestBody) { @@ -140,7 +141,7 @@ public class DataLoggingInterceptor implements Interceptor { // + response.request().url() + " (" + tookMs + "ms)"); logger.log(response.code() + " " + response.message() + " " - + response.request().url() + " → " + response.networkResponse().request().url() + " (" + tookMs + "ms)"); + + response.request().url().encodedPath() + " → " + response.networkResponse().request().url().encodedPath() + " (" + tookMs + "ms)"); Headers headers = response.headers(); for (int i = 0, count = headers.size(); i < count; i++) { @@ -172,7 +173,8 @@ public class DataLoggingInterceptor implements Interceptor { if (contentLength != 0 && charset != null) { logger.log(sFormatLine); - logger.log(buffer.clone().readString(charset)); + //这是展示返回的数据日志 +// logger.log(buffer.clone().readString(charset)); } logger.log("END HTTP (" + buffer.size() + "-byte body)"); diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index a7bb0db1..3cddb5a9 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -363,6 +363,7 @@ class RoomActivity : BaseMvpActivity(), LogUtils.e("tasksMessageListener", result) getTasksMessageService(result) }) + MvpPre?.getRoomOnline(roomId, "1", "10") } @SuppressLint("ClickableViewAccessibility") diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java index 26c01163..eaeda843 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java @@ -819,8 +819,8 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment