王鹏鹏 2 лет назад
Родитель
Сommit
f4d4aeed9c

+ 3 - 1
.idea/misc.xml

@@ -569,6 +569,7 @@
         <entry key="..\:/workspace/hcp-pads/imageselector/src/main/res/layout/activity_clip_image.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/imageselector/src/main/res/layout/activity_preview.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/bg_btn_game_task.xml" value="0.151" />
+        <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/bg_common_head_layout.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/bg_item_live_broadcast.xml" value="0.1715" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/bg_live_room.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/bg_live_status.xml" value="0.1715" />
@@ -576,6 +577,7 @@
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/selector_live_tab_left.xml" value="0.1715" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/activity_live_broadcast.xml" value="0.329232995658466" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/activity_live_broadcast_list.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/activity_live_details.xml" value="0.2" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/activity_video_player.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/dialog_game_tasks.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/item_live_broadcast.xml" value="1.555984555984556" />
@@ -607,7 +609,7 @@
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/drawable/bg_personal_center.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/drawable/bg_setting_center.xml" value="0.1715" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/activity_help.xml" value="0.23697916666666666" />
-        <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/activity_personal_center.xml" value="0.536" />
+        <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/activity_personal_center.xml" value="0.4421768707482993" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/activity_setting.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/activity_version_record.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/layout_setting_item.xml" value="0.23697916666666666" />

+ 5 - 0
baselib/src/main/java/com/yingyangfly/baselib/router/RouterUrlCommon.kt

@@ -50,6 +50,11 @@ object RouterUrlCommon {
      */
     const val liveBroadcastList = "/liveBroadcast/liveBroadcastList"
 
+    /**
+     * 直播详情
+     */
+    const val liveDetails = "/live/details"
+
     /**
      * 直播列表
      */

+ 5 - 0
livebroadcast/src/main/AndroidManifest.xml

@@ -21,6 +21,11 @@
     <application
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true">
+        <activity
+            android:name=".details.LiveDetailsActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".activity.detail.LiveBroadcastActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

+ 1 - 1
livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/list/LiveBroadcastListActivity.kt

@@ -107,7 +107,7 @@ class LiveBroadcastListActivity :
             }
         }
         liveBroadcastAdapter.jumpDetailsActivityClickListener = {
-
+            JumpUtil.jumpActivity(RouterUrlCommon.liveDetails, mContext)
         }
     }
 

+ 26 - 0
livebroadcast/src/main/java/com/yingyang/livebroadcast/details/LiveDetailsActivity.kt

@@ -0,0 +1,26 @@
+package com.yingyang.livebroadcast.details
+
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.yingyang.livebroadcast.databinding.ActivityLiveDetailsBinding
+import com.yingyangfly.baselib.base.BaseActivity
+import com.yingyangfly.baselib.router.RouterUrlCommon
+
+/**
+ * 直播详情
+ */
+@Route(path = RouterUrlCommon.liveDetails)
+class LiveDetailsActivity : BaseActivity<ActivityLiveDetailsBinding>() {
+
+    override fun initViews() {
+
+    }
+
+    override fun initListener() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+}

+ 5 - 0
livebroadcast/src/main/manifest/AndroidManifest.xml

@@ -22,6 +22,11 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
         tools:targetApi="n">
+        <activity
+            android:name=".details.LiveDetailsActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".activity.detail.LiveBroadcastActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

+ 11 - 0
livebroadcast/src/main/res/drawable/bg_common_head_layout.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle"
+    tools:ignore="ResourceName">
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_80BFDAFF" />
+    <corners android:radius="@dimen/divider_39px" />
+    <solid android:color="@android:color/white" />
+</shape>

