1.添加跳转理疗报告详情链接地址从本地获取

2.修改脑能力值图表不设置固定参数

baselib/src/main/java/com/yingyangfly/baselib/base/BaseActivity.kt

@@ -24,6 +24,7 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener
 import com.yingyangfly.baselib.R
 import com.yingyangfly.baselib.bean.MessageBean
+import com.yingyangfly.baselib.config.AccountConfig
 import com.yingyangfly.baselib.databinding.ActivityBaseBinding
 import com.yingyangfly.baselib.db.AppDataBase
 import com.yingyangfly.baselib.db.DepartmentDao
@@ -408,8 +409,9 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(), OnRefre
                 taskFragment.onDialogClickListener = {
                     if (TextUtils.isEmpty(bean.ext).not()) {
                         if (TextUtils.equals("C", bean.businessID)) {
+                            val url = AccountConfig.TRAINREPORT_URL + bean.ext
                             JumpUtil.jumpActivityWithUrl(
-                                RouterUrlCommon.WEB_VIEW_INTERACTION_JS, bean.ext, mContext
+                                RouterUrlCommon.WEB_VIEW_INTERACTION_JS, url, mContext
                             )
                         } else if (TextUtils.equals("D", bean.businessID)) {
                             JumpUtil.jumpActivityWithUrl(

baselib/src/main/java/com/yingyangfly/baselib/base/BaseFragmentActivity.kt

@@ -23,6 +23,7 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener
 import com.yingyangfly.baselib.R
 import com.yingyangfly.baselib.bean.MessageBean
+import com.yingyangfly.baselib.config.AccountConfig
 import com.yingyangfly.baselib.databinding.ActivityBaseBinding
 import com.yingyangfly.baselib.dialog.LoadingDialog
 import com.yingyangfly.baselib.dialog.MessageDialog
@@ -312,8 +313,9 @@ abstract class BaseFragmentActivity<DB : ViewDataBinding> : FragmentActivity(),
                 taskFragment.onDialogClickListener = {
                     if (TextUtils.isEmpty(bean.ext).not()) {
                         if (TextUtils.equals("C", bean.businessID)) {
+                            val url = AccountConfig.TRAINREPORT_URL + bean.ext
                             JumpUtil.jumpActivityWithUrl(
-                                RouterUrlCommon.WEB_VIEW_INTERACTION_JS, bean.ext, mContext
+                                RouterUrlCommon.WEB_VIEW_INTERACTION_JS, url, mContext
                             )
                         } else if (TextUtils.equals("D", bean.businessID)) {
                             JumpUtil.jumpActivityWithUrl(

baselib/src/main/java/com/yingyangfly/baselib/base/BaseLargeScreenActivity.kt

@@ -20,6 +20,7 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener
 import com.yingyangfly.baselib.R
 import com.yingyangfly.baselib.bean.MessageBean
+import com.yingyangfly.baselib.config.AccountConfig
 import com.yingyangfly.baselib.databinding.ActivityBaseBinding
 import com.yingyangfly.baselib.db.AppDataBase
 import com.yingyangfly.baselib.db.DoctorDao
@@ -303,8 +304,9 @@ abstract class BaseLargeScreenActivity<DB : ViewDataBinding> : AppCompatActivity
                 taskFragment.onDialogClickListener = {
                     if (TextUtils.isEmpty(bean.ext).not()) {
                         if (TextUtils.equals("C", bean.businessID)) {
+                            val url = AccountConfig.TRAINREPORT_URL + bean.ext
                             JumpUtil.jumpActivityWithUrl(
-                                RouterUrlCommon.WEB_VIEW_INTERACTION_JS, bean.ext, mContext
+                                RouterUrlCommon.WEB_VIEW_INTERACTION_JS, url, mContext
                             )
                         } else if (TextUtils.equals("D", bean.businessID)) {
                             JumpUtil.jumpActivityWithUrl(

push/src/main/java/com/yingyang/push/activity/MessgeListActivity.kt

@@ -11,6 +11,7 @@ import com.yingyang.push.adapter.PushTypeAdapter
 import com.yingyang.push.databinding.ActivityMessgeListBinding
 import com.yingyang.push.entity.PushMessageBean
 import com.yingyang.push.entity.PushMessageTypeBean
+import com.yingyangfly.baselib.config.AccountConfig
 import com.yingyangfly.baselib.dialog.MessageDialog
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
@@ -82,8 +83,9 @@ class MessgeListActivity : BaseMVVMActivity<ActivityMessgeListBinding, PushViewM
                             )
                             messageDialog.show(supportFragmentManager, "messageDialog")
                         } else {
+                            val url = AccountConfig.TRAINREPORT_URL + bean.ext
                             JumpUtil.jumpActivityWithUrl(
-                                RouterUrlCommon.WEB_VIEW_INTERACTION_JS, bean.ext, mContext
+                                RouterUrlCommon.WEB_VIEW_INTERACTION_JS, url, mContext
                             )
                         }
                     }

workbenches/src/main/java/com/yingyang/workbenches/datamonitor/DataMonitorFragment.kt

@@ -10,6 +10,7 @@ import com.yingyang.workbenches.databinding.FragmentDataMonitorBinding
 import com.yingyang.workbenches.entity.DayBean
 import com.yingyang.workbenches.entity.MonthRecordBean
 import com.yingyangfly.baselib.bean.Record
+import com.yingyangfly.baselib.config.AccountConfig
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.baselib.ext.toast
@@ -40,11 +41,6 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
     private var dataMonitorList = mutableListOf<Record>()
     private val dataMonitorAdapter by lazy { DataMonitorAdapter() }
 
-    /**
-     * 每日训练报告连接入口
-     */
-    private var url: String = ""
-
     /**
      * 训练类型
      */
@@ -83,13 +79,11 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
             }
 
             btnTrainingDaily.setOnSingleClickListener {
-                if (TextUtils.isEmpty(url).not()) {
-                    val trainingDailyUrl = url +
-                            "?userId=" + User.getUserId() + "&time=" + selectedTime + "&userToken=" + User.getToken()
+                if (TextUtils.isEmpty(AccountConfig.TRAINREPORT_URL).not()) {
+                    val trainingDailyUrl =
+                        AccountConfig.TRAINREPORT_URL + "?userId=" + User.getUserId() + "&time=" + selectedTime + "&userToken=" + User.getToken()
                     JumpUtil.jumpActivityWithUrl(
-                        RouterUrlCommon.WEB_VIEW_INTERACTION_JS,
-                        trainingDailyUrl,
-                        mContext
+                        RouterUrlCommon.WEB_VIEW_INTERACTION_JS, trainingDailyUrl, mContext
                     )
                 }
             }
@@ -148,7 +142,6 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
                 if (it.record.isNullOrEmpty().not()) {
                     dataMonitorList.addAll(it.record)
                 }
-                url = it.url
             }
             dataMonitorAdapter.setData(dataMonitorList)
         })
@@ -198,8 +191,7 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
         // 将日期设为上个月
         calendar[Calendar.MONTH] = calendar[Calendar.MONTH] - 1
         val preMonthDays: Int = StringUtil.getMonth(
-            calendar[Calendar.MONTH] + 1,
-            calendar[Calendar.YEAR]
+            calendar[Calendar.MONTH] + 1, calendar[Calendar.YEAR]
         )
         // 拿到上一个月的最后几天的天数
         for (i in 0 until weekIndex) {