1.添加首页接口

.idea/misc.xml

@@ -5,12 +5,15 @@
       <map>
         <entry key="..\:/workspace/hcp-pad/app/src/main/res/layout/activity_push.xml" value="0.21014492753623187" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/drawable/bg_dialog_base.xml" value="0.2265" />
+        <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/drawable/bg_dialog_task.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/drawable/bg_dialog_tip_left.xml" value="0.2165" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/drawable/bg_dialog_tip_right.xml" value="0.2165" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/activity_base.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/dialog_tip.xml" value="0.264" />
+        <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/dialog_tips.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/fragment_base.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/fragment_dialog_base.xml" value="0.152" />
+        <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/fragment_task.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/calendarview/src/main/res/drawable-v21/cv_bg_material.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/calendarview/src/main/res/layout/cv_layout_calendar_view.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/calendarview/src/main/res/layout/cv_week_bar.xml" value="0.1" />

baselib/src/main/java/com/yingyangfly/baselib/dialog/TaskFragment.kt

@@ -0,0 +1,88 @@
+package com.yingyangfly.baselib.dialog
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.appcompat.widget.AppCompatButton
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.fragment.app.DialogFragment
+import com.bumptech.glide.Glide
+import com.gyf.immersionbar.BarHide
+import com.gyf.immersionbar.ktx.immersionBar
+import com.yingyangfly.baselib.R
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
+import com.yingyangfly.baselib.utils.ViewTool
+
+/**
+ * 任务提醒
+ */
+class TaskFragment : DialogFragment(), View.OnTouchListener {
+
+    private var taskDesn = ""
+    private var fishImage: ImageView? = null
+    private var tvContent: AppCompatTextView? = null
+    private var confirmBtan: AppCompatButton? = null
+
+    fun setTaskDesn(taskDesn: String) {
+        this.taskDesn = taskDesn
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        isCancelable = true
+        dialog?.setCanceledOnTouchOutside(true)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        dialog?.window?.setLayout(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        )
+        dialog?.window?.setBackgroundDrawableResource(R.color.transparent)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        immersionBar {
+            hideBar(BarHide.FLAG_HIDE_BAR)
+            navigationBarColor(R.color.transparent)
+        }
+        val rootView = ViewTool.inflateFragmentPixels(
+            activity, R.layout.fragment_task, container, 1194, 834
+        )
+        findId(rootView)
+        init()
+        return rootView
+    }
+
+    private fun findId(rootView: View) {
+        fishImage = rootView.findViewById(R.id.fishImage)
+        tvContent = rootView.findViewById(R.id.tvContent)
+        confirmBtan = rootView.findViewById(R.id.confirmBtan)
+        confirmBtan?.setOnSingleClickListener {
+            dismiss()
+        }
+    }
+
+    private fun init() {
+        Glide.with(this)
+            .load("file:///android_asset/home_doctor.gif")
+            .into(fishImage!!)
+        tvContent?.text = taskDesn
+    }
+
+    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
+        if (isCancelable && dialog?.isShowing == true) {
+            dismiss()
+            return true
+        }
+        return false
+    }
+}

baselib/src/main/java/com/yingyangfly/baselib/dialog/TipsDialog.kt

@@ -0,0 +1,177 @@
+package com.yingyangfly.baselib.dialog
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentManager
+import com.gyf.immersionbar.BarHide
+import com.gyf.immersionbar.ktx.immersionBar
+import com.yingyangfly.baselib.R
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
+import com.yingyangfly.baselib.ext.show
+import com.yingyangfly.baselib.utils.ViewTool
+import gorden.rxbus2.RxBus
+
+/**
+ * 提示框dialog
+ */
+class TipsDialog(val builder: TipDialogBuilder) : DialogFragment() {
+
+    private var tvTitle: TextView? = null
+    private var tvContent: TextView? = null
+    private var tvLeft: TextView? = null
+    private var tvRight: TextView? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        RxBus.get().register(this)
+        isCancelable = false
+        dialog?.setCanceledOnTouchOutside(true)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        dialog?.window?.setLayout(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        )
+        dialog?.window?.setBackgroundDrawableResource(R.color.transparent)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        immersionBar {
+            hideBar(BarHide.FLAG_HIDE_BAR)
+            navigationBarColor(R.color.transparent)
+        }
+        val rootView = ViewTool.inflateFragmentPixels(
+            activity, R.layout.dialog_tips, container, 1194, 834
+        )
+        findId(rootView)
+        init()
+        return rootView
+    }
+
+    private fun findId(rootView: View) {
+        tvTitle = rootView.findViewById(R.id.tvTitle)
+        tvContent = rootView.findViewById(R.id.tvContent)
+        tvLeft = rootView.findViewById(R.id.tvLeft)
+        tvRight = rootView.findViewById(R.id.tvRight)
+        if (builder.title.isNullOrEmpty()) {
+            tvTitle?.show(false)
+        } else {
+            tvTitle?.show(true)
+            tvTitle?.text = builder.title
+        }
+        if (builder.titleRes != 0) {
+            tvTitle?.show(true)
+            tvTitle?.setText(builder.titleRes)
+        }
+        if (builder.content.isNullOrEmpty()) {
+            tvContent?.show(false)
+        } else {
+            tvContent?.show(true)
+            tvContent?.text = builder.content
+        }
+        if (builder.contentRes != 0) {
+            tvContent?.show(true)
+            tvContent?.setText(builder.contentRes)
+        }
+        if (builder.leftBtnText.isNullOrEmpty().not()) {
+            tvLeft?.text = builder.leftBtnText
+        }
+        if (builder.rightBtnText.isNullOrEmpty().not()) {
+            tvRight?.text = builder.rightBtnText
+        }
+        tvLeft?.setOnSingleClickListener {
+            builder.leftClickListener.invoke()
+        }
+        tvRight?.setOnSingleClickListener {
+            builder.rightClickListener.invoke()
+        }
+
+    }
+
+    private fun init() {
+
+    }
+
+
+    class TipDialogBuilder {
+
+        var title = ""
+        var titleRes = 0
+        var content = ""
+        var contentRes = 0
+        var leftBtnText = ""
+        var rightBtnText = ""
+        var leftClickListener: () -> Unit = {}
+        var rightClickListener: () -> Unit = {}
+        var outCancel = true
+
+        fun title(title: String = "", titleRes: Int = 0): TipDialogBuilder {
+            this.title = title
+            this.titleRes = titleRes
+            return this
+        }
+
+        fun content(content: String = "", contentRes: Int = 0): TipDialogBuilder {
+            this.content = content
+            this.contentRes = contentRes
+            return this
+        }
+
+        /**
+         * 黑色文字
+         */
+        fun leftBtnText(text: String): TipDialogBuilder {
+            leftBtnText = text
+            return this
+        }
+
+        /**
+         * 蓝色文字
+         */
+        fun rightBtnText(text: String): TipDialogBuilder {
+            rightBtnText = text
+            return this
+        }
+
+        fun rightClick(c: () -> Unit = {}, dimiss: Boolean = false): TipDialogBuilder {
+            rightClickListener = {
+                c.invoke()
+                if (dimiss) {
+                    tipsDialog?.dismiss()
+                }
+            }
+            return this
+        }
+
+        fun leftClick(c: () -> Unit = {}, dimiss: Boolean = false): TipDialogBuilder {
+            leftClickListener = {
+                c.invoke()
+                if (dimiss) {
+                    tipsDialog?.dismiss()
+                }
+            }
+            return this
+        }
+
+        var tipsDialog: TipsDialog? = null
+
+        fun build(): TipsDialog? {
+            tipsDialog = TipsDialog(this)
+            return tipsDialog
+        }
+
+        fun show(fragmentManager: FragmentManager) {
+            build()?.show(fragmentManager, title)
+        }
+    }
+}

