Explorar o código

1.添加脑能力值接口

王鹏鹏 %!s(int64=2) %!d(string=hai) anos
pai
achega
2fa9a41acc

+ 3 - 0
baselib/src/main/java/com/yingyangfly/baselib/utils/RxBusCodes.kt

@@ -20,6 +20,9 @@ object RxBusCodes {
     //结束答题
     const val EndMOCAQuestion = 9004
 
+    //脑能力值
+    const val BrainAbility = 9008
+
     //获取理疗报告
     const val GetTrainReport = 9005
 

+ 2 - 1
config.gradle

@@ -122,6 +122,7 @@ ext {
             "xxPermission"             : "com.github.getActivity:XXPermissions:18.3",
             "tbssdk"                   : 'com.tencent.tbs:tbssdk:44085',
             "lifecycle"                : 'androidx.lifecycle:lifecycle-common-java8:2.3.1',
-            "chuckerteam_chucker"      :'com.github.chuckerteam.chucker:library-no-op:3.5.2'
+            "chuckerteam_chucker"      : 'com.github.chuckerteam.chucker:library-no-op:3.5.2',
+            "MPAndroidChart"           : 'com.github.PhilJay:MPAndroidChart:v3.1.0'
     ]
 }

+ 1 - 1
workbenches/build.gradle

@@ -22,7 +22,7 @@ dependencies {
     implementation(rootProject.ext.androidx.material)
     implementation(rootProject.ext.androidx.constraintlayout)
     implementation(rootProject.ext.dependencies.Zxing)
-
+    implementation(rootProject.ext.dependencies.MPAndroidChart)
     //RxJava2.0
     implementation(rootProject.ext.dependencies.rxjava)
     implementation(rootProject.ext.dependencies.rxandroid)

+ 18 - 6
workbenches/src/main/java/com/yingyang/workbenches/brainability/BrainAbilityFragment.kt

@@ -1,13 +1,17 @@
 package com.yingyang.workbenches.brainability
 
 import com.yingyang.workbenches.databinding.FragmentBrainAbilityBinding
-import com.yingyangfly.baselib.base.BaseFragment
-import com.yingyangfly.baselib.ext.logi
+import com.yingyangfly.baselib.ext.toast
+import com.yingyangfly.baselib.mvvm.BaseMVVMFragment
+import com.yingyangfly.baselib.utils.RxBusCodes
+import gorden.rxbus2.Subscribe
+import gorden.rxbus2.ThreadMode
 
 /**
  * 脑能力值
  */
-class BrainAbilityFragment : BaseFragment<FragmentBrainAbilityBinding>() {
+class BrainAbilityFragment :
+    BaseMVVMFragment<FragmentBrainAbilityBinding, BrainAbilityViewModel>() {
 
     override fun initViews() {
 
@@ -18,10 +22,18 @@ class BrainAbilityFragment : BaseFragment<FragmentBrainAbilityBinding>() {
     }
 
     override fun initData() {
-
+        loadData()
     }
 
-    fun logCate() {
-        "脑能力值".logi()
+    /**
+     * 加载数据监控
+     */
+    @Subscribe(code = RxBusCodes.BrainAbility, threadMode = ThreadMode.MAIN)
+    fun loadData() {
+        viewModel.getVariationTendencyByType(fail = {
+            it.toast()
+        }, success = {
+
+        })
     }
 }

+ 25 - 0
workbenches/src/main/java/com/yingyang/workbenches/brainability/BrainAbilityViewModel.kt

@@ -0,0 +1,25 @@
+package com.yingyang.workbenches.brainability
+
+import com.yingyang.workbenches.entity.VariationTendencyByTypeBean
+import com.yingyang.workbenches.net.WORKBENCHES_API
+import com.yingyangfly.baselib.mvvm.BaseViewModel
+
+/**
+ * @author 王鹏鹏
+ * @description 工作台页面ViewModel
+ */
+class BrainAbilityViewModel : BaseViewModel() {
+
+    /**
+     * 游戏日历
+     */
+    fun getVariationTendencyByType(
+        fail: ((msg: String) -> Unit)? = null,
+        success: ((success: List<VariationTendencyByTypeBean>?) -> Unit)? = null,
+    ) = launchFlow(true) {
+        WORKBENCHES_API.getVariationTendencyByType()
+    }.runUI(
+        success,
+        fail
+    )
+}

+ 12 - 0
workbenches/src/main/java/com/yingyang/workbenches/entity/VariationTendencyByTypeBean.kt

@@ -0,0 +1,12 @@
+package com.yingyang.workbenches.entity
+
+class VariationTendencyByTypeBean(
+    val name: String,
+    val type: String,
+    val value: List<Value>
+)
+
+data class Value(
+    val mentalEnergyVal: String,
+    val time: String
+)

+ 6 - 0
workbenches/src/main/java/com/yingyang/workbenches/net/WorkbenchesApiService.kt

@@ -93,4 +93,10 @@ interface WorkbenchesApiService {
      */
     @POST("app/task/findMyAllTask")
     suspend fun findMyAllTask(@Body requestBody: RequestBody): BaseResp<TrainReportBean>
+
+    /**
+     * 脑能力值
+     */
+    @POST("app/task/variationTendencyByType")
+    suspend fun getVariationTendencyByType(): BaseResp<List<VariationTendencyByTypeBean>>
 }

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

@@ -45,7 +45,7 @@ class TrainDataActivity : BaseFragmentActivity<ActivityTrainDataBinding>(), View
                     }
 
                     1 -> {
-
+                        RxBus.get().send(RxBusCodes.BrainAbility)
                     }
 
                     2 -> {

+ 4 - 9
workbenches/src/main/res/layout/fragment_brain_ability.xml

@@ -1,6 +1,5 @@
 <?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">
 
@@ -12,14 +11,10 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="脑能力值"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        <com.github.mikephil.charting.charts.LineChart
+            android:id="@+id/lineChart"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>