Forráskód Böngészése

1.修改直播列表页面

王鹏鹏 2 éve
szülő
commit
9306c35be3

+ 1 - 0
.idea/misc.xml

@@ -594,6 +594,7 @@
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_identify_picture.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_listen_record.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_memorize_result.xml" value="0.536" />
+        <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_record_result.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_signature.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_single_choice.xml" value="0.176" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_timepiece.xml" value="0.23697916666666666" />

+ 1 - 1
livebroadcast/src/main/res/drawable/bg_live_status.xml

@@ -2,5 +2,5 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
     <corners android:radius="@dimen/divider_13px" />
-    <solid android:color="@color/color_cbefff" />
+    <solid android:color="@color/color_FF4A76FF" />
 </shape>

+ 83 - 58
livebroadcast/src/main/res/layout/item_live_broadcast.xml

@@ -11,70 +11,95 @@
             type="com.yingyang.livebroadcast.entity.Record" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/layoutLiveBroadcast"
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="@dimen/divider_522px"
-        android:layout_height="@dimen/divider_202px"
+        android:layout_height="@dimen/divider_502px"
         android:layout_marginTop="@dimen/divider_30px"
-        android:background="@mipmap/bg_data_content">
+        android:theme="@style/Theme.MaterialComponents.NoActionBar"
+        app:cardBackgroundColor="@android:color/white"
+        app:cardCornerRadius="@dimen/divider_20px">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/headImage"
-            android:layout_width="@dimen/divider_142px"
-            android:layout_height="@dimen/divider_142px"
-            android:layout_marginStart="@dimen/divider_22px"
-            android:scaleType="centerInside"
-            app:isCircle="@{true}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:loadHeadImg="@{data.liveCoverImage}" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/layoutLiveBroadcast"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvName"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/divider_20px"
-            android:layout_marginTop="@dimen/divider_38px"
-            android:layout_marginEnd="@dimen/divider_21px"
-            android:text="@{data.liveName}"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/divider_28px"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/headImage"
-            app:layout_constraintTop_toTopOf="parent" />
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/headImage"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/divider_253px"
+                android:layout_marginStart="@dimen/divider_22px"
+                android:layout_marginTop="@dimen/divider_26px"
+                android:layout_marginEnd="@dimen/divider_23px"
+                android:scaleType="centerCrop"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:loadImg="@{data.liveCoverImage}"
+                app:roundRadius="@{20}" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvContent"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/divider_20px"
-            android:layout_marginTop="@dimen/divider_8px"
-            android:layout_marginEnd="@dimen/divider_21px"
-            android:ellipsize="end"
-            android:maxLines="3"
-            android:text="@{data.liveDesn}"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/divider_22px"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/headImage"
-            app:layout_constraintTop_toBottomOf="@+id/tvName" />
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvName"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_24px"
+                android:layout_marginTop="@dimen/divider_23px"
+                android:layout_marginEnd="@dimen/divider_23px"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:text="@{data.liveName}"
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/divider_28px"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/headImage" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvTitle"
-            android:layout_width="@dimen/divider_160px"
-            android:layout_height="@dimen/divider_48px"
-            android:layout_marginStart="@dimen/divider_20px"
-            android:layout_marginTop="@dimen/divider_12px"
-            android:background="@drawable/bg_live_status"
-            android:gravity="center"
-            android:textColor="@color/color_345382"
-            android:textSize="@dimen/divider_24px"
-            app:layout_constraintStart_toEndOf="@+id/headImage"
-            app:layout_constraintTop_toBottomOf="@+id/tvContent" />
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvContent"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_24px"
+                android:layout_marginTop="@dimen/divider_6px"
+                android:layout_marginEnd="@dimen/divider_23px"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:text='@{"直播描述:"+data.liveDesn}'
+                android:textColor="@color/color_FF8C8C8C"
+                android:textSize="@dimen/divider_22px"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvName" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvTime"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_24px"
+                android:layout_marginTop="@dimen/divider_6px"
+                android:layout_marginEnd="@dimen/divider_23px"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:text='@{"开播时间:"+data.beginTime+" - "+data.endTime}'
+                android:textColor="@color/color_FF8C8C8C"
+                android:textSize="@dimen/divider_22px"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvContent" />
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvTitle"
+                android:layout_width="@dimen/divider_160px"
+                android:layout_height="@dimen/divider_48px"
+                android:layout_marginTop="@dimen/divider_20px"
+                android:background="@drawable/bg_live_status"
+                android:gravity="center"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_24px"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvTime" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
 </layout>

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

@@ -17,6 +17,7 @@
     <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_253px" tools:ignore="ResourceName">253px</dimen>
     <dimen name="divider_240px" tools:ignore="ResourceName">240px</dimen>
     <dimen name="divider_237px" tools:ignore="ResourceName">237px</dimen>
     <dimen name="divider_230px" tools:ignore="ResourceName">230px</dimen>