Browse Source

1.添加直播列表UI

王鹏鹏 3 years ago
parent
commit
403b606ee4

+ 2 - 0
.idea/misc.xml

@@ -3,6 +3,8 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <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/fragment_first.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/item_live_broadcast.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/webview/src/main/res/layout/activity_bridge_web.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/webview/src/main/res/layout/activity_webview.xml" value="0.22826086956521738" />

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

@@ -45,6 +45,11 @@ object RouterUrlCommon {
      */
     const val trainData = "/trainData/trainData"
 
+    /**
+     * 直播列表
+     */
+    const val liveBroadcastList = "/liveBroadcast/liveBroadcastList"
+
     /**
      * 直播列表
      */

+ 6 - 0
livebroadcast/build.gradle

@@ -3,6 +3,10 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
+
+    buildFeatures {
+        viewBinding true
+    }
     defaultConfig {
         // 如果是独立模块,则使用当前组件的包名
         if (singleModule.toBoolean()) {
@@ -20,4 +24,6 @@ dependencies {
     implementation( rootProject.ext.androidx.appcompat )
     implementation( rootProject.ext.androidx.material )
     implementation( rootProject.ext.androidx.constraintlayout)
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
 }

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

@@ -8,6 +8,10 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
-
+        <activity
+            android:name=".activity.list.LiveBroadcastListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
     </application>
 </manifest>

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

@@ -1,55 +1,23 @@
 package com.yingyang.livebroadcast.activity
 
-import androidx.recyclerview.widget.GridLayoutManager
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.yingyang.livebroadcast.activity.adapter.LiveBroadcastAdapter
 import com.yingyang.livebroadcast.databinding.ActivityLiveBroadcastBinding
 import com.yingyangfly.baselib.base.BaseActivity
-import com.yingyangfly.baselib.ext.setOnSingleClickListener
-import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.router.RouterUrlCommon
-import com.yingyangfly.baselib.utils.JumpUtil
 
 /**
- * 直播列表页面
+ * 直播页面
  */
 @Route(path = RouterUrlCommon.liveBroadcast)
 class LiveBroadcastActivity : BaseActivity<ActivityLiveBroadcastBinding>() {
 
-    private var liveBroadcastList = mutableListOf<String>()
-
-    /**
-     * 直播adapter
-     */
-    private val liveBroadcastAdapter by lazy { LiveBroadcastAdapter() }
 
     override fun initViews() {
-        liveBroadcastList.add("张医生")
-        liveBroadcastList.add("张医生")
-        liveBroadcastList.add("张医生")
-        liveBroadcastList.add("张医生")
-        liveBroadcastList.add("张医生")
-        liveBroadcastList.add("张医生")
-        liveBroadcastList.add("张医生")
-        liveBroadcastList.add("张医生")
-        liveBroadcastList.add("张医生")
-        binding {
-            rvLiveBroadcast.layoutManager = GridLayoutManager(this@LiveBroadcastActivity, 2)
-            rvLiveBroadcast.adapter = liveBroadcastAdapter
-            liveBroadcastAdapter.setData(liveBroadcastList)
-            liveBroadcastAdapter.onLiveBroadcastImageClickListener = { bean, position ->
-                "正在开发,请稍等".toast()
-            }
-        }
+
     }
 
     override fun initListener() {
-        binding {
-            layoutHome.setOnSingleClickListener {
-                JumpUtil.jumpActivity(RouterUrlCommon.workbenches)
-                finish()
-            }
-        }
+
     }
 
     override fun initData() {

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

@@ -0,0 +1,58 @@
+package com.yingyang.livebroadcast.activity.list
+
+import androidx.recyclerview.widget.GridLayoutManager
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.yingyang.livebroadcast.activity.adapter.LiveBroadcastAdapter
+import com.yingyang.livebroadcast.databinding.ActivityLiveBroadcastListBinding
+import com.yingyangfly.baselib.base.BaseActivity
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
+import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.JumpUtil
+
+/**
+ * 直播列表
+ */
+@Route(path = RouterUrlCommon.liveBroadcastList)
+class LiveBroadcastListActivity : BaseActivity<ActivityLiveBroadcastListBinding>() {
+
+    private var liveBroadcastList = mutableListOf<String>()
+
+    /**
+     * 直播adapter
+     */
+    private val liveBroadcastAdapter by lazy { LiveBroadcastAdapter() }
+
+    override fun initViews() {
+        liveBroadcastList.add("张医生")
+        liveBroadcastList.add("张医生")
+        liveBroadcastList.add("张医生")
+        liveBroadcastList.add("张医生")
+        liveBroadcastList.add("张医生")
+        liveBroadcastList.add("张医生")
+        liveBroadcastList.add("张医生")
+        liveBroadcastList.add("张医生")
+        liveBroadcastList.add("张医生")
+        binding {
+            rvLiveBroadcast.layoutManager = GridLayoutManager(this@LiveBroadcastListActivity, 2)
+            rvLiveBroadcast.adapter = liveBroadcastAdapter
+            liveBroadcastAdapter.setData(liveBroadcastList)
+            liveBroadcastAdapter.onLiveBroadcastImageClickListener = { bean, position ->
+                JumpUtil.jumpActivity(RouterUrlCommon.liveBroadcast)
+            }
+        }
+    }
+
+    override fun initListener() {
+        binding {
+            layoutHome.setOnSingleClickListener {
+                JumpUtil.jumpActivity(RouterUrlCommon.workbenches)
+                finish()
+            }
+        }
+    }
+
+    override fun initData() {
+
+    }
+
+}

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

@@ -3,6 +3,11 @@
     package="com.yingyang.livebroadcast">
 
     <application>
+        <activity
+            android:name=".activity.list.LiveBroadcastListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
         <activity
             android:name=".activity.LiveBroadcastActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

+ 6 - 46
livebroadcast/src/main/res/layout/activity_live_broadcast.xml

@@ -14,57 +14,17 @@
         android:layout_height="match_parent"
         android:background="@drawable/bg_live_broadcast">
 
-        <LinearLayout
-            android:id="@+id/layoutHome"
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:layout_width="@dimen/divider_48px"
-                android:layout_height="@dimen/divider_43px"
-                android:layout_marginStart="@dimen/divider_60px"
-                android:layout_marginTop="@dimen/divider_36px"
-                android:background="@mipmap/bg_home" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/divider_8px"
-                android:layout_marginTop="@dimen/divider_32px"
-                android:text="首页"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_38px"
-                android:textStyle="bold" />
-
-        </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="直播"
-            android:textColor="#FF4974FF"
-            android:textSize="@dimen/divider_34px"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rvLiveBroadcast"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginLeft="@dimen/divider_60px"
-            android:layout_marginRight="@dimen/divider_60px"
+            android:text="直播详情"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_36px"
+            android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnLiveBroadcast" />
-
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

+ 71 - 0
livebroadcast/src/main/res/layout/activity_live_broadcast_list.xml

@@ -0,0 +1,71 @@
+<?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">
+
+    <data>
+
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_live_broadcast">
+
+        <LinearLayout
+            android:id="@+id/layoutHome"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:layout_width="@dimen/divider_48px"
+                android:layout_height="@dimen/divider_43px"
+                android:layout_marginStart="@dimen/divider_60px"
+                android:layout_marginTop="@dimen/divider_36px"
+                android:background="@mipmap/bg_home" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_8px"
+                android:layout_marginTop="@dimen/divider_32px"
+                android:text="首页"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_38px"
+                android:textStyle="bold" />
+
+        </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="直播"
+            android:textColor="#FF4974FF"
+            android:textSize="@dimen/divider_34px"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvLiveBroadcast"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginLeft="@dimen/divider_60px"
+            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" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

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

@@ -356,4 +356,5 @@
     <dimen name="dimen_2dp">2dp</dimen>
     <dimen name="dimen_1dp">1dp</dimen>
     <dimen name="dimen_0.5dp">0.5dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
 </resources>

+ 1 - 1
workbenches/src/main/java/com/yingyang/workbenches/WorkbenchesActivity.kt

@@ -73,7 +73,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
             }
             //直播
             layoutLiveBroadcast.setOnSingleClickListener {
-                JumpUtil.jumpActivity(RouterUrlCommon.liveBroadcast)
+                JumpUtil.jumpActivity(RouterUrlCommon.liveBroadcastList)
                 finish()
             }
             //使用帮助