1.添加训练弹窗

.idea/misc.xml

@@ -52,7 +52,7 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_train_data.xml" value="0.4700413223140496" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_workbenches.xml" value="0.72" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_brain_ability.xml" value="0.21014492753623187" />
-        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_task.xml" value="0.21014492753623187" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_task.xml" value="0.6" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_train_content.xml" value="0.21014492753623187" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_train_report.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_game_list.xml" value="0.4" />

workbenches/src/main/java/com/yingyang/workbenches/WorkbenchesActivity.kt

@@ -1,13 +1,12 @@
 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
 import com.yingyang.workbenches.adapter.TaskAdapter
 import com.yingyang.workbenches.databinding.ActivityWorkbenchesBinding
+import com.yingyang.workbenches.dialog.TaskFragment
 import com.yingyang.workbenches.entity.MyTaskBean
 import com.yingyang.workbenches.entity.Record
 import com.yingyangfly.baselib.dialog.TipDialogFragment
@@ -127,6 +126,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
 
     override fun initData() {
 //        showTipDialog()
+        showTaskDialog()
     }
 
     /**
@@ -146,6 +146,11 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
             .show(supportFragmentManager)
     }
 
+    private fun showTaskDialog() {
+        val taskFragment = TaskFragment()
+        taskFragment.show(supportFragmentManager, "taskFragment")
+    }
+
     /**
      * 加载游戏数据
      */
@@ -175,7 +180,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
         viewModel.getCountTrain(fail = {
             it.toast()
         }, success = {
-            if(it != null) {
+            if (it != null) {
                 binding.data = it
             }
         })
@@ -234,7 +239,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
         viewModel.getGameDetail(id, fail = {
             it.toast()
         }, success = {
-            if(it != null) {
+            if (it != null) {
                 jumpWebView(it)
             }
         })

workbenches/src/main/java/com/yingyang/workbenches/dialog/TaskFragment.kt

@@ -1,4 +1,75 @@
 package com.yingyang.workbenches.dialog
 
-class TaskFragment {
+import android.os.Bundle
+import android.view.*
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.appcompat.widget.AppCompatButton
+import androidx.fragment.app.DialogFragment
+import com.bumptech.glide.Glide
+import com.yingyang.workbenches.R
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
+import com.yingyangfly.baselib.utils.ViewTool
+
+/**
+ * 任务提醒
+ */
+class TaskFragment : DialogFragment(), View.OnTouchListener {
+
+    private var fishImage: ImageView? = null
+    private var tvContent: TextView? = null
+    private var confirmBtan: AppCompatButton? = null
+
+    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? {
+        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 = "根据您的训练情况，您的多项能力都有不错的得分，但是“感知觉”‘注意分配’等还需要继续强化训练，特为您制定了今天的训练方案，快去训练吧！"
+
+    }
+
+    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
+        if (isCancelable && dialog?.isShowing == true) {
+            dismiss()
+            return true
+        }
+        return false
+    }
 }

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

@@ -1,57 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
+    android:fitsSystemWindows="true"
     tools:ignore="ResourceName">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/transparent">
+    <ImageView
+        android:id="@+id/fishImage"
+        android:layout_width="@dimen/divider_176px"
+        android:layout_height="@dimen/divider_289px"
+        android:layout_marginStart="@dimen/divider_67px"
+        android:layout_marginBottom="@dimen/divider_37px"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent" />
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/fishImage"
-            android:layout_width="@dimen/divider_176px"
-            android:layout_height="@dimen/divider_289px"
-            android:layout_marginStart="@dimen/divider_67px"
-            android:layout_marginBottom="@dimen/divider_37px"
-            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">
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@mipmap/icon_dialog_box"
-            android:gravity="center_horizontal"
-            android:minWidth="@dimen/divider_689px"
-            android:minHeight="@dimen/divider_377px"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+        <TextView
+            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"
+            tools:text="根据您的训练情况，您的多项能力都有不错的得分，但是“感知觉”‘注意分配’等还需要继续强化训练，特为您制定了今天的训练方案，快去训练吧！" />
 
-            <TextView
-                android:id="@+id/tvContent"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/divider_47px"
-                android:layout_marginTop="@dimen/divider_53px"
-                android:layout_marginEnd="@dimen/divider_47px"
-                tools:text="根据您的训练情况，您的多项能力都有不错的得分，但是“感知觉”‘注意分配’等还需要继续强化训练，特为您制定了今天的训练方案，快去训练吧！" />
+        <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="好的"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_32px"
+            android:textStyle="bold" />
 
-            <androidx.appcompat.widget.AppCompatButton
-                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="好的"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_32px"
-                android:textStyle="bold" />
-
-        </LinearLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -28,4 +28,5 @@
     <color name="color_FFFFC036" tools:ignore="ResourceName">#FFFFC036</color>
     <color name="color_80000000" tools:ignore="ResourceName">#80000000</color>
     <color name="color_FF6E5FFF" tools:ignore="ResourceName">#FF6E5FFF</color>
+    <color name="transparent" tools:ignore="ResourceName">#00000000</color><!-- 透明   -->
 </resources>