Browse Source

1.修改直播页面UI

王鹏鹏 2 years ago
parent
commit
69eaa0c595

+ 5 - 0
.idea/misc.xml

@@ -41,6 +41,11 @@
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/activity_home.xml" value="0.2" />
         <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/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.22826086956521738" />
         <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" />

+ 5 - 0
livebroadcast/src/main/res/color/txt_live_color.xml

@@ -0,0 +1,5 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+    <item android:color="@color/color_FF2B70FF" android:state_checked="true" />
+    <!-- not selected -->
+    <item android:color="@android:color/white" android:state_checked="false" />
+</selector>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+    <item android:drawable="@mipmap/icon_center_selected" android:state_checked="false" />
+    <item android:drawable="@mipmap/icon_center_unselected" android:state_checked="true" />
+</selector>
+
+

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+    <item android:drawable="@mipmap/icon_left_selected" android:state_checked="false" />
+    <item android:drawable="@mipmap/icon_left_unselected" android:state_checked="true" />
+</selector>
+
+

+ 6 - 0
livebroadcast/src/main/res/drawable/selector_live_tab_right.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+    <item android:drawable="@mipmap/icon_right_selected" android:state_checked="false" />
+    <item android:drawable="@mipmap/icon_right_unselected" android:state_checked="true" />
+</selector>
+

+ 31 - 11
livebroadcast/src/main/res/layout/activity_live_broadcast_list.xml

@@ -40,29 +40,49 @@
 
         </LinearLayout>
 
-        <Button
-            android:id="@+id/btnLiveBroadcast"
-            android:layout_width="@dimen/divider_237px"
-            android:layout_height="@dimen/divider_68px"
-            android:layout_marginTop="@dimen/divider_40px"
-            android:background="@drawable/bg_live_broadcast_button"
-            android:text="@string/live_broadcast"
-            android:textColor="@color/color_FF4974FF"
-            android:textSize="@dimen/divider_34px"
+        <RadioGroup
+            android:id="@+id/radioLive"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/divider_36px"
+            android:gravity="center"
+            android:orientation="horizontal"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
+
+            <RadioButton
+                android:id="@+id/rdb_appointment"
+                style="@style/broadcast_radio_button"
+                android:background="@drawable/selector_live_tab_left"
+                android:checked="true"
+                android:text="@string/appointment_hall" />
+
+            <RadioButton
+                android:id="@+id/rdb_live"
+                style="@style/broadcast_radio_button"
+                android:background="@drawable/selector_live_tab_center"
+                android:text="@string/appointment_hall" />
+
+            <RadioButton
+                android:id="@+id/rdb_playback"
+                style="@style/broadcast_radio_button"
+                android:background="@drawable/selector_live_tab_right"
+                android:text="@string/live_playback" />
+        </RadioGroup>
 
         <com.scwang.smart.refresh.layout.SmartRefreshLayout
             android:id="@+id/swipeLiveBroadcast"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_marginLeft="@dimen/divider_60px"
+            android:layout_marginTop="@dimen/divider_47px"
             android:layout_marginRight="@dimen/divider_60px"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnLiveBroadcast">
+            app:layout_constraintTop_toBottomOf="@+id/radioLive">
 
             <com.scwang.smart.refresh.header.ClassicsHeader
                 android:layout_width="match_parent"

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


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


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


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


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


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


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

@@ -5,4 +5,5 @@
     <color name="color_FF333333" tools:ignore="ResourceName">#FF333333</color>
     <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>
 </resources>

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

@@ -2,4 +2,9 @@
     <string name="home_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>
+
+
 </resources>

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

@@ -11,4 +11,13 @@
         <item name="android:layout_marginEnd">@dimen/divider_20px</item>
         <item name="layout_constraintRight_toRightOf">parent</item>
     </style>
+
+    <style name="broadcast_radio_button" tools:ignore="ResourceName">
+        <item name="android:layout_width">@dimen/divider_195px</item>
+        <item name="android:layout_height">@dimen/divider_55px</item>
+        <item name="android:button">@null</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textSize">@dimen/divider_24px</item>
+        <item name="android:textColor">@color/txt_live_color</item>
+    </style>
 </resources>