+ 72 - 0
livebroadcast/src/main/res/layout/activity_live_details.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@mipmap/icon_uniform_background">
+
+        <LinearLayout
+            android:id="@+id/layoutHome"
+            android:layout_width="@dimen/divider_195px"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/divider_65px"
+            android:layout_marginTop="@dimen/divider_35px"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:layout_width="@dimen/divider_48px"
+                android:layout_height="@dimen/divider_48px"
+                android:background="@mipmap/icon_back" />
+
+            <TextView
+                style="@style/layout_properties_self_adaption"
+                android:layout_marginStart="@dimen/divider_14px"
+                android:text="@string/back_pager"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_28px"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tvTitle"
+            android:layout_width="@dimen/divider_237px"
+            android:layout_height="@dimen/divider_68px"
+            android:layout_marginTop="@dimen/divider_40px"
+            android:background="@drawable/bg_common_head_layout"
+            android:gravity="center"
+            android:text="@string/live_broadcast_details"
+            android:textColor="@color/color_FF4974FF"
+            android:textSize="@dimen/divider_34px"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginStart="@dimen/divider_60px"
+            android:layout_marginTop="@dimen/divider_60px"
+            android:layout_marginEnd="@dimen/divider_60px"
+            android:layout_marginBottom="@dimen/divider_165px"
+            android:theme="@style/Theme.MaterialComponents.NoActionBar"
+            app:cardBackgroundColor="@android:color/white"
+            app:cardCornerRadius="@dimen/divider_26px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle"
+            app:strokeColor="@color/color_960DA346"
+            app:strokeWidth="@dimen/divider_12px" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

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

@@ -17,4 +17,6 @@
     <color name="color_FF6D9AFF" tools:ignore="ResourceName">#FF6D9AFF</color>
     <color name="color_FFF4174FF" tools:ignore="ResourceName">#FF4174FF</color>
     <color name="transparent" tools:ignore="ResourceName">#00000000</color><!-- 透明   -->
+    <color name="color_80BFDAFF" tools:ignore="ResourceName">#80BFDAFF</color>
+    <color name="color_960DA346" tools:ignore="ResourceName">#960DA346</color>
 </resources>

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

@@ -25,6 +25,7 @@
     <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>
+    <dimen name="divider_165px" tools:ignore="ResourceName">165px</dimen>
     <dimen name="divider_160px" tools:ignore="ResourceName">160px</dimen>
     <dimen name="divider_142px" tools:ignore="ResourceName">142px</dimen>
     <dimen name="divider_140px" tools:ignore="ResourceName">140px</dimen>

+ 12 - 11
livebroadcast/src/main/res/values/strings.xml

@@ -1,16 +1,17 @@
 <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="MissingTranslation,ResourceName">预约大厅</string>
-    <string name="live_playback" tools:ignore="MissingTranslation,ResourceName">直播回放</string>
-    <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>
+    <string name="home_pager" tools:ignore="ResourceName">首页</string>
+    <string name="back_pager" tools:ignore="ResourceName">返回</string>
+    <string name="live_broadcast" tools:ignore="ResourceName">直播</string>
+    <string name="app_working" tools:ignore="ResourceName">正在运行中</string>
+    <string name="appointment_hall" tools:ignore="ResourceName">预约大厅</string>
+    <string name="live_playback" tools:ignore="ResourceName">直播回放</string>
+    <string name="welcome_to_ask_questions" tools:ignore="ResourceName">欢迎您提问题</string>
+    <string name="live_streaming" tools:ignore="ResourceName">直播</string>
+    <string name="send_message" tools:ignore="ResourceName">发送</string>
+    <string name="yes" tools:ignore="ResourceName">是</string>
+    <string name="no" tools:ignore="ResourceName">否</string>
     <string name="exclusive_game_tasks" tools:ignore="ResourceName">专属游戏任务</string>
     <string name="enter_game" tools:ignore="ResourceName">进入游戏</string>
     <string name="details" tools:ignore="ResourceName">详情</string>
+    <string name="live_broadcast_details" tools:ignore="ResourceName">直播详情</string>
 </resources>

+ 26 - 0
livebroadcast/src/main/res/values/themes.xml

@@ -1,5 +1,31 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
+    <!--自适应高度-->
+    <style name="layout_properties_self_adaption" tools:ignore="ResourceName">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <!--指定宽度和高度-->
+    <style name="layout_properties_specify_width_geight" tools:ignore="ResourceName">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+    </style>
+
+    <!--指定宽度-->
+    <style name="layout_properties_specify_width" tools:ignore="ResourceName">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <style name="text_personal_center" tools:ignore="ResourceName">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">@dimen/divider_24px</item>
+        <item name="android:textColor">@color/color_FF333333</item>
+        <item name="layout_constraintHorizontal_weight">1</item>
+    </style>
+
     <style name="text_live_broadcast" tools:ignore="ResourceName">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>