Przeglądaj źródła

1.修改理疗报告地址从接口获取

王鹏鹏 2 lat temu
rodzic
commit
df4fbf43da

+ 0 - 2
baselib/build.gradle

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

+ 1 - 2
baselib/src/main/java/com/yingyangfly/baselib/base/BaseActivity.kt

@@ -24,7 +24,6 @@ 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
@@ -410,7 +409,7 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(), OnRefre
                     if (TextUtils.isEmpty(bean.ext).not()) {
                         if (TextUtils.equals("C", bean.businessID)) {
                             val url =
-                                AccountConfig.TRAINREPORT_URL + "?userId=" + User.getUserId() + "&time=" + bean.ext + "&userToken=" + User.getToken()
+                                User.getTrainReportUrl() + "?userId=" + User.getUserId() + "&time=" + bean.ext + "&userToken=" + User.getToken()
                             JumpUtil.jumpActivityWithUrl(
                                 RouterUrlCommon.WEB_VIEW_INTERACTION_JS, url, mContext
                             )

+ 1 - 2
baselib/src/main/java/com/yingyangfly/baselib/base/BaseFragmentActivity.kt

@@ -23,7 +23,6 @@ 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,7 +311,7 @@ abstract class BaseFragmentActivity<DB : ViewDataBinding> : FragmentActivity(),
                     if (TextUtils.isEmpty(bean.ext).not()) {
                         if (TextUtils.equals("C", bean.businessID)) {
                             val url =
-                                AccountConfig.TRAINREPORT_URL + "?userId=" + User.getUserId() + "&time=" + bean.ext + "&userToken=" + User.getToken()
+                                User.getTrainReportUrl() + "?userId=" + User.getUserId() + "&time=" + bean.ext + "&userToken=" + User.getToken()
                             JumpUtil.jumpActivityWithUrl(
                                 RouterUrlCommon.WEB_VIEW_INTERACTION_JS, url, mContext
                             )

+ 1 - 2
baselib/src/main/java/com/yingyangfly/baselib/base/BaseLargeScreenActivity.kt

@@ -20,7 +20,6 @@ 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
@@ -305,7 +304,7 @@ abstract class BaseLargeScreenActivity<DB : ViewDataBinding> : AppCompatActivity
                     if (TextUtils.isEmpty(bean.ext).not()) {
                         if (TextUtils.equals("C", bean.businessID)) {
                             val url =
-                                AccountConfig.TRAINREPORT_URL + "?userId=" + User.getUserId() + "&time=" + bean.ext + "&userToken=" + User.getToken()
+                                User.getTrainReportUrl() + "?userId=" + User.getUserId() + "&time=" + bean.ext + "&userToken=" + User.getToken()
                             JumpUtil.jumpActivityWithUrl(
                                 RouterUrlCommon.WEB_VIEW_INTERACTION_JS, url, mContext
                             )

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

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

+ 1 - 0
baselib/src/main/java/com/yingyangfly/baselib/utils/CommonParam.kt

@@ -17,4 +17,5 @@ object CommonParam {
     val DOCTORAVATAR = "doctor_avatar"
     val PADNO = "padNo"
     val SAVEGAMESOUNDDATE = "saveGameSoundDate"
+    val TRAINREPORT_URL = "trainReportUrl"
 }

+ 18 - 0
baselib/src/main/java/com/yingyangfly/baselib/utils/User.kt

@@ -246,4 +246,22 @@ object User {
             TextUtils.equals(getSaveGameSoundDate(), getNowDay()).not()
         }
     }
+
+    /**
+     * 保存理疗报告地址
+     */
+    fun saveTrainReportUrl(trainReportUrl: String) {
+        if (TextUtils.isEmpty(trainReportUrl).not()) {
+            Preferences.put(CommonParam.TRAINREPORT_URL, trainReportUrl)
+        }
+    }
+
+    fun getTrainReportUrl(): String {
+        return if (TextUtils.isEmpty(Preferences.getString(CommonParam.TRAINREPORT_URL))) {
+            ""
+        } else {
+            Preferences.getString(CommonParam.TRAINREPORT_URL)!!
+        }
+    }
+
 }

+ 1 - 0
home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -216,6 +216,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
         }, success = {
             if (it != null) {
                 binding.data = it
+                User.saveTrainReportUrl(it.h5)
                 if (TextUtils.isEmpty(it.mentalPower).not()) {
                     val mentalPower = it.mentalPower.toInt()
                     binding.tvBrainPowerValue.setEnableAnim(true)

+ 2 - 1
home/src/main/java/com/yingyangfly/home/entity/CountTrainBean.kt

@@ -5,5 +5,6 @@ package com.yingyangfly.home.entity
  */
 data class CountTrainBean(
     val mentalPower: String,
-    val trainTime: String
+    val trainTime: String,
+    val h5: String
 )

+ 1 - 1
push/src/main/java/com/yingyang/push/activity/MessgeListActivity.kt

@@ -93,7 +93,7 @@ class MessgeListActivity : BaseMVVMActivity<ActivityMessgeListBinding, PushViewM
                                 ) {
                                     bean.ext
                                 } else {
-                                    AccountConfig.TRAINREPORT_URL + bean.ext
+                                    User.getTrainReportUrl() + bean.ext
                                 }
                             JumpUtil.jumpActivityWithUrl(
                                 RouterUrlCommon.WEB_VIEW_INTERACTION_JS, url, mContext