Browse Source

1.添加腾讯IM sdk
2.修改通用dialog样式

王鹏鹏 2 years ago
parent
commit
94c1add77a

+ 3 - 1
.idea/misc.xml

@@ -5,8 +5,10 @@
       <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_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.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/fragment_dialog_base.xml" value="0.22826086956521738" />
         <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" />

+ 9 - 5
baselib/src/main/java/com/yingyangfly/baselib/dialog/BaseDialogFragment.kt

@@ -6,10 +6,11 @@ import android.view.*
 import androidx.annotation.DrawableRes
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.DialogFragment
+import com.yingyangfly.baselib.R
 import com.yingyangfly.baselib.databinding.FragmentDialogBaseBinding
 import com.yingyangfly.baselib.ext.getDbClass
-import com.yingyangfly.baselib.utils.ScreenUtil
 import com.yingyangfly.baselib.utils.ViewTool
+import kotlinx.android.synthetic.main.fragment_dialog_base.view.*
 
 /**
  * Author: YongChao
@@ -18,19 +19,22 @@ import com.yingyangfly.baselib.utils.ViewTool
  * dialogFragment 内存泄露 参考: https://blog.csdn.net/qq_37492806/article/details/105999003
  */
 abstract class BaseDialogFragment<DB : ViewDataBinding> : DialogFragment(), View.OnTouchListener {
+
     // 基类布局
     lateinit var baseView: FragmentDialogBaseBinding
+
     // 子布局
     val subViewBinding: DB by lazy {
         getDbClass(this)
     }
+
     override fun onStart() {
         super.onStart()
         val dm = DisplayMetrics()
         activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout(
-            (dm.widthPixels -  ScreenUtil.dp2px( 80f)),
-            ViewGroup.LayoutParams.WRAP_CONTENT
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
         )
     }
 
@@ -41,7 +45,6 @@ abstract class BaseDialogFragment<DB : ViewDataBinding> : DialogFragment(), View
         isCancelable = true
     }
 
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -49,7 +52,8 @@ abstract class BaseDialogFragment<DB : ViewDataBinding> : DialogFragment(), View
     ): View? {
         dialog?.window?.setBackgroundDrawableResource(android.R.color.transparent)
         baseView = FragmentDialogBaseBinding.inflate(inflater)
-        baseView.llytContentDialog.addView(ViewTool.inflateFragmentPixels(activity, subViewBinding.root,1194, 834))
+        ViewTool.inflateFragmentPixels(activity, baseView.root, 1194, 834)
+        baseView.llytContentDialog.addView(subViewBinding.root)
         initViews()
         initListener()
         return baseView.root

+ 17 - 29
baselib/src/main/java/com/yingyangfly/baselib/dialog/TipDialogFragment.kt

@@ -9,6 +9,7 @@ import android.widget.RelativeLayout
 import androidx.fragment.app.FragmentManager
 import com.yingyangfly.baselib.base.BaseActivity
 import com.yingyangfly.baselib.databinding.DialogTipBinding
+import com.yingyangfly.baselib.ext.show
 
 /**
  * @author gold
@@ -26,7 +27,7 @@ class TipDialogFragment(val builder: TipDialogBuilder) : BaseDialogFragment<Dial
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         if (builder.title.isNullOrEmpty() && builder.titleRes == 0) {
-            subViewBinding.tvTipDialogTitle.visibility = View.GONE
+            subViewBinding.tvTipDialogTitle.show(false)
         } else {
             if (builder.title.isNullOrEmpty().not()) {
                 subViewBinding.tvTipDialogTitle.text = builder.title
@@ -37,25 +38,18 @@ class TipDialogFragment(val builder: TipDialogBuilder) : BaseDialogFragment<Dial
         }
 
         if (builder.content.isNullOrEmpty().not()) {
-            subViewBinding.tvTipDialogContent.text = Html.fromHtml( builder.content)
+            subViewBinding.tvTipDialogContent.text = Html.fromHtml(builder.content)
         }
 
         if (builder.contentSize != 0) {
-            subViewBinding.tvTipDialogContent.setTextSize(TypedValue.COMPLEX_UNIT_DIP, builder.contentSize.toFloat())
-        }
-
-        if (builder.contentMarginTop != 0) {
-            val params = subViewBinding.tvTipDialogContent.layoutParams as RelativeLayout.LayoutParams
-            params.topMargin = builder.contentMarginTop
-        }
-
-        if (builder.contentMarginBottom != 0) {
-            val params = subViewBinding.tvTipDialogContent.layoutParams as RelativeLayout.LayoutParams
-            params.bottomMargin = builder.contentMarginBottom
+            subViewBinding.tvTipDialogContent.setTextSize(
+                TypedValue.COMPLEX_UNIT_PX,
+                builder.contentSize.toFloat()
+            )
         }
 
         if (builder.topImg != 0) {
-            subViewBinding.ivTipDialogImg.visibility = View.VISIBLE
+            subViewBinding.ivTipDialogImg.show(true)
             subViewBinding.ivTipDialogImg.setImageResource(builder.topImg)
         }
 
@@ -68,19 +62,23 @@ class TipDialogFragment(val builder: TipDialogBuilder) : BaseDialogFragment<Dial
         }
 
         if (builder.leftBtnText.isNullOrEmpty()) {
-            subViewBinding.tvLeft.visibility = View.GONE
-            subViewBinding.vBtmDivider.visibility = View.GONE
+            subViewBinding.confirmLayout.show(false)
+            subViewBinding.tvConfirm.show(true)
         } else {
+            subViewBinding.confirmLayout.show(true)
+            subViewBinding.tvConfirm.show(false)
             subViewBinding.tvLeft.text = builder.leftBtnText
         }
         subViewBinding.tvLeft.setOnClickListener { builder.leftClickListener.invoke() }
 
         if (builder.rightBtnText.isNullOrEmpty()) {
-            subViewBinding.tvRight.visibility = View.GONE
-            subViewBinding.vBtmDivider.visibility = View.GONE
+            subViewBinding.tvConfirm.show(false)
+            subViewBinding.tvRight.show(false)
         } else {
+            subViewBinding.tvConfirm.text = builder.rightBtnText
             subViewBinding.tvRight.text = builder.rightBtnText
         }
+        subViewBinding.tvConfirm.setOnClickListener { builder.rightClickListener.invoke() }
         subViewBinding.tvRight.setOnClickListener { builder.rightClickListener.invoke() }
 
         if (builder.leftTextColor != 0) {
@@ -106,10 +104,9 @@ class TipDialogFragment(val builder: TipDialogBuilder) : BaseDialogFragment<Dial
         var outCancel = true
         var contentInfo: Spanned? = null
         var leftTextColor = 0
+
         // 内容字体大小
         var contentSize = 0
-        var contentMarginTop = 0
-        var contentMarginBottom = 0
 
         fun title(title: String = "", titleRes: Int = 0): TipDialogBuilder {
             this.title = title
@@ -160,15 +157,6 @@ class TipDialogFragment(val builder: TipDialogBuilder) : BaseDialogFragment<Dial
             return this
         }
 
-        /**
-         * 设置内容头部底部边距
-         */
-        fun contentMarginTopBottom(sizeTop: Int,sizeBottom: Int): TipDialogBuilder {
-            contentMarginTop = sizeTop
-            contentMarginBottom = sizeBottom
-            return this
-        }
-
         fun rightClick(c: () -> Unit = {}, dimiss: Boolean = false): TipDialogBuilder {
             rightClickListener = {
                 c.invoke()

+ 1 - 1
baselib/src/main/res/drawable/bg_dialog_base.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@android:color/white" />
-    <corners android:radius="@dimen/divider_49px" />
+    <corners android:radius="@dimen/divider_42px" />
 </shape>

+ 9 - 0
baselib/src/main/res/drawable/bg_dialog_tip_left.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="@android:color/white" />
+</shape>

+ 9 - 0
baselib/src/main/res/drawable/bg_dialog_tip_right.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>

+ 67 - 53
baselib/src/main/res/layout/dialog_tip.xml

@@ -1,93 +1,107 @@
 <?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">
 
     <data>
 
     </data>
 
-    <RelativeLayout
-        android:layout_width="@dimen/divider_240px"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:paddingTop="@dimen/divider_79px">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <ImageView
             android:id="@+id/iv_tip_dialog_img"
-            android:layout_width="@dimen/dimen_35dp"
-            android:layout_height="@dimen/dimen_35dp"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="@dimen/dimen_10dp"
-            android:visibility="gone" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/tv_tip_dialog_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/iv_tip_dialog_img"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="@dimen/divider_62px"
-            android:textColor="@color/color_FF5F3100"
-            android:textSize="@dimen/divider_48px"
-            tools:text="复诊挂号说明" />
+            android:layout_marginTop="@dimen/divider_71px"
+            android:textColor="@color/color_FFF6A532"
+            android:textSize="@dimen/divider_42px"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="恭喜您" />
 
         <TextView
             android:id="@+id/tv_tip_dialog_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/tv_tip_dialog_title"
-            android:layout_centerHorizontal="true"
-            android:layout_marginStart="@dimen/divider_30px"
-            android:layout_marginEnd="@dimen/divider_30px"
-            android:gravity="center"
-            android:textColor="@color/color_d8000000"
-            android:textSize="@dimen/divider_32px"
+            android:layout_marginStart="@dimen/divider_65px"
+            android:layout_marginTop="@dimen/divider_29px"
+            android:layout_marginEnd="@dimen/divider_65px"
+            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/tv_tip_dialog_title"
             tools:text="通知" />
 
-        <View
-            android:id="@+id/line"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/divider_2px"
-            android:layout_below="@id/tv_tip_dialog_content"
-            android:layout_marginTop="@dimen/divider_20px"
-            android:background="@color/color_FFF1F0F5"
-            android:visibility="gone" />
-
         <LinearLayout
+            android:id="@+id/confirmLayout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/divider_69px"
-            android:layout_below="@id/line"
-            android:layout_marginBottom="@dimen/divider_57px"
-            android:orientation="horizontal">
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/divider_92px"
+            android:layout_marginTop="@dimen/divider_72px"
+            android:layout_marginEnd="@dimen/divider_100px"
+            android:gravity="center"
+            android:visibility="gone"
+            android:orientation="horizontal"
+            android:paddingBottom="@dimen/divider_53px"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_tip_dialog_content">
 
             <TextView
                 android:id="@+id/tv_left"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
+                android:layout_width="@dimen/divider_204px"
+                android:layout_height="@dimen/divider_59px"
+                android:background="@drawable/bg_dialog_tip_left"
                 android:gravity="center"
-                android:textColor="@color/CC000000"
-                android:textSize="@dimen/divider_42px"
-                tools:text="我知道了" />
+                android:textColor="@color/color_FF4D7EFF"
+                android:textSize="@dimen/divider_24px"
+                tools:text="稍后再看" />
 
             <View
-                android:id="@+id/v_btm_divider"
-                android:layout_width="@dimen/dimen_1dp"
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:background="@color/color_FFF1F0F5"
-                android:visibility="gone" />
+                android:layout_weight="1" />
 
             <TextView
                 android:id="@+id/tv_right"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
+                android:layout_width="@dimen/divider_204px"
+                android:layout_height="@dimen/divider_59px"
+                android:background="@drawable/bg_dialog_tip_right"
                 android:gravity="center"
-                android:textColor="@color/color_1890FF"
-                android:textSize="@dimen/divider_42px"
-                tools:text="我知道了" />
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_24px"
+                tools:text="立即查看" />
 
         </LinearLayout>
 
-    </RelativeLayout>
+        <TextView
+            android:id="@+id/tvConfirm"
+            android:layout_width="@dimen/divider_204px"
+            android:layout_height="@dimen/divider_59px"
+            android:layout_marginTop="@dimen/divider_72px"
+            android:layout_marginBottom="@dimen/divider_53px"
+            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_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/confirmLayout"
+            tools:text="立即查看" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

+ 2 - 1
baselib/src/main/res/layout/fragment_dialog_base.xml

@@ -6,6 +6,7 @@
     </data>
 
     <LinearLayout
+        android:id="@+id/llyt_dialog"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/transparent"
@@ -14,7 +15,7 @@
 
         <LinearLayout
             android:id="@+id/llyt_content_dialog"
-            android:layout_width="match_parent"
+            android:layout_width="@dimen/divider_667px"
             android:layout_height="wrap_content"
             android:background="@drawable/bg_dialog_base"
             android:gravity="center"

+ 4 - 0
baselib/src/main/res/values/colors.xml

@@ -18,4 +18,8 @@
     <color name="transparent">#00000000</color><!-- 透明   -->
     <!--    标题底部边框颜色-->
     <color name="title_bottom_border" tools:ignore="MissingDefaultResource">#F4F4F4</color>
+    <color name="color_FFF6A532">#FFF6A532</color>
+    <color name="color_FF333333">#FF333333</color>
+    <color name="color_FF4D7EFF">#FF4D7EFF</color>
+    <color name="color_FF054DFF">#FF054DFF</color>
 </resources>

+ 4 - 0
baselib/src/main/res/values/dimens.xml

@@ -5,9 +5,11 @@
     <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_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>
@@ -21,6 +23,7 @@
     <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>
@@ -46,6 +49,7 @@
     <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>

+ 2 - 1
config.gradle

@@ -115,7 +115,8 @@ ext {
             "jpush"                  : 'cn.jiguang.sdk:jpush:5.0.0',
             "gson"                   : 'com.google.code.gson:gson:2.8.5',
             "leakcanary"             : 'com.squareup.leakcanary:leakcanary-android:2.10',
-            "liteavSdk"              : 'com.tencent.liteav:LiteAVSDK_Player:latest.release'
+            "LiteAVSDK_Player"       : 'com.tencent.liteav:LiteAVSDK_Player:latest.release',
+            "imsdk"                  : 'com.tencent.imsdk:imsdk:5.1.66'
 
     ]
 }

+ 2 - 3
livebroadcast/build.gradle

@@ -24,7 +24,6 @@ dependencies {
     implementation(rootProject.ext.androidx.appcompat)
     implementation(rootProject.ext.androidx.material)
     implementation(rootProject.ext.androidx.constraintlayout)
-    api(rootProject.ext.dependencies.liteavSdk)
-
-
+    api(rootProject.ext.dependencies.LiteAVSDK_Player)
+    api(rootProject.ext.dependencies.imsdk)
 }

+ 3 - 1
livebroadcast/proguard-rules.pro

@@ -67,4 +67,6 @@
 -dontwarn okhttp3.internal.platform.**
 -dontwarn org.conscrypt.**
 -dontwarn org.bouncycastle.**
--dontwarn org.openjsse.**
+-dontwarn org.openjsse.**
+
+-keep class com.tencent.** { *; }

+ 30 - 5
livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/detail/LiveBroadcastActivity.kt

@@ -3,6 +3,8 @@ package com.yingyang.livebroadcast.activity.detail
 import android.os.Bundle
 import android.util.Log
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.tencent.imsdk.v2.V2TIMManager
+import com.tencent.imsdk.v2.V2TIMSDKConfig
 import com.tencent.live2.V2TXLiveDef.V2TXLiveVideoFrame
 import com.tencent.live2.V2TXLivePlayer
 import com.tencent.live2.V2TXLivePlayerObserver
@@ -13,6 +15,7 @@ import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.User
 
+
 /**
  * 直播页面
  */
@@ -31,6 +34,24 @@ class LiveBroadcastActivity :
     }
 
     override fun initViews() {
+        //初始化直播
+        initPlayer()
+        //初始化IM
+        initIm()
+    }
+
+    override fun initListener() {
+
+    }
+
+    override fun initData() {
+        getUserSign()
+    }
+
+    /**
+     * 初始化直播
+     */
+    private fun initPlayer() {
         mLivePlayer = V2TXLivePlayerImpl(this@LiveBroadcastActivity)
         mLivePlayer?.setRenderView(binding.playTxCloudView)
         mLivePlayer?.setObserver(object : V2TXLivePlayerObserver() {
@@ -94,12 +115,16 @@ class LiveBroadcastActivity :
         Log.d(TAG, "startLivePlay : $result")
     }
 
-    override fun initListener() {
-
-    }
+    /**
+     * 初始化IM
+     */
+    private fun initIm() {
+        // 初始化 config 对象
+        val config = V2TIMSDKConfig()
+        // 指定 log 输出级别
+        config.setLogLevel(V2TIMSDKConfig.V2TIM_LOG_DEBUG)
+//        V2TIMManager.getInstance().addSimpleMsgListener()
 
-    override fun initData() {
-        getUserSign()
     }
 
     /**

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

@@ -1,6 +1,8 @@
 package com.yingyang.workbenches
 
 import android.annotation.SuppressLint
+import android.content.Intent
+import android.provider.Settings
 import androidx.recyclerview.widget.GridLayoutManager
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.yingyang.workbenches.adapter.GameAdapter
@@ -124,7 +126,25 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
     }
 
     override fun initData() {
+        showTipDialog()
+    }
 
+    /**
+     * 跳转设置页面
+     */
+    private fun showTipDialog() {
+        TipDialogFragment.TipDialogBuilder()
+            .title("恭喜您")
+            .content("恭喜您 您完成了今天的专属训练!今天的训练报告已生成,快去查看吧!")
+            .leftBtnText("稍后再看")
+            .rightBtnText("立即查看")
+            .leftClick({
+            }, dimiss = true)
+            .rightClick({
+                val intent = Intent(Settings.ACTION_PRIVACY_SETTINGS)
+                startActivity(intent)
+            }, dimiss = true)
+            .show(supportFragmentManager)
     }
 
     /**

+ 1 - 0
workbenches/src/main/java/com/yingyang/workbenches/leisurebrain/LeisureBrainActivity.kt

@@ -23,6 +23,7 @@ class LeisureBrainActivity :
     override fun initListener() {
         binding.btnPlay.setOnClickListener {
             if (url.isNotEmpty()) {
+//                url = "http://60.205.201.7/123.mp4"
                 JumpUtil.jumpActivityWithUrl(RouterUrlCommon.videoPlayer, url)
             }
         }