baselib/src/main/res/drawable/bg_dialog_task.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF054DFF" />
+    <corners android:radius="@dimen/divider_13px" />
+    <solid android:color="@color/color_FF054DFF" />
+</shape>

baselib/src/main/res/layout/dialog_tips.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:ignore="ResourceName">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="@dimen/divider_264px"
+        android:layout_marginTop="@dimen/divider_203px"
+        android:layout_marginEnd="@dimen/divider_264px"
+        android:layout_marginBottom="@dimen/divider_203px"
+        android:background="@drawable/bg_dialog_base"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/tvTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/divider_71px"
+            android:textColor="@color/color_FFF6A532"
+            android:textSize="@dimen/divider_42px"
+            android:textStyle="bold"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="恭喜您" />
+
+        <TextView
+            android:id="@+id/tvContent"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/divider_65px"
+            android:layout_marginTop="@dimen/divider_29px"
+            android:layout_marginEnd="@dimen/divider_32px"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/divider_28px"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle"
+            tools:text="通知" />
+
+        <TextView
+            android:id="@+id/tvLeft"
+            android:layout_width="@dimen/divider_204px"
+            android:layout_height="@dimen/divider_59px"
+            android:layout_marginStart="@dimen/divider_92px"
+            android:layout_marginTop="@dimen/divider_72px"
+            android:background="@drawable/bg_dialog_tip_left"
+            android:gravity="center"
+            android:textColor="@color/color_FF4D7EFF"
+            android:textSize="@dimen/divider_24px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvContent"
+            tools:text="稍后再看" />
+
+        <TextView
+            android:id="@+id/tvRight"
+            android:layout_width="@dimen/divider_204px"
+            android:layout_height="@dimen/divider_59px"
+            android:layout_marginTop="@dimen/divider_72px"
+            android:layout_marginEnd="@dimen/divider_100px"
+            android:background="@drawable/bg_dialog_tip_right"
+            android:gravity="center"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_24px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvContent"
+            tools:text="立即查看" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

baselib/src/main/res/layout/fragment_task.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/transparent"
+    tools:ignore="ResourceName">
+
+    <ImageView
+        android:id="@+id/fishImage"
+        android:layout_width="@dimen/divider_176px"
+        android:layout_height="@dimen/divider_289px"
+        android:layout_marginStart="@dimen/divider_67px"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent" />
+
+    <LinearLayout
+        android:layout_width="@dimen/divider_689px"
+        android:layout_height="@dimen/divider_377px"
+        android:background="@mipmap/icon_dialog_box"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvContent"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginStart="@dimen/divider_47px"
+            android:layout_marginTop="@dimen/divider_53px"
+            android:layout_marginEnd="@dimen/divider_47px"
+            android:layout_weight="1"
+            android:textSize="@dimen/divider_28px" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/confirmBtan"
+            android:layout_width="@dimen/divider_204px"
+            android:layout_height="@dimen/divider_64px"
+            android:layout_marginTop="@dimen/divider_25px"
+            android:layout_marginBottom="@dimen/divider_27px"
+            android:background="@drawable/bg_dialog_task"
+            android:gravity="center"
+            android:text="@string/good"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_32px"
+            android:textStyle="bold" />
+
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

baselib/src/main/res/values/dimens.xml

