YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1:修改房间离线展示

Browse Source
This commit is contained in:
梁小江
2025-12-03 17:08:01 +08:00
parent 50ef12ee3b
commit 9a4b9b973b
11 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
View File

@@ -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 {

22
BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
View File

@@ -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);

2
BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheat2View.java
View File

@@ -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) {

2
BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
View File

@@ -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) {

1
BaseModule/src/main/res/layout/room_view_sing_wheat.xml
View File

@@ -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"

11
MainModule/src/main/java/com/xscm/modulemain/activity/WebViewActivity.java
View File

@@ -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<IPresenter,ActivityWebViewB
public String url;
@Autowired
public String type;//type=1:青少年模式
public String chatId;
private ValueCallback<Uri> mUploadMessage;
private ValueCallback<Uri[]> mUploadCallbackAboveL;
private final int REQUEST_FILE_PICKER = 1;
@@ -316,6 +321,12 @@ public class WebViewActivity extends BaseMvpActivity<IPresenter,ActivityWebViewB
title = getIntent().getStringExtra("title");
url = getIntent().getStringExtra("url");
type = getIntent().getStringExtra("type");
chatId=getIntent().getStringExtra("id");
if (chatId!=null){
url= String.format(WebUrlConstants.INSTANCE.getWEB_SET_GROUP_URL(), SpUtil.getToken(), chatId);
}
if (type != null) {
// 当type==1时，禁用返回手势滑动
if (type.equals("1")) {

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

@@ -2507,7 +2507,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
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
}

4
MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/JoinedFamilyFragment.kt
View File

@@ -51,14 +51,14 @@ class JoinedFamilyFragment(var data: MyFamilyBean) : BaseFragment<FragmentJoined
}
mBinding.tvFamilyGroup.setOnClickListener {
if (myFamilyBean.group_members_lists.isNotEmpty()) {
if (myFamilyBean.group_id.isNotEmpty()) {
val intent = Intent(activity, TUIGroupChatActivity::class.java)
intent.putExtra(TUIConstants.TUIChat.CHAT_ID, myFamilyBean.group_id)
intent.putExtra(TUIConstants.TUIChat.CHAT_NAME, myFamilyBean.name)
intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_GROUP)
startActivity(intent)
}else{
ToastUtils.showLong("家族群至少需要签约一位徒弟")
ToastUtils.showLong("没有家族请去签约别人的提示")
}
}

4
MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/MyFamilyFragment.kt
View File

@@ -58,14 +58,14 @@ class MyFamilyFragment(var data: MyFamilyBean) : BaseFragment<FragmentMyFamilyBi
}
mBinding.tvFamilyGroup.setOnClickListener {
if (myFamilyBean.group_members_lists.isNotEmpty()) {
if (myFamilyBean.group_id.isNotEmpty()) {
val intent = Intent(activity, TUIGroupChatActivity::class.java)
intent.putExtra(TUIConstants.TUIChat.CHAT_ID, myFamilyBean.group_id)
intent.putExtra(TUIConstants.TUIChat.CHAT_NAME, myFamilyBean.name)
intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_GROUP)
startActivity(intent)
} else {
ToastUtils.showLong("家族群至少需要签约一位徒弟")
ToastUtils.showLong("没有家族请去签约别人的提示")
}
}

26
MainModule/src/main/res/layout/layout_room_mentorship_wheat.xml
View File

@@ -22,18 +22,7 @@
app:layout_constraintTop_toTopOf="parent"
android:clipChildren="false"
android:clipToPadding="false">
<!-- 离线状态 - 与头像框同样大小 -->
<ImageView
android:id="@+id/iv_online"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@mipmap/room_ic_owner_offline"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/iv_frame"
app:layout_constraintEnd_toEndOf="@id/iv_frame"
app:layout_constraintStart_toStartOf="@id/iv_frame"
app:layout_constraintTop_toTopOf="@id/iv_frame"
tools:visibility="visible" />
<!-- 用户头像 -->
<com.xscm.moduleutil.widget.CircularImage
@@ -75,6 +64,19 @@
app:layout_constraintWidth_percent="1"
tools:visibility="visible" />
<!-- 离线状态 - 与头像框同样大小 -->
<ImageView
android:id="@+id/iv_online"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@mipmap/room_ic_owner_offline"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/iv_frame"
app:layout_constraintEnd_toEndOf="@id/iv_frame"
app:layout_constraintStart_toStartOf="@id/iv_frame"
app:layout_constraintTop_toTopOf="@id/iv_frame"
tools:visibility="visible" />
<!-- 麦圈 - 在头像框上面展示 -->
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/iv_ripple"

5
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIGroupChatFragment.java
View File

@@ -83,7 +83,10 @@ public class TUIGroupChatFragment extends TUIBaseChatFragment {
titleBar.setOnRightClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
EventBus.getDefault().post(chatInfo);
// EventBus.getDefault().post(chatInfo);
String id = chatInfo.getId().replace("g", "");
ARouter.getInstance().build("/moduleUtil/WebViewActivity").withString("id", id).navigation();
// Map<String, Object> param = new HashMap<>();
// if (TUIChatUtils.isTopicGroup(chatInfo.getId())) {