1.添加测试环境bugly日志上报

2.添加是否有进行中的任务接口

baselib/build.gradle

@@ -31,8 +31,8 @@ android {
         debug {
             minifyEnabled false
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
-            buildConfigField "String", "BUGLY_APPID", "\"ad3db4d529\""
-            buildConfigField "String", "API_URL", "\"http://60.205.201.7:8110\""
+            buildConfigField "String", "BUGLY_APPID", "\"d400f20398\""
+            buildConfigField "String", "API_URL", "\"http://192.168.0.118:8110\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
 
@@ -40,7 +40,7 @@ android {
             minifyEnabled false
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"ad3db4d529\""
-            buildConfigField "String", "API_URL", "\"http://60.205.201.7:8110\""
+            buildConfigField "String", "API_URL", "\"http://192.168.0.118:8110\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

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

@@ -3,18 +3,15 @@ package com.yingyang.workbenches
 import android.annotation.SuppressLint
 import androidx.recyclerview.widget.GridLayoutManager
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.bumptech.glide.Glide
 import com.yingyang.workbenches.adapter.GameAdapter
 import com.yingyang.workbenches.databinding.ActivityWorkbenchesBinding
-import com.yingyang.workbenches.entity.Record
 import com.yingyangfly.baselib.dialog.TipDialogFragment
+import com.yingyangfly.baselib.ext.loge
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
-import com.yingyangfly.baselib.permissions.EsayPermissions
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.JumpUtil
-import com.yingyangfly.baselib.utils.User
 
 /**
  * 工作台
@@ -33,7 +30,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
             rvGame.adapter = gameAdapter
         }
         gameAdapter.onGameImageClickListener = { bean ->
-//            if (bean.currentLevel == bean.totalLevel) {
+            if (bean.currentLevel == bean.totalLevel) {
                 TipDialogFragment.TipDialogBuilder()
                     .title("当前游戏已通关，是否重新开始？", 0)
                     .leftBtnText("确定")
@@ -50,12 +47,12 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
                     }, true)
                     .outCancel(true)
                     .show(supportFragmentManager)
-//            } else {
-//                jumpWebView(
-//                    bean.gameUrl, bean.desn ?: "",
-//                    bean.currentLevel ?: ""
-//                )
-//            }
+            } else {
+                jumpWebView(
+                    bean.gameUrl, bean.desn ?: "",
+                    bean.currentLevel ?: ""
+                )
+            }
         }
     }
 
@@ -125,10 +122,12 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
 
     override fun onResume() {
         super.onResume()
-        //加载游戏列表
-        getGameList()
         //获取脑力值和训练时长接口
         getCountTrain()
+        //查询是否有进行中的任务
+        getFindMyTask()
+        //加载游戏列表
+        getGameList()
     }
 
     /**
@@ -142,6 +141,21 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
         })
     }
 
+    /**
+     * 查询是否有进行中的任务
+     */
+    private fun getFindMyTask() {
+        viewModel.getFindMyTask(fail = {
+            it.toast()
+        }, success = {
+            if (it.isNullOrEmpty().not()) {
+                "有正在进行中的任务".loge()
+            } else {
+                "没有正在进行中的任务".loge()
+            }
+        })
+    }
+
     /**
      * 跳转游戏列表
      */

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

@@ -1,6 +1,7 @@
 package com.yingyang.workbenches
 
 import com.yingyang.workbenches.entity.CountTrainBean
+import com.yingyang.workbenches.entity.MyTaskBean
 import com.yingyang.workbenches.entity.Record
 import com.yingyang.workbenches.net.WORKBENCHES_API
 import com.yingyangfly.baselib.mvvm.BaseViewModel
@@ -36,4 +37,17 @@ class WorkbenchesViewModel : BaseViewModel() {
         success,
         fail
     )
+
+    /**
+     * 查询是否有进行中的任务
+     */
+    fun getFindMyTask(
+        fail: ((msg: String) -> Unit)? = null,
+        success: ((success: List<MyTaskBean>) -> Unit)? = null,
+    ) = launchFlow(true) {
+        WORKBENCHES_API.getFindMyTask()
+    }.runUI(
+        success,
+        fail
+    )
 }

workbenches/src/main/java/com/yingyang/workbenches/entity/MyTaskBean.kt

@@ -0,0 +1,7 @@
+package com.yingyang.workbenches.entity
+
+/**
+ * 是否有进行中的任务
+ */
+class MyTaskBean {
+}

workbenches/src/main/java/com/yingyang/workbenches/net/WorkbenchesApiService.kt

@@ -29,4 +29,10 @@ interface WorkbenchesApiService {
      */
     @POST("app/video/selectAllVideo")
     suspend fun getSelectAllVideo(): BaseResp<LeisureBrainListBean>
+
+    /**
+     * 查询是否有进行中的任务
+     */
+    @POST("app/task/findMyTask")
+    suspend fun getFindMyTask(): BaseResp<List<MyTaskBean>>
 }