@@ -1,137 +1,159 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <dimen name="divider_975px" tools:ignore="PxUsage">975px</dimen>
-    <dimen name="divider_875px" tools:ignore="PxUsage">875px</dimen>
-    <dimen name="divider_775px" tools:ignore="PxUsage">775px</dimen>
-    <dimen name="divider_675px" tools:ignore="PxUsage">675px</dimen>
-    <dimen name="divider_667px" tools:ignore="PxUsage">667px</dimen>
-    <dimen name="divider_597px" tools:ignore="PxUsage">597px</dimen>
-    <dimen name="divider_575px" tools:ignore="PxUsage">575px</dimen>
-    <dimen name="divider_475px" tools:ignore="PxUsage">475px</dimen>
-    <dimen name="divider_450px" tools:ignore="PxUsage">450px</dimen>
-    <dimen name="divider_427px" tools:ignore="PxUsage">427px</dimen>
-    <dimen name="divider_409px" tools:ignore="PxUsage">409px</dimen>
-    <dimen name="divider_400px" tools:ignore="PxUsage">400px</dimen>
-    <dimen name="divider_357px" tools:ignore="PxUsage">357px</dimen>
-    <dimen name="divider_350px" tools:ignore="PxUsage">350px</dimen>
-    <dimen name="divider_301px" tools:ignore="PxUsage">301px</dimen>
-    <dimen name="divider_300px" tools:ignore="PxUsage">300px</dimen>
-    <dimen name="divider_290px" tools:ignore="PxUsage">290px</dimen>
-    <dimen name="divider_280px" tools:ignore="PxUsage">280px</dimen>
-    <dimen name="divider_260px" tools:ignore="PxUsage">260px</dimen>
-    <dimen name="divider_240px" tools:ignore="PxUsage">240px</dimen>
-    <dimen name="divider_237px" tools:ignore="PxUsage">237px</dimen>
-    <dimen name="divider_215px" tools:ignore="PxUsage">215px</dimen>
-    <dimen name="divider_211px" tools:ignore="PxUsage">211px</dimen>
-    <dimen name="divider_204px" tools:ignore="PxUsage">204px</dimen>
-    <dimen name="divider_200px" tools:ignore="PxUsage">200px</dimen>
-    <dimen name="divider_179px" tools:ignore="PxUsage">179px</dimen>
-    <dimen name="divider_201px" tools:ignore="PxUsage">201px</dimen>
-    <dimen name="divider_120px" tools:ignore="PxUsage">120px</dimen>
-    <dimen name="divider_119px" tools:ignore="MissingDefaultResource,PxUsage">119px</dimen>
-    <dimen name="divider_118px" tools:ignore="MissingDefaultResource,PxUsage">118px</dimen>
-    <dimen name="divider_117px" tools:ignore="MissingDefaultResource,PxUsage">117px</dimen>
-    <dimen name="divider_116px" tools:ignore="MissingDefaultResource,PxUsage">116px</dimen>
-    <dimen name="divider_115px" tools:ignore="MissingDefaultResource,PxUsage">115px</dimen>
-    <dimen name="divider_114px" tools:ignore="MissingDefaultResource,PxUsage">114px</dimen>
-    <dimen name="divider_113px" tools:ignore="MissingDefaultResource,PxUsage">113px</dimen>
-    <dimen name="divider_112px" tools:ignore="MissingDefaultResource,PxUsage">112px</dimen>
-    <dimen name="divider_111px" tools:ignore="MissingDefaultResource,PxUsage">111px</dimen>
-    <dimen name="divider_110px" tools:ignore="MissingDefaultResource,PxUsage">110px</dimen>
-    <dimen name="divider_109px" tools:ignore="MissingDefaultResource,PxUsage">109px</dimen>
-    <dimen name="divider_108px" tools:ignore="PxUsage">108px</dimen>
-    <dimen name="divider_107px" tools:ignore="MissingDefaultResource,PxUsage">107px</dimen>
-    <dimen name="divider_106px" tools:ignore="MissingDefaultResource,PxUsage">106px</dimen>
-    <dimen name="divider_105px" tools:ignore="MissingDefaultResource,PxUsage">105px</dimen>
-    <dimen name="divider_104px" tools:ignore="MissingDefaultResource,PxUsage">104px</dimen>
-    <dimen name="divider_103px" tools:ignore="MissingDefaultResource,PxUsage">103px</dimen>
-    <dimen name="divider_102px" tools:ignore="MissingDefaultResource,PxUsage">102px</dimen>
-    <dimen name="divider_101px" tools:ignore="MissingDefaultResource,PxUsage">101px</dimen>
-    <dimen name="divider_100px" tools:ignore="MissingDefaultResource,PxUsage">100px</dimen>
-    <dimen name="divider_96px" tools:ignore="MissingDefaultResource,PxUsage">96px</dimen>
-    <dimen name="divider_92px" tools:ignore="MissingDefaultResource,PxUsage">92px</dimen>
-    <dimen name="divider_90px" tools:ignore="MissingDefaultResource,PxUsage">90px</dimen>
-    <dimen name="divider_80px" tools:ignore="MissingDefaultResource,PxUsage">80px</dimen>
-    <dimen name="divider_79px" tools:ignore="MissingDefaultResource,PxUsage">79px</dimen>
-    <dimen name="divider_78px" tools:ignore="MissingDefaultResource,PxUsage">78px</dimen>
-    <dimen name="divider_77px" tools:ignore="MissingDefaultResource,PxUsage">77px</dimen>
-    <dimen name="divider_76px" tools:ignore="MissingDefaultResource,PxUsage">76px</dimen>
-    <dimen name="divider_75px" tools:ignore="PxUsage">75px</dimen>
-    <dimen name="divider_74px" tools:ignore="PxUsage">74px</dimen>
-    <dimen name="divider_73px" tools:ignore="PxUsage">73px</dimen>
-    <dimen name="divider_72px" tools:ignore="PxUsage">72px</dimen>
-    <dimen name="divider_71px" tools:ignore="PxUsage">71px</dimen>
-    <dimen name="divider_70px" tools:ignore="PxUsage">70px</dimen>
-    <dimen name="divider_69px" tools:ignore="PxUsage">69px</dimen>
-    <dimen name="divider_68px" tools:ignore="PxUsage">68px</dimen>
-    <dimen name="divider_67px" tools:ignore="PxUsage">67px</dimen>
-    <dimen name="divider_66px" tools:ignore="PxUsage">66px</dimen>
-    <dimen name="divider_65px" tools:ignore="PxUsage">65px</dimen>
-    <dimen name="divider_64px" tools:ignore="PxUsage">64px</dimen>
-    <dimen name="divider_63px" tools:ignore="PxUsage">63px</dimen>
-    <dimen name="divider_62px" tools:ignore="PxUsage">62px</dimen>
-    <dimen name="divider_61px" tools:ignore="PxUsage">61px</dimen>
-    <dimen name="divider_60px" tools:ignore="PxUsage">60px</dimen>
-    <dimen name="divider_59px" tools:ignore="PxUsage">59px</dimen>
-    <dimen name="divider_58px" tools:ignore="PxUsage">58px</dimen>
-    <dimen name="divider_57px" tools:ignore="PxUsage">57px</dimen>
-    <dimen name="divider_56px" tools:ignore="PxUsage">56px</dimen>
-    <dimen name="divider_55px" tools:ignore="PxUsage">55px</dimen>
-    <dimen name="divider_54px" tools:ignore="PxUsage">54px</dimen>
-    <dimen name="divider_53px" tools:ignore="PxUsage">53px</dimen>
-    <dimen name="divider_52px" tools:ignore="PxUsage">52px</dimen>
-    <dimen name="divider_51px" tools:ignore="PxUsage">51px</dimen>
-    <dimen name="divider_50px" tools:ignore="PxUsage">50px</dimen>
-    <dimen name="divider_49px" tools:ignore="PxUsage">49px</dimen>
-    <dimen name="divider_48px" tools:ignore="PxUsage">48px</dimen>
-    <dimen name="divider_47px" tools:ignore="PxUsage">47px</dimen>
-    <dimen name="divider_46px" tools:ignore="PxUsage">46px</dimen>
-    <dimen name="divider_45px" tools:ignore="PxUsage">45px</dimen>
-    <dimen name="divider_44px" tools:ignore="PxUsage">44px</dimen>
-    <dimen name="divider_43px" tools:ignore="PxUsage">43px</dimen>
-    <dimen name="divider_42px" tools:ignore="PxUsage">42px</dimen>
-    <dimen name="divider_41px" tools:ignore="PxUsage">41px</dimen>
-    <dimen name="divider_40px" tools:ignore="PxUsage">40px</dimen>
-    <dimen name="divider_39px" tools:ignore="PxUsage">39px</dimen>
-    <dimen name="divider_38px" tools:ignore="PxUsage">38px</dimen>
-    <dimen name="divider_37px" tools:ignore="PxUsage">37px</dimen>
-    <dimen name="divider_36px" tools:ignore="PxUsage">36px</dimen>
-    <dimen name="divider_35px" tools:ignore="PxUsage">35px</dimen>
-    <dimen name="divider_34px" tools:ignore="PxUsage">34px</dimen>
-    <dimen name="divider_33px" tools:ignore="PxUsage">33px</dimen>
-    <dimen name="divider_32px" tools:ignore="PxUsage">32px</dimen>
-    <dimen name="divider_31px" tools:ignore="PxUsage">31px</dimen>
-    <dimen name="divider_30px" tools:ignore="PxUsage">30px</dimen>
-    <dimen name="divider_29px" tools:ignore="PxUsage">29px</dimen>
-    <dimen name="divider_28px" tools:ignore="PxUsage">28px</dimen>
-    <dimen name="divider_27px" tools:ignore="PxUsage">27px</dimen>
-    <dimen name="divider_26px" tools:ignore="PxUsage">26px</dimen>
-    <dimen name="divider_25px" tools:ignore="PxUsage">25px</dimen>
-    <dimen name="divider_24px" tools:ignore="PxUsage">24px</dimen>
-    <dimen name="divider_23px" tools:ignore="PxUsage">23px</dimen>
-    <dimen name="divider_22px" tools:ignore="PxUsage">22px</dimen>
-    <dimen name="divider_21px" tools:ignore="PxUsage">21px</dimen>
-    <dimen name="divider_20px" tools:ignore="PxUsage">20px</dimen>
-    <dimen name="divider_19px" tools:ignore="PxUsage">19px</dimen>
-    <dimen name="divider_18px" tools:ignore="PxUsage">18px</dimen>
-    <dimen name="divider_17px" tools:ignore="PxUsage">17px</dimen>
-    <dimen name="divider_16px" tools:ignore="PxUsage">16px</dimen>
-    <dimen name="divider_15px" tools:ignore="PxUsage">15px</dimen>
-    <dimen name="divider_14px" tools:ignore="PxUsage">14px</dimen>
-    <dimen name="divider_13px" tools:ignore="PxUsage">13px</dimen>
-    <dimen name="divider_12px" tools:ignore="PxUsage">12px</dimen>
-    <dimen name="divider_11px" tools:ignore="PxUsage">11px</dimen>
-    <dimen name="divider_10px" tools:ignore="PxUsage">10px</dimen>
-    <dimen name="divider_9px" tools:ignore="PxUsage">9px</dimen>
-    <dimen name="divider_8px" tools:ignore="PxUsage">8px</dimen>
-    <dimen name="divider_7px" tools:ignore="PxUsage">7px</dimen>
-    <dimen name="divider_6px" tools:ignore="PxUsage">6px</dimen>
-    <dimen name="divider_5px" tools:ignore="PxUsage">5px</dimen>
-    <dimen name="divider_4px" tools:ignore="PxUsage">4px</dimen>
-    <dimen name="divider_3px" tools:ignore="PxUsage">3px</dimen>
-    <dimen name="divider_2px" tools:ignore="PxUsage">2px</dimen>
-    <dimen name="divider_1px" tools:ignore="PxUsage">1px</dimen>
+    <dimen name="divider_1194px" tools:ignore="ResourceName">1194px</dimen>
+    <dimen name="divider_834px" tools:ignore="ResourceName">834px</dimen>
+    <dimen name="divider_689px" tools:ignore="ResourceName">689px</dimen>
+    <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>
+    <dimen name="divider_440px" tools:ignore="ResourceName">440px</dimen>
+    <dimen name="divider_432px" tools:ignore="ResourceName">432px</dimen>
+    <dimen name="divider_430px" tools:ignore="ResourceName">430px</dimen>
+    <dimen name="divider_418px" tools:ignore="ResourceName">418px</dimen>
+    <dimen name="divider_416px" tools:ignore="ResourceName">416px</dimen>
+    <dimen name="divider_415px" tools:ignore="ResourceName">415px</dimen>
+    <dimen name="divider_413px" tools:ignore="ResourceName">413px</dimen>
+    <dimen name="divider_409px" tools:ignore="ResourceName">409px</dimen>
+    <dimen name="divider_377px" tools:ignore="ResourceName">377px</dimen>
+    <dimen name="divider_360px" tools:ignore="ResourceName">360px</dimen>
+    <dimen name="divider_354px" tools:ignore="ResourceName">354px</dimen>
+    <dimen name="divider_348px" tools:ignore="ResourceName">348px</dimen>
+    <dimen name="divider_345px" tools:ignore="ResourceName">345px</dimen>
+    <dimen name="divider_340px" tools:ignore="ResourceName">340px</dimen>
+    <dimen name="divider_339px" tools:ignore="ResourceName">339px</dimen>
+    <dimen name="divider_335px" tools:ignore="ResourceName">335px</dimen>
+    <dimen name="divider_333px" tools:ignore="ResourceName">333px</dimen>
+    <dimen name="divider_331px" tools:ignore="ResourceName">331px</dimen>
+    <dimen name="divider_330px" tools:ignore="ResourceName">330px</dimen>
+    <dimen name="divider_329px" tools:ignore="ResourceName">329px</dimen>
+    <dimen name="divider_327px" tools:ignore="ResourceName">327px</dimen>
+    <dimen name="divider_320px" tools:ignore="ResourceName">320px</dimen>
+    <dimen name="divider_313px" tools:ignore="ResourceName">313px</dimen>
+    <dimen name="divider_289px" tools:ignore="ResourceName">289px</dimen>
+    <dimen name="divider_270px" tools:ignore="ResourceName">270px</dimen>
+    <dimen name="divider_264px" tools:ignore="ResourceName">264px</dimen>
+    <dimen name="divider_260px" tools:ignore="ResourceName">260px</dimen>
+    <dimen name="divider_250px" tools:ignore="ResourceName">250px</dimen>
+    <dimen name="divider_249px" tools:ignore="ResourceName">249px</dimen>
+    <dimen name="divider_237px" tools:ignore="ResourceName">237px</dimen>
+    <dimen name="divider_230px" tools:ignore="ResourceName">230px</dimen>
+    <dimen name="divider_229px" tools:ignore="ResourceName">229px</dimen>
+    <dimen name="divider_214px" tools:ignore="ResourceName">214px</dimen>
+    <dimen name="divider_213px" tools:ignore="ResourceName">213px</dimen>
+    <dimen name="divider_204px" tools:ignore="ResourceName">204px</dimen>
+    <dimen name="divider_203px" tools:ignore="ResourceName">203px</dimen>
+    <dimen name="divider_195px" tools:ignore="ResourceName">195px</dimen>
+    <dimen name="divider_190px" tools:ignore="ResourceName">190px</dimen>
+    <dimen name="divider_184px" tools:ignore="ResourceName">184px</dimen>
+    <dimen name="divider_180px" tools:ignore="ResourceName">180px</dimen>
+    <dimen name="divider_176px" tools:ignore="ResourceName">176px</dimen>
+    <dimen name="divider_140px" tools:ignore="ResourceName">140px</dimen>
+    <dimen name="divider_133px" tools:ignore="ResourceName">133px</dimen>
+    <dimen name="divider_130px" tools:ignore="ResourceName">130px</dimen>
+    <dimen name="divider_128px" tools:ignore="ResourceName">128px</dimen>
+    <dimen name="divider_120px" tools:ignore="ResourceName">120px</dimen>
+    <dimen name="divider_119px" tools:ignore="ResourceName">119px</dimen>
+    <dimen name="divider_118px" tools:ignore="ResourceName">118px</dimen>
+    <dimen name="divider_117px" tools:ignore="ResourceName">117px</dimen>
+    <dimen name="divider_116px" tools:ignore="ResourceName">116px</dimen>
+    <dimen name="divider_115px" tools:ignore="ResourceName">115px</dimen>
+    <dimen name="divider_114px" tools:ignore="ResourceName">114px</dimen>
+    <dimen name="divider_113px" tools:ignore="ResourceName">113px</dimen>
+    <dimen name="divider_112px" tools:ignore="ResourceName">112px</dimen>
+    <dimen name="divider_111px" tools:ignore="ResourceName">111px</dimen>
+    <dimen name="divider_110px" tools:ignore="ResourceName">110px</dimen>
+    <dimen name="divider_109px" tools:ignore="ResourceName">109px</dimen>
+    <dimen name="divider_108px" tools:ignore="ResourceName">108px</dimen>
+    <dimen name="divider_107px" tools:ignore="ResourceName">107px</dimen>
+    <dimen name="divider_106px" tools:ignore="ResourceName">106px</dimen>
+    <dimen name="divider_105px" tools:ignore="ResourceName">105px</dimen>
+    <dimen name="divider_104px" tools:ignore="ResourceName">104px</dimen>
+    <dimen name="divider_103px" tools:ignore="ResourceName">103px</dimen>
+    <dimen name="divider_102px" tools:ignore="ResourceName">102px</dimen>
+    <dimen name="divider_101px" tools:ignore="ResourceName">101px</dimen>
+    <dimen name="divider_100px" tools:ignore="ResourceName">100px</dimen>
+    <dimen name="divider_92px" tools:ignore="ResourceName">92px</dimen>
+    <dimen name="divider_88px" tools:ignore="ResourceName">88px</dimen>
+    <dimen name="divider_82px" tools:ignore="ResourceName">82px</dimen>
+    <dimen name="divider_80px" tools:ignore="ResourceName">80px</dimen>
+    <dimen name="divider_79px" tools:ignore="ResourceName">79px</dimen>
+    <dimen name="divider_78px" tools:ignore="ResourceName">78px</dimen>
+    <dimen name="divider_77px" tools:ignore="ResourceName">77px</dimen>
+    <dimen name="divider_76px" tools:ignore="ResourceName">76px</dimen>
+    <dimen name="divider_75px" tools:ignore="ResourceName">75px</dimen>
+    <dimen name="divider_74px" tools:ignore="ResourceName">74px</dimen>
+    <dimen name="divider_73px" tools:ignore="ResourceName">73px</dimen>
+    <dimen name="divider_72px" tools:ignore="ResourceName">72px</dimen>
+    <dimen name="divider_71px" tools:ignore="ResourceName">71px</dimen>
+    <dimen name="divider_70px" tools:ignore="ResourceName">70px</dimen>
+    <dimen name="divider_69px" tools:ignore="ResourceName">69px</dimen>
+    <dimen name="divider_68px" tools:ignore="ResourceName">68px</dimen>
+    <dimen name="divider_67px" tools:ignore="ResourceName">67px</dimen>
+    <dimen name="divider_66px" tools:ignore="ResourceName">66px</dimen>
+    <dimen name="divider_65px" tools:ignore="ResourceName">65px</dimen>
+    <dimen name="divider_64px" tools:ignore="ResourceName">64px</dimen>
+    <dimen name="divider_63px" tools:ignore="ResourceName">63px</dimen>
+    <dimen name="divider_62px" tools:ignore="ResourceName">62px</dimen>
+    <dimen name="divider_61px" tools:ignore="ResourceName">61px</dimen>
+    <dimen name="divider_60px" tools:ignore="ResourceName">60px</dimen>
+    <dimen name="divider_59px" tools:ignore="ResourceName">59px</dimen>
+    <dimen name="divider_58px" tools:ignore="ResourceName">58px</dimen>
+    <dimen name="divider_57px" tools:ignore="ResourceName">57px</dimen>
+    <dimen name="divider_56px" tools:ignore="ResourceName">56px</dimen>
+    <dimen name="divider_55px" tools:ignore="ResourceName">55px</dimen>
+    <dimen name="divider_54px" tools:ignore="ResourceName">54px</dimen>
+    <dimen name="divider_53px" tools:ignore="ResourceName">53px</dimen>
+    <dimen name="divider_52px" tools:ignore="ResourceName">52px</dimen>
+    <dimen name="divider_51px" tools:ignore="ResourceName">51px</dimen>
+    <dimen name="divider_50px" tools:ignore="ResourceName">50px</dimen>
+    <dimen name="divider_49px" tools:ignore="ResourceName">49px</dimen>
+    <dimen name="divider_48px" tools:ignore="ResourceName">48px</dimen>
+    <dimen name="divider_47px" tools:ignore="ResourceName">47px</dimen>
+    <dimen name="divider_46px" tools:ignore="ResourceName">46px</dimen>
+    <dimen name="divider_45px" tools:ignore="ResourceName">45px</dimen>
+    <dimen name="divider_44px" tools:ignore="ResourceName">44px</dimen>
+    <dimen name="divider_43px" tools:ignore="ResourceName">43px</dimen>
+    <dimen name="divider_42px" tools:ignore="ResourceName">42px</dimen>
+    <dimen name="divider_41px" tools:ignore="ResourceName">41px</dimen>
+    <dimen name="divider_40px" tools:ignore="ResourceName">40px</dimen>
+    <dimen name="divider_39px" tools:ignore="ResourceName">39px</dimen>
+    <dimen name="divider_38px" tools:ignore="ResourceName">38px</dimen>
+    <dimen name="divider_37px" tools:ignore="ResourceName">37px</dimen>
+    <dimen name="divider_36px" tools:ignore="ResourceName">36px</dimen>
+    <dimen name="divider_35px" tools:ignore="ResourceName">35px</dimen>
+    <dimen name="divider_34px" tools:ignore="ResourceName">34px</dimen>
+    <dimen name="divider_33px" tools:ignore="ResourceName">33px</dimen>
+    <dimen name="divider_32px" tools:ignore="ResourceName">32px</dimen>
+    <dimen name="divider_31px" tools:ignore="ResourceName">31px</dimen>
+    <dimen name="divider_30px" tools:ignore="ResourceName">30px</dimen>
+    <dimen name="divider_29px" tools:ignore="ResourceName">29px</dimen>
+    <dimen name="divider_28px" tools:ignore="ResourceName">28px</dimen>
+    <dimen name="divider_27px" tools:ignore="ResourceName">27px</dimen>
+    <dimen name="divider_26px" tools:ignore="ResourceName">26px</dimen>
+    <dimen name="divider_25px" tools:ignore="ResourceName">25px</dimen>
+    <dimen name="divider_24px" tools:ignore="ResourceName">24px</dimen>
+    <dimen name="divider_23px" tools:ignore="ResourceName">23px</dimen>
+    <dimen name="divider_22px" tools:ignore="ResourceName">22px</dimen>
+    <dimen name="divider_21px" tools:ignore="ResourceName">21px</dimen>
+    <dimen name="divider_20px" tools:ignore="ResourceName">20px</dimen>
+    <dimen name="divider_19px" tools:ignore="ResourceName">19px</dimen>
+    <dimen name="divider_18px" tools:ignore="ResourceName">18px</dimen>
+    <dimen name="divider_17px" tools:ignore="ResourceName">17px</dimen>
+    <dimen name="divider_16px" tools:ignore="ResourceName">16px</dimen>
+    <dimen name="divider_15px" tools:ignore="ResourceName">15px</dimen>
+    <dimen name="divider_14px" tools:ignore="ResourceName">14px</dimen>
+    <dimen name="divider_13px" tools:ignore="ResourceName">13px</dimen>
+    <dimen name="divider_12px" tools:ignore="ResourceName">12px</dimen>
+    <dimen name="divider_11px" tools:ignore="ResourceName">11px</dimen>
+    <dimen name="divider_10px" tools:ignore="ResourceName">10px</dimen>
+    <dimen name="divider_9px" tools:ignore="ResourceName">9px</dimen>
+    <dimen name="divider_8px" tools:ignore="ResourceName">8px</dimen>
+    <dimen name="divider_7px" tools:ignore="ResourceName">7px</dimen>
+    <dimen name="divider_6px" tools:ignore="ResourceName">6px</dimen>
+    <dimen name="divider_5px" tools:ignore="ResourceName">5px</dimen>
+    <dimen name="divider_4px" tools:ignore="ResourceName">4px</dimen>
+    <dimen name="divider_3px" tools:ignore="ResourceName">3px</dimen>
+    <dimen name="divider_2px" tools:ignore="ResourceName">2px</dimen>
+    <dimen name="divider_1px" tools:ignore="ResourceName">1px</dimen>
 
     <!--	 分割线     -->
     <dimen name="divider_height">2px</dimen>

