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

baselib/build.gradle

@@ -37,7 +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", "TRAINREPORT_URL", "\"https://www.yingyangfly.com/h5-training-daily-dev\""
             buildConfigField "String", "API_URL", "\"https://www.yingyangfly.com/hcp-app-api-dev\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }

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

@@ -87,7 +87,10 @@ class MessgeListActivity : BaseMVVMActivity<ActivityMessgeListBinding, PushViewM
                             messageDialog.show(supportFragmentManager, "messageDialog")
                         } else {
                             val url =
-                                if (bean.ext.startsWith("https://www.yingyangfly.com/hcp-h5/")) {
+                                if (bean.ext.startsWith("https://www.yingyangfly.com/hcp-h5/") || bean.ext.startsWith(
+                                        "https://www.yingyangfly.com/h5-training-daily"
+                                    )
+                                ) {
                                     bean.ext
                                 } else {
                                     AccountConfig.TRAINREPORT_URL + bean.ext

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

@@ -10,7 +10,6 @@ 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
@@ -22,7 +21,7 @@ import com.yingyangfly.baselib.utils.StringUtil
 import com.yingyangfly.baselib.utils.User
 import gorden.rxbus2.Subscribe
 import gorden.rxbus2.ThreadMode
-import java.util.*
+import java.util.Calendar
 
 /**
  * 数据监控
@@ -46,6 +45,11 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
      */
     private var playClass = "A"
 
+    /**
+     * 每日训练报告连接入口
+     */
+    private var url: String = ""
+
     override fun initViews() {
         binding {
             rvDate.layoutManager = GridLayoutManager(mContext, 7)
@@ -79,9 +83,9 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
             }
 
             btnTrainingDaily.setOnSingleClickListener {
-                if (TextUtils.isEmpty(AccountConfig.TRAINREPORT_URL).not()) {
+                if (TextUtils.isEmpty(url).not()) {
                     val trainingDailyUrl =
-                        AccountConfig.TRAINREPORT_URL + "?userId=" + User.getUserId() + "&time=" + selectedTime + "&userToken=" + User.getToken()
+                        url + "?userId=" + User.getUserId() + "&time=" + selectedTime + "&userToken=" + User.getToken()
                     JumpUtil.jumpActivityWithUrl(
                         RouterUrlCommon.WEB_VIEW_INTERACTION_JS, trainingDailyUrl, mContext
                     )
@@ -142,6 +146,7 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
                 if (it.record.isNullOrEmpty().not()) {
                     dataMonitorList.addAll(it.record)
                 }
+                url = it.url
             }
             dataMonitorAdapter.setData(dataMonitorList)
         })

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

@@ -1,6 +1,10 @@
 package com.yingyang.workbenches.datamonitor
 
-import com.yingyang.workbenches.entity.*
+import com.yingyang.workbenches.entity.DayRecordDetailBean
+import com.yingyang.workbenches.entity.GetDayRecordDetailBean
+import com.yingyang.workbenches.entity.GetMonthRecordBean
+import com.yingyang.workbenches.entity.MonthRecordBean
+import com.yingyang.workbenches.entity.StatisticRecordBean
 import com.yingyang.workbenches.net.WORKBENCHES_API
 import com.yingyangfly.baselib.mvvm.BaseViewModel
 import com.yingyangfly.baselib.net.XUtils

workbenches/src/main/java/com/yingyang/workbenches/freetraining/FreeTrainActivity.kt

@@ -20,7 +20,6 @@ import com.yingyangfly.baselib.ext.getScaleAnimation
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
-import com.yingyangfly.baselib.utils.GsonUtil
 import com.yingyangfly.baselib.utils.JumpUtil
 import com.yingyangfly.baselib.utils.LiveEventBusUtil
 import com.yingyangfly.baselib.utils.RxBusCodes

workbenches/src/main/java/com/yingyang/workbenches/trainreport/TrainReportFragment.kt

@@ -5,7 +5,6 @@ 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
@@ -20,6 +19,7 @@ import gorden.rxbus2.ThreadMode
  */
 class TrainReportFragment : BaseMVVMFragment<FragmentTrainReportBinding, TrainReportViewModel>() {
 
+    private var url = ""
     private var page = 1
     private var reportList = mutableListOf<RecordBeans>()
 
@@ -36,9 +36,9 @@ class TrainReportFragment : BaseMVVMFragment<FragmentTrainReportBinding, TrainRe
             adapter.setData(reportList)
         }
         adapter.onReportImageClickListener = {
-            if (TextUtils.isEmpty(AccountConfig.TRAINREPORT_URL).not()) {
+            if (TextUtils.isEmpty(url).not()) {
                 val trainingDailyUrl =
-                    AccountConfig.TRAINREPORT_URL + "?userId=" + User.getUserId() + "&time=" + it + "&userToken=" + User.getToken()
+                    url + "?userId=" + User.getUserId() + "&time=" + it + "&userToken=" + User.getToken()
                 JumpUtil.jumpActivityWithUrl(
                     RouterUrlCommon.WEB_VIEW_INTERACTION_JS, trainingDailyUrl, mContext
                 )
@@ -81,6 +81,7 @@ class TrainReportFragment : BaseMVVMFragment<FragmentTrainReportBinding, TrainRe
                 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()