Browse Source

1.修改直播页面UI

王鹏鹏 2 years ago
parent
commit
a68396656d

+ 2 - 1
.idea/misc.xml

@@ -43,13 +43,14 @@
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/item_game.xml" value="0.16" />
         <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_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" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/selector_live_tab_center.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/selector_live_tab_left.xml" value="0.219" />
         <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.264" />
+        <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/activity_live_broadcast.xml" value="0.4" />
         <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.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/fragment_first.xml" value="0.22826086956521738" />

+ 6 - 1
livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/detail/LiveBroadcastActivity.kt

@@ -11,6 +11,7 @@ import com.tencent.live2.V2TXLivePlayerObserver
 import com.tencent.live2.impl.V2TXLivePlayerImpl
 import com.yingyang.livebroadcast.databinding.ActivityLiveBroadcastBinding
 import com.yingyangfly.baselib.config.AccountConfig
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
@@ -42,7 +43,11 @@ class LiveBroadcastActivity :
     }
 
     override fun initListener() {
-
+        binding {
+            backLayout.setOnSingleClickListener {
+                finish()
+            }
+        }
     }
 
     override fun initData() {

+ 18 - 0
livebroadcast/src/main/res/drawable/bg_live_room.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/divider_13px" />
+            <gradient
+                android:angle="180"
+                android:endColor="@color/color_FF0B193B"
+                android:startColor="@color/color_FF152148"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+
+</layer-list>

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

@@ -12,7 +12,34 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/bg_live_broadcast">
+        android:background="@drawable/bg_live_room">
+
+        <LinearLayout
+            android:id="@+id/backLayout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/divider_50px"
+            android:layout_marginTop="@dimen/divider_32px"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="@dimen/divider_50px"
+                android:layout_height="@dimen/divider_50px"
+                android:background="@mipmap/icon_back" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_18px"
+                android:text="@string/back_pager"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_38px"
+                android:textStyle="bold" />
+
+        </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvTitle"

BIN
livebroadcast/src/main/res/mipmap-xxhdpi/icon_back.png


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

@@ -6,4 +6,6 @@
     <color name="color_ff4571ff" tools:ignore="ResourceName">#ff4571ff</color>
     <color name="color_ff8fafff" tools:ignore="ResourceName">#ff8fafff</color>
     <color name="color_FF2B70FF" tools:ignore="ResourceName">#FF2B70FF</color>
+    <color name="color_FF152148" tools:ignore="ResourceName">#FF152148</color>
+    <color name="color_FF0B193B" tools:ignore="ResourceName">#FF0B193B</color>
 </resources>

+ 1 - 1
livebroadcast/src/main/res/values/strings.xml

@@ -1,9 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="home_pager" tools:ignore="MissingTranslation,ResourceName">首页</string>
+    <string name="back_pager" tools:ignore="MissingTranslation,ResourceName">返回</string>
     <string name="live_broadcast" tools:ignore="MissingTranslation,ResourceName">直播</string>
     <string name="app_working" tools:ignore="MissingTranslation,ResourceName">正在运行中</string>
     <string name="appointment_hall" tools:ignore="ResourceName">预约大厅</string>
-
     <string name="live_playback" tools:ignore="ResourceName">直播回放</string>