baselib/src/main/res/values/strings.xml

@@ -1,3 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">baselib</string>
+    <string name="good" tools:ignore="ResourceName">好的</string>
 </resources>

home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -1,15 +1,20 @@
 package com.yingyangfly.home.activity
 
 import android.annotation.SuppressLint
+import android.text.TextUtils
 import androidx.recyclerview.widget.GridLayoutManager
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.yingyang.home.databinding.ActivityHomeBinding
+import com.yingyangfly.baselib.dialog.TaskFragment
+import com.yingyangfly.baselib.dialog.TipsDialog
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.JumpUtil
+import com.yingyangfly.baselib.utils.User
+import com.yingyangfly.baselib.voice.PlayVoice
 import com.yingyangfly.home.adapter.GameAdapter
 import com.yingyangfly.home.entity.Record
 
@@ -31,7 +36,11 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
     private var gameList = mutableListOf<Record>()
     private val gameAdapter by lazy { GameAdapter() }
 
+    private var playVoice: PlayVoice? = null
+
     override fun initViews() {
+        playVoice = PlayVoice()
+        playVoice?.setContext(this)
         binding {
             rvGame.layoutManager = GridLayoutManager(this@HomeActivity, 2)
             rvGame.adapter = gameAdapter
@@ -133,6 +142,35 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
         }, success = {
             if (it.isNullOrEmpty().not()) {
                 showLayout(false)
+                it[0].let {
+                    binding.task = it
+                    if (it.details.isNullOrEmpty().not()) {
+                        val index = it.currentTaskNum - 1
+                        currentTaskRecord = it.details[index]
+                        taskList.addAll(it.details)
+                    }
+                    if (it.currentTaskNum == it.totalTaskNum) {
+                        if (TextUtils.equals("0", it.status)) {
+                            //任务完成
+                            if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
+                                    .not()
+                            ) {
+                                User.saveTaskDialogStatus(User.getNowDay())
+                                showTipDialog()
+                            } else {
+                                showLayout(false)
+                            }
+                        }
+                    } else {
+                        if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus()).not()) {
+                            User.saveTaskDialogStatus(User.getNowDay())
+                            playVoice?.speak(it.taskDesn)
+                            showTaskDialog(it.taskDesn)
+                        }
+                    }
+                }
+
+
             } else {
                 showLayout(true)
                 getGameList()
@@ -140,6 +178,29 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
         })
     }
 
