Browse Source

1.修改直播回放页面UI

王鹏鹏 2 years ago
parent
commit
05164894fd

+ 1 - 1
baselib/src/main/java/com/yingyangfly/baselib/mvvm/BaseViewModel.kt

@@ -73,7 +73,7 @@ abstract class BaseViewModel : ViewModel() {
     ) = viewModelScope.launch {
         try {
             // 协程超时取消
-            withTimeout(30 * 1000) {
+            withTimeout(5 * 1000) {
                 this@runUI.collect {
                     it.y {
                         success?.invoke(it)

+ 3 - 3
baselib/src/main/java/com/yingyangfly/baselib/net/BaseNetWork.kt

@@ -19,9 +19,9 @@ fun <T> Any.initAPI(url: String, cla: Class<T>): T = BaseNetWork.initRetrofit(ur
 
 object BaseNetWork {
     private val timeUnit: TimeUnit = TimeUnit.SECONDS
-    private const val connectTimeOut: Long = 10
-    private const val readTimeOut: Long = 30
-    private const val writeTimeOut: Long = 30
+    private const val connectTimeOut: Long = 5
+    private const val readTimeOut: Long = 5
+    private const val writeTimeOut: Long = 5
 
     /**
      * 初始化Retrofit

+ 3 - 3
baselib/src/main/java/com/yingyangfly/baselib/net/OkHttpHelper.kt

@@ -17,9 +17,9 @@ class OkHttpHelper private constructor() {
 
     lateinit var okHttpClient: OkHttpClient
     private val timeUnit: TimeUnit = TimeUnit.SECONDS
-    private val connectTimeOut: Long = 10
-    private val readTimeOut: Long = 30
-    private val writeTimeOut: Long = 30
+    private val connectTimeOut: Long = 5
+    private val readTimeOut: Long = 5
+    private val writeTimeOut: Long = 5
 
     init {
         initHttpClient()

+ 1 - 1
config.gradle

@@ -14,7 +14,7 @@ ext {
             minSdkVersion    : 19,
             targetSdkVersion : 30,
             versionCode      : 4,
-            versionName      : "1.0.0.11",
+            versionName      : "1.0.0.12",
     ]
     //androidx配置
     androidx = [

+ 1 - 1
livebroadcast/src/main/java/com/yingyang/livebroadcast/adapter/LiveBroadcastAdapter.kt

@@ -63,7 +63,7 @@ class LiveBroadcastAdapter(override val layoutId: Int = R.layout.item_live_broad
                 }
             }
         } else if (TextUtils.equals("直播回放", method)) {
-            binding.tvTime.text = "直播时间:" + item.getBeginTimeInfo()
+            binding.tvTime.text = "直播时间:" + item.getLiveTime()
             binding.tvTitle.text = method
         }
         binding.tvTitle.setOnSingleClickListener {

+ 1 - 1
livebroadcast/src/main/java/com/yingyang/livebroadcast/details/LiveDetailsActivity.kt

@@ -64,7 +64,7 @@ class LiveDetailsActivity : BaseMVVMActivity<ActivityLiveDetailsBinding, LiveDet
                         }
                     }
                     else -> {
-                        binding.tvLiveTime.text = "直播时间:" + record?.getBeginTimeInfo()
+                        binding.tvLiveTime.text = "直播时间:" + record?.getLiveTime()
                         if (TextUtils.isEmpty(record?.liveVideo)) {
                             binding.tvStatus.text = "直播结束"
                         } else {