Browse Source

1.添加跳转理疗报告详情链接地址从本地获取
2.修改脑能力值图表不设置固定参数

王鹏鹏 1 year ago
parent
commit
3b78717797

+ 2 - 0
baselib/build.gradle

@@ -37,6 +37,7 @@ android {
             buildConfigField "String", "TENCENT_LICENCEKEY", "\"0258811f9d756fea82c9a2d2cbd439bd\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"d400f20398\""
+            buildConfigField "String", "TRAINREPORT_URL", "\"https://www.yingyangfly.com/h5-training-daily\""
             buildConfigField "String", "API_URL", "\"https://www.yingyangfly.com/hcp-app-api-dev\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
@@ -48,6 +49,7 @@ android {
             buildConfigField "String", "TENCENT_LICENCEKEY", "\"0258811f9d756fea82c9a2d2cbd439bd\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"ad3db4d529\""
+            buildConfigField "String", "TRAINREPORT_URL", "\"https://www.yingyangfly.com/h5-training-daily\""
             buildConfigField "String", "API_URL", "\"https://www.yingyangfly.com/hcp-app-api-uat\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }

+ 5 - 0
baselib/src/main/java/com/yingyangfly/baselib/config/AccountConfig.kt

@@ -33,6 +33,11 @@ object AccountConfig {
     const val TENCENT_LICENCEURL = BuildConfig.TENCENT_LICENCEURL
     const val TENCENT_LICENCEKEY = BuildConfig.TENCENT_LICENCEKEY
 
+    /**
+     * 理疗报告地址
+     */
+    const val TRAINREPORT_URL = BuildConfig.TRAINREPORT_URL
+
     /**
      * 接口请求地址
      */

+ 0 - 1
workbenches/src/main/java/com/yingyang/workbenches/brainability/BrainAbilityFragment.kt

@@ -190,7 +190,6 @@ class BrainAbilityFragment :
         axisLeft.axisLineColor = resources.getColor(R.color.color_FFCCCCCC)
         axisLeft.typeface = Typeface.DEFAULT_BOLD
         axisLeft.setLabelCount(6, true)
-        axisLeft.axisMaximum = 1000f
         //显示Y轴轴线
         axisLeft.setDrawAxisLine(false)
         axisLeft.isEnabled = true

+ 6 - 9
workbenches/src/main/java/com/yingyang/workbenches/trainreport/TrainReportFragment.kt

@@ -5,6 +5,7 @@ import com.yingyang.workbenches.adapter.TrainReportAdapter
 import com.yingyang.workbenches.databinding.FragmentTrainReportBinding
 import com.yingyang.workbenches.entity.GetTrainReportEvent
 import com.yingyang.workbenches.entity.RecordBeans
+import com.yingyangfly.baselib.config.AccountConfig
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMFragment
 import com.yingyangfly.baselib.router.RouterUrlCommon
@@ -19,7 +20,6 @@ import gorden.rxbus2.ThreadMode
  */
 class TrainReportFragment : BaseMVVMFragment<FragmentTrainReportBinding, TrainReportViewModel>() {
 
-    private var url = ""
     private var page = 1
     private var reportList = mutableListOf<RecordBeans>()
 
@@ -36,13 +36,11 @@ class TrainReportFragment : BaseMVVMFragment<FragmentTrainReportBinding, TrainRe
             adapter.setData(reportList)
         }
         adapter.onReportImageClickListener = {
-            if (TextUtils.isEmpty(url).not()) {
-                val trainingDailyUrl = url +
-                        "?userId=" + User.getUserId() + "&time=" + it + "&userToken=" + User.getToken()
+            if (TextUtils.isEmpty(AccountConfig.TRAINREPORT_URL).not()) {
+                val trainingDailyUrl =
+                    AccountConfig.TRAINREPORT_URL + "?userId=" + User.getUserId() + "&time=" + it + "&userToken=" + User.getToken()
                 JumpUtil.jumpActivityWithUrl(
-                    RouterUrlCommon.WEB_VIEW_INTERACTION_JS,
-                    trainingDailyUrl,
-                    mContext
+                    RouterUrlCommon.WEB_VIEW_INTERACTION_JS, trainingDailyUrl, mContext
                 )
             }
         }
@@ -79,11 +77,10 @@ class TrainReportFragment : BaseMVVMFragment<FragmentTrainReportBinding, TrainRe
             it.toast()
         }, success = {
             endRefresh()
-            if(event.isRefresh) {
+            if (event.isRefresh) {
                 reportList.clear()
             }
             if (it != null && it.list != null && it.list.records.isNullOrEmpty().not()) {
-                url = it.url
                 reportList.addAll(it.list.records)
             }
             adapter.showEmptyView = reportList.isEmpty()