+    /**
+     * 训练完成弹窗页面
+     */
+    private fun showTipDialog() {
+        TipsDialog.TipDialogBuilder().title("恭喜您")
+            .content("恭喜您 您完成了今天的专属训练！今天的训练报告已生成，快去查看吧！")
+            .leftBtnText("稍后再看")
+            .rightBtnText("立即查看")
+            .leftClick({
+                showLayout(true)
+            }, dimiss = true)
+            .rightClick({
+                JumpUtil.jumpActivity(RouterUrlCommon.trainData)
+            }, dimiss = true)
+            .show(supportFragmentManager)
+    }
+
+    private fun showTaskDialog(taskDesn: String) {
+        val taskFragment = TaskFragment()
+        taskFragment.setTaskDesn(taskDesn)
+        taskFragment.show(supportFragmentManager, "taskFragment")
+    }
+
     /**
      * 加载游戏数据
      */
@@ -167,4 +228,10 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
         }
     }
 
+    override fun onDestroy() {
+        if (playVoice != null) {
+            playVoice?.stop()
+        }
+        super.onDestroy()
+    }
 }

home/src/main/res/layout/activity_home.xml

@@ -11,6 +11,10 @@
         <variable
             name="data"
             type="com.yingyangfly.home.entity.CountTrainBean" />
