Browse Source

1.添加直播间心跳上传接口

王鹏鹏 2 years ago
parent
commit
36e7f65c80

+ 1 - 0
.idea/misc.xml

@@ -169,6 +169,7 @@
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/activity_video_player.xml" value="0.136" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/fragment_first.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/item_live_broadcast.xml" value="0.22826086956521738" />
+        <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/item_message.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pad/login/src/main/res/drawable/bg_login.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/login/src/main/res/drawable/bg_login_btn.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/login/src/main/res/drawable/bg_login_edit.xml" value="0.219" />

+ 0 - 45
livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/detail/LiveBroadcastActivity.kt

@@ -2,13 +2,10 @@ package com.yingyang.livebroadcast.activity.detail
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.text.TextUtils
-import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.tencent.bugly.crashreport.CrashReport
-import com.tencent.imsdk.v2.*
 import com.tencent.live2.V2TXLivePlayer
 import com.tencent.live2.V2TXLivePlayerObserver
 import com.tencent.live2.impl.V2TXLivePlayerImpl
@@ -16,7 +13,6 @@ import com.yingyang.livebroadcast.R
 import com.yingyang.livebroadcast.databinding.ActivityLiveBroadcastBinding
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
-import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.User
@@ -47,8 +43,6 @@ class LiveBroadcastActivity :
         initPlayer()
         //上报直播间心跳
         initTask()
-        //初始化IM
-        getUserSign()
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -79,47 +73,8 @@ class LiveBroadcastActivity :
         }
     }
 
-    /**
-     * 获取腾讯IM密钥
-     */
-    private fun getUserSign() {
-        viewModel.getUserSign(User.getUserId(), fail = {
-            it.toast()
-        }, success = {
-            if (TextUtils.isEmpty(it).not()) {
-                loginIm(it!!)
-            }
-        })
-    }
-
-    /**
-     * 登录IM
-     */
-    private fun loginIm(sign: String) {
-        V2TIMManager.getInstance().login(User.getUserId(), sign, object : V2TIMCallback {
-            override fun onError(p0: Int, p1: String?) {
-                //用户登录IM失败
-                CrashReport.postCatchedException(Throwable(User.getName() + "用户登录IM失败,错误码:" + p0 + " ,错误信息:" + p1))
-            }
-
-            override fun onSuccess() {
-
-            }
-        })
-    }
-
     override fun onDestroy() {
         runOnUiThread {
-            V2TIMManager.getInstance().logout(object : V2TIMCallback {
-                override fun onError(p0: Int, p1: String?) {
-                    //用户登录IM失败
-                    CrashReport.postCatchedException(Throwable(User.getName() + "用户退出IM失败,错误码:" + p0 + " ,错误信息:" + p1))
-                }
-
-                override fun onSuccess() {
-                    Log.e("wpp", "IM退出成功")
-                }
-            })
             if (mLivePlayer != null) {
                 if (mPlayFlag) {
                     mLivePlayer!!.stopPlay()

+ 1 - 41
livebroadcast/src/main/res/layout/activity_live_broadcast.xml

@@ -59,51 +59,11 @@
             android:layout_height="0dp"
             android:layout_marginStart="@dimen/divider_58px"
             android:layout_marginEnd="@dimen/divider_58px"
-            app:layout_constraintBottom_toTopOf="@+id/chatLayout"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <LinearLayout
-            android:id="@+id/chatLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/divider_80px"
-            android:layout_marginStart="@dimen/divider_58px"
-            android:layout_marginEnd="@dimen/divider_58px"
-            android:layout_marginBottom="@dimen/divider_20px"
-            android:background="@drawable/bg_im_chat"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
-
-            <androidx.appcompat.widget.AppCompatEditText
-                android:id="@+id/editChat"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@null"
-                android:gravity="center_vertical"
-                android:hint="@string/welcome_to_ask_questions"
-                android:paddingStart="@dimen/divider_41px"
-                android:paddingEnd="@dimen/divider_41px"
-                android:textColor="@android:color/white"
-                android:textColorHint="@android:color/white"
-                android:textSize="@dimen/divider_28px" />
-
-            <androidx.appcompat.widget.AppCompatButton
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:background="@null"
-                android:gravity="center"
-                android:paddingStart="@dimen/divider_41px"
-                android:paddingEnd="@dimen/divider_41px"
-                android:text="@string/send_message"
-                android:textColor="@color/color_FF4A76FF"
-                android:textSize="@dimen/divider_28px"
-                android:textStyle="bold" />
-
-        </LinearLayout>
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>