From 9a4b9b973ba9f61b5e1af2d5fa378a868690bc39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Wed, 3 Dec 2025 17:08:01 +0800 Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E6=88=BF=E9=97=B4=E7=A6=BB?= =?UTF-8?q?=E7=BA=BF=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xscm/moduleutil/bean/UserInfo.java | 1 + .../xscm/moduleutil/widget/BaseWheatView.java | 22 +++++++++++----- .../widget/RoomSingSongWheat2View.java | 2 +- .../widget/RoomSingSongWheatView.java | 2 +- .../main/res/layout/room_view_sing_wheat.xml | 1 + .../modulemain/activity/WebViewActivity.java | 11 ++++++++ .../activity/room/activity/RoomActivity.kt | 2 +- .../user/fragment/JoinedFamilyFragment.kt | 4 +-- .../user/fragment/MyFamilyFragment.kt | 4 +-- .../layout/layout_room_mentorship_wheat.xml | 26 ++++++++++--------- .../classicui/page/TUIGroupChatFragment.java | 5 +++- 11 files changed, 54 insertions(+), 26 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java index c3293361..fac64808 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java @@ -92,6 +92,7 @@ public class UserInfo extends BaseEvent implements Serializable { private String sign_id; private Master master; + private int is_online;//是否在线 : 1在线 2离线 @Data public static class Master implements Serializable { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java index ed5f25a6..a7c1c465 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java @@ -179,10 +179,15 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe setCardiac(pitBean.getCharm(), getTzbl()); if (bean.getUser_id() != null && !bean.getUser_id().equals("0") && !bean.getUser_id().isEmpty()) { - if (CommonAppContext.getInstance().getOnlineMap() != null && CommonAppContext.getInstance().getOnlineMap().get(bean.getUser_id()) != null) { - iv_on_line.setVisibility(CommonAppContext.getInstance().getOnlineMap().get(bean.getUser_id()) == 1 ? GONE : VISIBLE); - } else { +// if (CommonAppContext.getInstance().getOnlineMap() != null && CommonAppContext.getInstance().getOnlineMap().get(bean.getUser_id()) != null) { +// iv_on_line.setVisibility(CommonAppContext.getInstance().getOnlineMap().get(bean.getUser_id()) == 1 ? GONE : VISIBLE); +// } else { +// iv_on_line.setVisibility(GONE); +// } + if (bean.getIs_online()== 1) { iv_on_line.setVisibility(GONE); + }else { + iv_on_line.setVisibility(VISIBLE); } } else { iv_on_line.setVisibility(GONE); @@ -424,10 +429,15 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe public void setOnlineStatus() { if (pitBean.getUser_id() != null && !pitBean.getUser_id().equals("0") && !pitBean.getUser_id().isEmpty()) { - if (CommonAppContext.getInstance().getOnlineMap() != null && CommonAppContext.getInstance().getOnlineMap().get(pitBean.getUser_id()) != null) { - iv_on_line.setVisibility(CommonAppContext.getInstance().getOnlineMap().get(pitBean.getUser_id()) == 1 ? GONE : VISIBLE); - } else { +// if (CommonAppContext.getInstance().getOnlineMap() != null && CommonAppContext.getInstance().getOnlineMap().get(pitBean.getUser_id()) != null) { +// iv_on_line.setVisibility(CommonAppContext.getInstance().getOnlineMap().get(pitBean.getUser_id()) == 1 ? GONE : VISIBLE); +// } else { +// iv_on_line.setVisibility(GONE); +// } + if(pitBean.getIs_online()==1){ iv_on_line.setVisibility(GONE); + }else { + iv_on_line.setVisibility(VISIBLE); } } else { iv_on_line.setVisibility(GONE); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheat2View.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheat2View.java index 12ae4b30..ca6bcf08 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheat2View.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheat2View.java @@ -74,7 +74,7 @@ public class RoomSingSongWheat2View extends BaseWheatView { updateSexIcon(); // updateCharmViewVisibility(bean); updatePkState(bean); - iv_on_line.setVisibility(GONE); +// iv_on_line.setVisibility(GONE); } private void handleOnState(RoomPitBean bean) { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java index dd6491cf..ea369ffb 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java @@ -71,7 +71,7 @@ public class RoomSingSongWheatView extends BaseWheatView { updateSexIcon(); updatePkState(bean); - iv_on_line.setVisibility(GONE); +// iv_on_line.setVisibility(GONE); } private void handleOnState(RoomPitBean bean) { diff --git a/BaseModule/src/main/res/layout/room_view_sing_wheat.xml b/BaseModule/src/main/res/layout/room_view_sing_wheat.xml index 5305f211..a8bb9fa6 100644 --- a/BaseModule/src/main/res/layout/room_view_sing_wheat.xml +++ b/BaseModule/src/main/res/layout/room_view_sing_wheat.xml @@ -207,6 +207,7 @@ android:layout_height="0dp" android:background="@mipmap/room_ic_owner_offline" android:visibility="gone" + android:tint="@color/black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toEndOf="parent" diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/WebViewActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/WebViewActivity.java index 7de4f5c5..40809072 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/WebViewActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/WebViewActivity.java @@ -42,7 +42,9 @@ import com.xscm.modulemain.manager.RoomManager; import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.base.CommonAppContext; +import com.xscm.moduleutil.base.WebUrlConstants; import com.xscm.moduleutil.utils.ARouteConstants; +import com.xscm.moduleutil.utils.SpUtil; /** * @author qx @@ -56,6 +58,9 @@ public class WebViewActivity extends BaseMvpActivity mUploadMessage; private ValueCallback mUploadCallbackAboveL; private final int REQUEST_FILE_PICKER = 1; @@ -316,6 +321,12 @@ public class WebViewActivity extends BaseMvpActivity(), pitBean.nickname = messageEvent.text.fromUserInfo.nickname pitBean.sex = messageEvent.text.fromUserInfo.sex.toString() + "" pitBean.charm = messageEvent.text.fromUserInfo.charm - + pitBean.is_online=messageEvent.text.fromUserInfo.is_online return pitBean } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/JoinedFamilyFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/JoinedFamilyFragment.kt index f4186157..bedfbbc4 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/JoinedFamilyFragment.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/JoinedFamilyFragment.kt @@ -51,14 +51,14 @@ class JoinedFamilyFragment(var data: MyFamilyBean) : BaseFragment - - + + + + param = new HashMap<>(); // if (TUIChatUtils.isTopicGroup(chatInfo.getId())) {