+
+        <variable
+            name="task"
+            type="com.yingyangfly.home.entity.MyTaskBean" />
     </data>
 
     <FrameLayout
@@ -254,7 +258,9 @@
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintLeft_toLeftOf="parent"
                             app:layout_constraintRight_toRightOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:loadImg="@{task.getGameImage()}"
+                            app:roundRadius="@{8}" />
 
                         <androidx.appcompat.widget.AppCompatButton
                             android:layout_width="@dimen/divider_264px"
@@ -262,7 +268,7 @@
                             android:layout_gravity="center_horizontal|bottom"
                             android:layout_marginBottom="@dimen/divider_39px"
                             android:background="@drawable/bg_home_task_progress"
-                            android:text="当前游戏7/8"
+                            android:text='@{"当前游戏"+task.currentTaskNum+"/"+task.totalTaskNum}'
                             android:textColor="@android:color/white"
                             android:textSize="@dimen/divider_28px"
                             android:textStyle="bold"

livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/detail/LiveBroadcastActivity.kt

@@ -38,7 +38,7 @@ class LiveBroadcastActivity :
         //初始化直播
         initPlayer()
         //初始化IM
-        initIm()
+//        initIm()
     }
 
     override fun initListener() {
@@ -108,8 +108,10 @@ class LiveBroadcastActivity :
                 )
             }
         })
