Skip to content

Commit 20bda02

Browse files
author
wanghai
committed
update read log limit
1 parent 947a722 commit 20bda02

File tree

3 files changed

+48
-46
lines changed

3 files changed

+48
-46
lines changed
Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.kit.log.ui
22

3+
import android.util.Log
34
import androidx.lifecycle.ViewModel
45
import androidx.lifecycle.viewModelScope
56
import com.orhanobut.logger.LogKit
@@ -9,58 +10,58 @@ import kotlinx.coroutines.launch
910

1011
class LogViewModel : ViewModel() {
1112

12-
//log数据
13-
private val logs = mutableListOf<LogInfo>()
13+
//log数据
14+
private val logs = mutableListOf<LogInfo>()
1415

15-
//tag数据
16-
private val tags = linkedSetOf<String>()
16+
//tag数据
17+
private val tags = linkedSetOf<String>()
1718

18-
//需要展示的标签
19-
val tagMSF: MutableStateFlow<List<String>> = MutableStateFlow(emptyList())
19+
//需要展示的标签
20+
val tagMSF: MutableStateFlow<List<String>> = MutableStateFlow(emptyList())
2021

21-
//需要展示的Log
22-
val logMSF: MutableStateFlow<List<LogInfo>> = MutableStateFlow(emptyList())
22+
//需要展示的Log
23+
val logMSF: MutableStateFlow<List<LogInfo>> = MutableStateFlow(emptyList())
2324

24-
init {
25-
LogKit.readLog { result ->
26-
logs.clear()
27-
tags.clear()
28-
tags.add(TAG_SHOW_ALL_LOG)
29-
result.forEach { line ->
30-
val oneLogLine = line.split(",")
31-
val oneLogInfo = LogInfo(
32-
oneLogLine[0].toLong(),
33-
oneLogLine[1],
34-
oneLogLine[2],
35-
oneLogLine[3],
36-
oneLogLine[4]
37-
)
38-
logs.add(oneLogInfo)
39-
tags.add(oneLogInfo.tag)
40-
}
41-
loadTag()
42-
loadLog()
25+
init {
26+
LogKit.readLog { result ->
27+
logs.clear()
28+
tags.clear()
29+
tags.add(TAG_SHOW_ALL_LOG)
30+
result.forEach { line ->
31+
val oneLogLine = line.split(",", limit = 5)
32+
val oneLogInfo = LogInfo(
33+
oneLogLine[0].toLong(),
34+
oneLogLine[1],
35+
oneLogLine[2],
36+
oneLogLine[3],
37+
oneLogLine.getOrNull(4) ?: ""
38+
)
39+
logs.add(oneLogInfo)
40+
tags.add(oneLogInfo.tag)
41+
}
42+
loadTag()
43+
loadLog()
44+
}
4345
}
44-
}
4546

46-
fun loadLog(filterTag: String = TAG_SHOW_ALL_LOG) {
47-
viewModelScope.launch(Dispatchers.IO) {
48-
if (filterTag == TAG_SHOW_ALL_LOG) {
49-
logMSF.emit(logs)
50-
} else {
51-
logMSF.emit(logs.filter { it.tag == filterTag })
52-
}
47+
fun loadLog(filterTag: String = TAG_SHOW_ALL_LOG) {
48+
viewModelScope.launch(Dispatchers.IO) {
49+
if (filterTag == TAG_SHOW_ALL_LOG) {
50+
logMSF.emit(logs)
51+
} else {
52+
logMSF.emit(logs.filter { it.tag == filterTag })
53+
}
54+
}
5355
}
54-
}
5556

56-
fun loadTag() {
57-
viewModelScope.launch(Dispatchers.IO) {
58-
tagMSF.emit(tags.toList())
57+
fun loadTag() {
58+
viewModelScope.launch(Dispatchers.IO) {
59+
tagMSF.emit(tags.toList())
60+
}
5961
}
60-
}
6162

6263

63-
companion object {
64-
const val TAG_SHOW_ALL_LOG = "ALL TAG"
65-
}
64+
companion object {
65+
const val TAG_SHOW_ALL_LOG = "ALL TAG"
66+
}
6667
}

sample/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ android {
2727
dependencies {
2828
implementation project(":log")
2929

30-
// implementation 'com.github.e-hai.LogKit:log:v1.0.0'
30+
// implementation 'com.github.e-hai:LogKit:1.0.1'
31+
3132

3233
}

sample/src/main/java/com/kit/log/sample/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ class MainActivity : Activity() {
1111
setContentView(R.layout.activity_main)
1212

1313
LogKit.initAllLog(this)
14-
for (i in 0..50) {
14+
for (i in 0..1) {
1515
LogKit.v("A", "hello %s")
1616
LogKit.v("hello")
17-
LogKit.d("b", "输出调试信息 debug my log message")
17+
LogKit.d("b", "输出调试信息 debug my log message,mamamamamama,bbbababba,ospspsp")
1818
LogKit.d("输出调试信息 debug my log message")
1919
LogKit.i("C", "输出必要信息 info my log message")
2020
LogKit.i("输出必要信息 info my log message")

0 commit comments

Comments
 (0)