浏览代码

1.添加直播统计是和否接口

王鹏鹏 2 年之前
父节点
当前提交
be08603277

+ 2 - 1
.idea/misc.xml

@@ -156,6 +156,7 @@
         <entry key="..\:/workspace/hcp-pad/imageselector/src/main/res/layout/activity_image_select.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_im_chat.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_live_broadcast.xml" value="0.219" />
+        <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_live_broadcast_btn.xml" value="0.171" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_live_broadcast_button.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_live_room.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_live_status.xml" value="0.219" />
@@ -164,7 +165,7 @@
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/selector_live_tab_right.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/selector_train_report_tab_left.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/txt_live_color.xml" value="0.219" />
-        <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/activity_live_broadcast.xml" value="0.2962239583333333" />
+        <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/activity_live_broadcast.xml" value="0.6" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/activity_live_broadcast_list.xml" value="0.21014492753623187" />
         <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" />

+ 35 - 5
livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/detail/LiveBroadcastActivity.kt

@@ -13,6 +13,8 @@ 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.show
+import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.User
@@ -43,11 +45,17 @@ class LiveBroadcastActivity :
         initPlayer()
         //上报直播间心跳
         initTask()
+
+
     }
 
     @SuppressLint("ClickableViewAccessibility")
     override fun initListener() {
-        binding.backLayout.setOnTouchListener(this@LiveBroadcastActivity)
+        binding {
+            backLayout.setOnTouchListener(this@LiveBroadcastActivity)
+            btnYes.setOnTouchListener(this@LiveBroadcastActivity)
+            btnNo.setOnTouchListener(this@LiveBroadcastActivity)
+        }
     }
 
     override fun initData() {
@@ -90,18 +98,26 @@ class LiveBroadcastActivity :
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
-                if (v.id == R.id.backLayout) {
+                if (v.id == R.id.backLayout || v.id == R.id.btnYes || v.id == R.id.btnNo) {
                     v.startAnimation(getScaleAnimation())
                 }
             }
             MotionEvent.ACTION_UP -> {
                 v.startAnimation(getEndAnimation())
-                if (v.id == R.id.backLayout) {
-                    finish()
+                when (v.id) {
+                    R.id.backLayout -> {
+                        finish()
+                    }
+                    R.id.btnYes -> {
+                        liveYesorno("0")
+                    }
+                    R.id.btnNo -> {
+                        liveYesorno("1")
+                    }
                 }
             }
             MotionEvent.ACTION_CANCEL -> {
-                if (v.id == R.id.backLayout) {
+                if (v.id == R.id.backLayout || v.id == R.id.btnYes || v.id == R.id.btnNo) {
                     v.startAnimation(getEndAnimation())
                 }
             }
@@ -138,4 +154,18 @@ class LiveBroadcastActivity :
 
         })
     }
+
+    /**
+     * 直播统计是和否
+     */
+    private fun liveYesorno(status: String) {
+        viewModel.liveYesorno(liveId, status, fail = {
+            it.toast()
+        }, success = {
+            binding {
+                btnYes.show(false)
+                btnNo.show(false)
+            }
+        })
+    }
 }

+ 7 - 0
livebroadcast/src/main/res/drawable/bg_live_broadcast_btn.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_33px" />
+    <solid android:color="@color/color_FF4A76FF" />
+</shape>

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

@@ -59,11 +59,46 @@
             android:layout_height="0dp"
             android:layout_marginStart="@dimen/divider_58px"
             android:layout_marginEnd="@dimen/divider_58px"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/btnYes"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btnYes"
+            android:layout_width="@dimen/divider_222px"
+            android:layout_height="@dimen/divider_66px"
+            android:layout_marginStart="@dimen/divider_325px"
+            android:layout_marginTop="@dimen/divider_25px"
+            android:layout_marginBottom="@dimen/divider_27px"
+            android:background="@drawable/bg_live_broadcast_btn"
+            android:gravity="center"
+            android:text="@string/yes"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_28px"
+            android:textStyle="bold"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/play_tx_cloud_view" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btnNo"
+            android:layout_width="@dimen/divider_222px"
+            android:layout_height="@dimen/divider_66px"
+            android:layout_marginStart="@dimen/divider_100px"
+            android:layout_marginTop="@dimen/divider_25px"
+            android:layout_marginBottom="@dimen/divider_27px"
+            android:background="@drawable/bg_live_broadcast_btn"
+            android:gravity="center"
+            android:text="@string/no"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_28px"
+            android:textStyle="bold"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/btnYes"
+            app:layout_constraintTop_toBottomOf="@+id/play_tx_cloud_view" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>

+ 2 - 0
livebroadcast/src/main/res/values/dimens.xml

@@ -13,9 +13,11 @@
     <dimen name="divider_522px" tools:ignore="ResourceName">522px</dimen>
     <dimen name="divider_353px" tools:ignore="ResourceName">353px</dimen>
     <dimen name="divider_340px" tools:ignore="ResourceName">340px</dimen>
+    <dimen name="divider_325px" tools:ignore="ResourceName">325px</dimen>
     <dimen name="divider_270px" tools:ignore="ResourceName">270px</dimen>
     <dimen name="divider_237px" tools:ignore="ResourceName">237px</dimen>
     <dimen name="divider_230px" tools:ignore="ResourceName">230px</dimen>
+    <dimen name="divider_222px" tools:ignore="ResourceName">222px</dimen>
     <dimen name="divider_202px" tools:ignore="ResourceName">202px</dimen>
     <dimen name="divider_195px" tools:ignore="ResourceName">195px</dimen>
     <dimen name="divider_180px" tools:ignore="ResourceName">180px</dimen>

+ 2 - 0
livebroadcast/src/main/res/values/strings.xml

@@ -8,4 +8,6 @@
     <string name="welcome_to_ask_questions" tools:ignore="MissingTranslation,ResourceName">欢迎您提问题</string>
     <string name="live_streaming" tools:ignore="MissingTranslation,ResourceName">直播</string>
     <string name="send_message" tools:ignore="MissingTranslation,ResourceName">发送</string>
+    <string name="yes" tools:ignore="MissingTranslation,ResourceName">是</string>
+    <string name="no" tools:ignore="MissingTranslation,ResourceName">否</string>
 </resources>