1.修改理疗报告列表跳转查看理疗报告日期格式

webview/src/main/java/com/yingyangfly/webview/BridgeWebActivity.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.pm.ActivityInfo
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.ViewGroup
 import android.webkit.WebResourceRequest
 import android.webkit.WebSettings
@@ -14,8 +15,12 @@ import androidx.databinding.DataBindingUtil
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gyf.immersionbar.BarHide
 import com.gyf.immersionbar.ktx.immersionBar
+import com.yingyangfly.baselib.dialog.MessageDialog
 import com.yingyangfly.baselib.ext.click
 import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.JumpUtil
+import com.yingyangfly.baselib.utils.LiveEventBusUtil
+import com.yingyangfly.baselib.utils.RxBusCodes
 import com.yingyangfly.baselib.utils.ViewTool
 import com.yingyangfly.webview.databinding.ActivityBridgeWebBinding
 
@@ -36,10 +41,12 @@ class BridgeWebActivity : AppCompatActivity() {
             navigationBarColor(R.color.transparent)
         }
         url = intent.getStringExtra("url") ?: ""
+        Log.e("wpp", "url------------------->" + url)
         binding = DataBindingUtil.setContentView(this, R.layout.activity_bridge_web)
         ViewTool.inflateLayoutPixels(this, binding.root, 1194, 834)
         initWebView()
         initView()
+        initLiveData()
     }
 
     @SuppressLint("JavascriptInterface", "SetJavaScriptEnabled")
@@ -133,4 +140,19 @@ class BridgeWebActivity : AppCompatActivity() {
         }
         super.onResume()
     }
+
+    private fun initLiveData() {
+        //IM被踢下线
+        LiveEventBusUtil.observer<String>(this, RxBusCodes.ONKICKEDOFFLINE) {
+            runOnUiThread {
+                val messageDialog = MessageDialog()
+                messageDialog.setContent("", "您已经在其他端登录了当前账号，是否重新登录？", "提示")
+                messageDialog.onDialogClickListener = {
+                    JumpUtil.jumpActivity(RouterUrlCommon.login, this)
+                    finish()
+                }
+                messageDialog.show(supportFragmentManager, "messageDialog")
+            }
+        }
+    }
 }

workbenches/src/main/java/com/yingyang/workbenches/adapter/TrainReportAdapter.kt

@@ -5,7 +5,6 @@ import com.yingyang.workbenches.databinding.ItemTrainReportBinding
 import com.yingyang.workbenches.entity.RecordBeans
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
-import com.yingyangfly.baselib.ext.timeFormatByTime
 
 /**
  * 训练报告adapter
@@ -25,7 +24,7 @@ class TrainReportAdapter(override val layoutId: Int = R.layout.item_train_report
         binding.data = item
         binding.tvDate.text = item.createTime
         binding.tvDetails.setOnSingleClickListener {
-            onReportImageClickListener?.invoke(timeFormatByTime(item.createTime))
+            onReportImageClickListener?.invoke(item.getTimeDate())
         }
     }
 }

workbenches/src/main/java/com/yingyang/workbenches/entity/TrainReportBean.kt

@@ -1,16 +1,13 @@
 package com.yingyang.workbenches.entity
 
+import android.text.TextUtils
+
 data class TrainReportBean(
-    val list: TrainReportList,
-    val url: String
+    val list: TrainReportList, val url: String
 )
 
 data class TrainReportList(
-    val current: Int,
-    val pages: Int,
-    val records: List<RecordBeans>,
-    val size: Int,
-    val total: Int
+    val current: Int, val pages: Int, val records: List<RecordBeans>, val size: Int, val total: Int
 )
 
 data class RecordBeans(
@@ -33,4 +30,12 @@ data class RecordBeans(
     val updateBy: String,
     val updateTime: String,
     val userId: String
-)
+) {
+    fun getTimeDate(): String {
+        return if (TextUtils.isEmpty(createTime).not()) {
+            createTime.substring(0, 10)
+        } else {
+            ""
+        }
+    }
+}