-
-        val result = mLivePlayer?.startLivePlay(url)
+        Log.e("wpp", "--------------------->" + url)
+        val s = url.split("?")
+        Log.e("wpp", "--------------------->" + url)
+        val result = mLivePlayer?.startLivePlay(s.get(0))
         if (result == 0) {
             mPlayFlag = true
         }
@@ -187,21 +189,21 @@ class LiveBroadcastActivity :
     }
 
     override fun onDestroy() {
-        runOnUiThread {
-            V2TIMManager.getInstance().logout(object : V2TIMCallback {
-                override fun onError(p0: Int, p1: String?) {
-                    //用户登录IM失败
-                    CrashReport.postCatchedException(Throwable(User.getName() + "用户退出IM失败,错误码:" + p0 + " ,错误信息:" + p1))
-                }
-
-                override fun onSuccess() {
-                    Log.e("wpp", "IM退出成功")
-                }
-            })
-
-            // 反初始化 SDK
-            V2TIMManager.getInstance().unInitSDK()
-        }
+//        runOnUiThread {
+//            V2TIMManager.getInstance().logout(object : V2TIMCallback {
+//                override fun onError(p0: Int, p1: String?) {
+//                    //用户登录IM失败
+//                    CrashReport.postCatchedException(Throwable(User.getName() + "用户退出IM失败,错误码:" + p0 + " ,错误信息:" + p1))
+//                }
+//
+//                override fun onSuccess() {
+//                    Log.e("wpp", "IM退出成功")
+//                }
+//            })
+//
+//            // 反初始化 SDK
+//            V2TIMManager.getInstance().unInitSDK()
+//        }
 
         super.onDestroy()
         if (mLivePlayer != null) {

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

@@ -114,7 +114,7 @@ class LiveBroadcastListActivity :
     private fun initPermission(bean: StreamInfo) {
         val isHasPermission = EsayPermissions.isHasPermissions(this, permissions)
         if (isHasPermission) {
-            JumpUtil.jumpActivityWithUrl(RouterUrlCommon.liveBroadcast, bean.webrtc)
+            JumpUtil.jumpActivityWithUrl(RouterUrlCommon.liveBroadcast, bean.webrtcPull)
         } else {
             EsayPermissions.with(this).permission(permissions).request(object : OnPermission {
                 override fun noPermission(denied: MutableList<String>?, quick: Boolean) {
@@ -123,7 +123,7 @@ class LiveBroadcastListActivity :
 
                 override fun hasPermission(granted: MutableList<String>?, isAll: Boolean) {
                     if (isAll) {
-                        JumpUtil.jumpActivityWithUrl(RouterUrlCommon.liveBroadcast, bean.webrtc)
+                        JumpUtil.jumpActivityWithUrl(RouterUrlCommon.liveBroadcast, bean.webrtcPull)
                     } else {
                         showTipDialog()
                     }

livebroadcast/src/main/java/com/yingyang/livebroadcast/entity/LiveBroadcastListBean.kt

@@ -35,5 +35,7 @@ data class StreamInfo(
     val obsName: String,//OBS推流码
     val obsUrl: String,//OBS服务器
     val streamId: String,//流名称
+    val webrtcPush: String,
+    val webrtcPull: String,
     val webrtc: String//WebRTC推流地址
 )

login/src/main/java/com/yingyang/login/ui/login/LoginActivity.kt

@@ -71,6 +71,7 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>() {
                     User.saveUserId(it.id)
                 }
                 JumpUtil.jumpActivity(RouterUrlCommon.home)
+                finish()
             }
         })
     }

workbenches/src/main/res/values/dimens.xml

@@ -4,10 +4,13 @@
     <dimen name="divider_1194px" tools:ignore="ResourceName">1194px</dimen>
     <dimen name="divider_834px" tools:ignore="ResourceName">834px</dimen>
     <dimen name="divider_689px" tools:ignore="ResourceName">689px</dimen>
+    <dimen name="divider_667px" tools:ignore="ResourceName">667px</dimen>
+    <dimen name="divider_597px" tools:ignore="ResourceName">597px</dimen>
     <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>
     <dimen name="divider_440px" tools:ignore="ResourceName">440px</dimen>
     <dimen name="divider_432px" tools:ignore="ResourceName">432px</dimen>
     <dimen name="divider_430px" tools:ignore="ResourceName">430px</dimen>
+    <dimen name="divider_427px" tools:ignore="ResourceName">427px</dimen>
     <dimen name="divider_418px" tools:ignore="ResourceName">418px</dimen>
     <dimen name="divider_416px" tools:ignore="ResourceName">416px</dimen>
     <dimen name="divider_415px" tools:ignore="ResourceName">415px</dimen>
@@ -37,9 +40,11 @@
     <dimen name="divider_237px" tools:ignore="ResourceName">237px</dimen>
     <dimen name="divider_230px" tools:ignore="ResourceName">230px</dimen>
     <dimen name="divider_229px" tools:ignore="ResourceName">229px</dimen>
+    <dimen name="divider_215px" tools:ignore="ResourceName">215px</dimen>
     <dimen name="divider_214px" tools:ignore="ResourceName">214px</dimen>
     <dimen name="divider_213px" tools:ignore="ResourceName">213px</dimen>
     <dimen name="divider_203px" tools:ignore="ResourceName">203px</dimen>
+    <dimen name="divider_200px" tools:ignore="ResourceName">200px</dimen>
     <dimen name="divider_195px" tools:ignore="ResourceName">195px</dimen>
     <dimen name="divider_190px" tools:ignore="ResourceName">190px</dimen>
     <dimen name="divider_184px" tools:ignore="ResourceName">184px</dimen>
@@ -70,6 +75,7 @@
     <dimen name="divider_102px" tools:ignore="ResourceName">102px</dimen>
     <dimen name="divider_101px" tools:ignore="ResourceName">101px</dimen>
     <dimen name="divider_100px" tools:ignore="ResourceName">100px</dimen>
+    <dimen name="divider_90px" tools:ignore="ResourceName">90px</dimen>
     <dimen name="divider_88px" tools:ignore="ResourceName">88px</dimen>
     <dimen name="divider_82px" tools:ignore="ResourceName">82px</dimen>
     <dimen name="divider_80px" tools:ignore="ResourceName">80px</dimen>