1:修改房间离线展示

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

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

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

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

@@ -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("没有家族请去签约别人的提示")
             }
         }
 

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

@@ -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("没有家族请去签约别人的提示")
             }
         }
 

MainModule/src/main/res/layout/layout_room_mentorship_wheat.xml

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