Skip to content
This repository was archived by the owner on May 27, 2025. It is now read-only.

Commit 6391695

Browse files
gohj99gohj99
committed
feat(ui): Optimize chat list and message interface
- Update chat list item layout and style - Add unread message indicator and avatar - Optimize message interface layout - Add input box status management and message sending logic - Fix some minor UI-related issues - Add message preload quantity setting feat(ui): 优化聊天列表和消息界面 - 更新聊天列表项布局和样式 - 添加未读消息指示器和头像 - 优化消息界面布局 - 增加输入框状态管理和消息发送逻辑 - 修复一些UI相关的小问题 - 增加消息预加载数量设置 Signed-off-by: gohj99 <[email protected]>
1 parent 4b1c478 commit 6391695

File tree

23 files changed

+699
-264
lines changed

23 files changed

+699
-264
lines changed

‎app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ android {
2222
minSdk = 26
2323
//noinspection OldTargetApi
2424
targetSdk = 34
25-
versionCode = 27
26-
versionName = "1.3.6"
25+
versionCode = 28
26+
versionName = "1.3.7"
2727

2828
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2929
vectorDrawables {

‎app/src/main/java/com/gohj99/telewatch/ChatActivity.kt‎

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,29 @@ class ChatActivity : ComponentActivity() {
5959
private var lastReadInboxMessageId = mutableStateOf(0L)
6060
private var goToChat = mutableStateOf(false)
6161
private val listState = LazyListState()
62+
private var inputText = mutableStateOf("")
6263

6364
@SuppressLint("AutoboxingStateCreation")
6465
private var currentUserId = mutableStateOf(-1L) // 使用 MutableState 来持有当前用户 ID
6566

6667
override fun onDestroy() {
6768
super.onDestroy()
68-
TgApiManager.tgApi?.exitChatPage()
69+
if (inputText.value != "") {
70+
TgApiManager.tgApi?.exitChatPage(
71+
TdApi.DraftMessage(
72+
null,
73+
(System.currentTimeMillis() / 1000).toInt(),
74+
TdApi.InputMessageText(
75+
TdApi.FormattedText(inputText.value, null),
76+
TdApi.LinkPreviewOptions(),
77+
false
78+
),
79+
0L
80+
)
81+
)
82+
} else {
83+
TgApiManager.tgApi?.exitChatPage()
84+
}
6985
}
7086

7187
override fun onResume() {
@@ -168,6 +184,14 @@ class ChatActivity : ComponentActivity() {
168184
lastReadInboxMessageId.value = itChatObject.lastReadInboxMessageId
169185

170186
TgApiManager.tgApi!!.saveChatId = itChatObject.id
187+
188+
// 获取聊天草稿
189+
val draftMessage = itChatObject.draftMessage?.inputMessageText
190+
if (draftMessage is TdApi.InputMessageText) {
191+
draftMessage.text?.let {
192+
inputText.value = it.text
193+
}
194+
}
171195
runOnUiThread {
172196
setContent {
173197
TelewatchTheme {
@@ -179,7 +203,22 @@ class ChatActivity : ComponentActivity() {
179203
goToChat.value = true
180204
runBlocking {
181205
lifecycleScope.launch {
182-
TgApiManager.tgApi?.exitChatPage()
206+
if (inputText.value != "") {
207+
TgApiManager.tgApi?.exitChatPage(
208+
TdApi.DraftMessage(
209+
null,
210+
(System.currentTimeMillis() / 1000).toInt(),
211+
TdApi.InputMessageText(
212+
TdApi.FormattedText(inputText.value, null),
213+
TdApi.LinkPreviewOptions(),
214+
false
215+
),
216+
0L
217+
)
218+
)
219+
} else {
220+
TgApiManager.tgApi?.exitChatPage()
221+
}
183222
}.join() // 等待协程执行完毕
184223
}
185224
startActivity(
@@ -386,6 +425,7 @@ class ChatActivity : ComponentActivity() {
386425
chatObject = itChatObject,
387426
lastReadOutboxMessageId = lastReadOutboxMessageId,
388427
lastReadInboxMessageId = lastReadInboxMessageId,
428+
inputText = inputText,
389429
listState = listState,
390430
onLinkClick = { url ->
391431
urlHandle(url, this) {

‎app/src/main/java/com/gohj99/telewatch/SettingActivity.kt‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,22 @@ class SettingActivity : ComponentActivity() {
164164
1 -> {
165165
title = getString(R.string.UI_Edit)
166166
settingsList.value = listOf(
167+
SettingItem.ProgressBar(
168+
itemName = getString(R.string.Message_preload_quantity),
169+
progress = settingsSharedPref.getInt("Message_preload_quantity", 10).toFloat(),
170+
maxValue = 50f,
171+
minValue = 5f,
172+
base = 1f,
173+
onProgressChange = { size ->
174+
with(settingsSharedPref.edit()) {
175+
putInt("Message_preload_quantity", size.toInt())
176+
apply()
177+
}
178+
}
179+
),
167180
SettingItem.ProgressBar(
168181
itemName = getString(R.string.Line_spacing),
169-
progress = settingsSharedPref.getFloat("Line_spacing", 6f),
182+
progress = settingsSharedPref.getFloat("Line_spacing", 5.5f),
170183
maxValue = 10f,
171184
minValue = 1f,
172185
base = 0.1f,
@@ -179,7 +192,7 @@ class SettingActivity : ComponentActivity() {
179192
),
180193
SettingItem.ProgressBar(
181194
itemName = getString(R.string.title_medium_font_size),
182-
progress = settingsSharedPref.getFloat("title_medium_font_size", 13f),
195+
progress = settingsSharedPref.getFloat("title_medium_font_size", 14.3f),
183196
maxValue = 25f,
184197
minValue = 5f,
185198
base = 0.1f,
@@ -192,7 +205,7 @@ class SettingActivity : ComponentActivity() {
192205
),
193206
SettingItem.ProgressBar(
194207
itemName = getString(R.string.body_small_font_size),
195-
progress = settingsSharedPref.getFloat("body_small_font_size", 14f),
208+
progress = settingsSharedPref.getFloat("body_small_font_size", 13.3f),
196209
maxValue = 25f,
197210
minValue = 5f,
198211
base = 0.1f,
@@ -205,7 +218,7 @@ class SettingActivity : ComponentActivity() {
205218
),
206219
SettingItem.ProgressBar(
207220
itemName = getString(R.string.body_medium_font_size),
208-
progress = settingsSharedPref.getFloat("body_medium_font_size", 12f),
221+
progress = settingsSharedPref.getFloat("body_medium_font_size", 13.5f),
209222
maxValue = 25f,
210223
minValue = 5f,
211224
base = 0.1f,

‎app/src/main/java/com/gohj99/telewatch/model/Chat.kt‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,19 @@ import android.annotation.SuppressLint
1212
import android.os.Parcel
1313
import android.os.Parcelable
1414
import androidx.compose.ui.text.buildAnnotatedString
15+
import org.drinkless.tdlib.TdApi
1516

1617
@SuppressLint("ParcelCreator")
1718
data class Chat(
1819
val id: Long,
1920
val title: String,
20-
val message: androidx.compose.ui.text.AnnotatedString = buildAnnotatedString {},
21+
val accentColorId: Int = 2, // 会话颜色
22+
val unreadCount: Int = 0, // 未读会话
23+
val lastMessage: androidx.compose.ui.text.AnnotatedString = buildAnnotatedString {},
24+
val lastMessageTime: Int = -1, // 最后一条消息的时间,
25+
val chatPhoto: TdApi.File? = null, // 会话头像
2126
val order: Long = -1, // 会话排序
27+
val needNotification: Boolean = true, // 是否需要通知
2228
val isPinned: Boolean = false, // 是否在全部会话置顶
2329
val isRead: Boolean = false, // 聊天是否已读
2430
val isBot: Boolean = false, // 是否为机器人对话
@@ -34,13 +40,27 @@ data class Chat(
3440
override fun writeToParcel(dest: Parcel, flags: Int) {
3541
dest.writeLong(id)
3642
dest.writeString(title)
43+
// 添加其他属性的序列化
44+
dest.writeInt(lastMessageTime)
45+
dest.writeLong(order)
46+
dest.writeByte(if (isPinned) 1 else 0)
47+
dest.writeByte(if (isRead) 1 else 0)
48+
dest.writeByte(if (isBot) 1 else 0)
49+
dest.writeByte(if (isChannel) 1 else 0)
50+
dest.writeByte(if (isGroup) 1 else 0)
51+
dest.writeByte(if (isPrivateChat) 1 else 0)
52+
}
53+
54+
override fun toString(): String {
55+
return "Chat(...)" // 避免打印ByteArray内容
3756
}
3857

3958
companion object CREATOR : Parcelable.Creator<Chat> {
4059
override fun createFromParcel(parcel: Parcel): Chat {
4160
return Chat(
4261
parcel.readLong(),
4362
parcel.readString() ?: "",
63+
parcel.readInt()
4464
)
4565
}
4666

‎app/src/main/java/com/gohj99/telewatch/ui/ChatInfoScreen.kt‎

Lines changed: 51 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import androidx.compose.foundation.shape.CircleShape
2929
import androidx.compose.foundation.shape.RoundedCornerShape
3030
import androidx.compose.foundation.text.selection.SelectionContainer
3131
import androidx.compose.material3.MaterialTheme
32+
import androidx.compose.material3.Surface
3233
import androidx.compose.material3.Text
3334
import androidx.compose.material3.TextField
3435
import androidx.compose.runtime.Composable
@@ -45,6 +46,7 @@ import androidx.compose.ui.platform.LocalContext
4546
import androidx.compose.ui.res.stringResource
4647
import androidx.compose.ui.text.TextStyle
4748
import androidx.compose.ui.text.font.FontWeight
49+
import androidx.compose.ui.text.style.TextAlign
4850
import androidx.compose.ui.tooling.preview.Preview
4951
import androidx.compose.ui.unit.dp
5052
import androidx.compose.ui.unit.sp
@@ -56,11 +58,10 @@ import com.gohj99.telewatch.formatJson
5658
import com.gohj99.telewatch.model.tgFile
5759
import com.gohj99.telewatch.ui.main.LinkText
5860
import com.gohj99.telewatch.ui.main.MainCard
61+
import com.gohj99.telewatch.utils.getColorById
5962
import com.gohj99.telewatch.utils.urlHandle
6063
import com.google.gson.Gson
61-
import kotlinx.coroutines.delay
6264
import org.drinkless.tdlib.TdApi
63-
import java.io.IOException
6465

6566
@Composable
6667
fun SplashChatInfoScreen(
@@ -125,7 +126,7 @@ deleteChat: (() -> Unit)? = null
125126
.fillMaxWidth(),
126127
verticalAlignment = Alignment.Top // 或 Alignment.Bottom，或者移除此行使用默认的 Top 对齐
127128
) {
128-
if (chatObject.photo != null) ThumbnailChatPhoto(chatObject.photo!!.small) {
129+
if (chatObject.photo != null) ThumbnailChatPhoto(thumbnail = chatObject.photo!!.small, title = chatObject.title) {
129130
context.startActivity(
130131
Intent(
131132
context,
@@ -135,6 +136,22 @@ deleteChat: (() -> Unit)? = null
135136
putExtra("file", bigPhotoFile)
136137
}
137138
)
139+
} else {
140+
Surface(
141+
modifier = Modifier
142+
.size(45.dp), // 固定宽高为60dp
143+
color = getColorById(chatObject.accentColorId),
144+
shape = CircleShape
145+
) {
146+
Box(contentAlignment = Alignment.Center) { // 居中显示文本
147+
Text(
148+
text = chatObject.title[0].toString().uppercase(),
149+
color = Color.White,
150+
fontSize = 18.sp,
151+
textAlign = TextAlign.Center
152+
)
153+
}
154+
}
138155
}
139156
Spacer(Modifier.width(12.dp))
140157
Column {
@@ -276,45 +293,31 @@ deleteChat: (() -> Unit)? = null
276293
}
277294

278295
@Composable
279-
fun ThumbnailChatPhoto(thumbnail: TdApi.File, callback: () -> Unit) {
296+
fun ThumbnailChatPhoto(thumbnail: TdApi.File, size: Int = 45, title: String = "", callback: () -> Unit) {
280297
var imagePath by remember { mutableStateOf<String?>(null) }
281298
val painter = rememberAsyncImagePainter(model = imagePath) // 在Composable作用域
282299

283300
LaunchedEffect(thumbnail.id) {
284-
while (true) {
285-
if (thumbnail.local.isDownloadingCompleted) {
286-
try {
287-
imagePath = thumbnail.local.path // 更新状态触发重组
288-
break
289-
} catch (e: IOException) {
290-
println("Image load failed: ${e.message}")
291-
// 处理错误，例如显示占位符
292-
break
293-
}
294-
} else {
295-
//println("本地没图片，正在下载图片")
296-
try {
297-
TgApiManager.tgApi!!.downloadPhoto(thumbnail) { success, path ->
298-
if (success) {
299-
thumbnail.local.isDownloadingCompleted = true
300-
thumbnail.local.path = path
301-
} else {
302-
println("Download failed")
303-
304-
}
301+
if (thumbnail.local.isDownloadingCompleted) {
302+
imagePath = thumbnail.local.path // 显示头像
303+
} else {
304+
//println("本地没图片，正在下载图片")
305+
try {
306+
TgApiManager.tgApi!!.downloadFile(file = thumbnail, completion = { success, tdFleUrl ->
307+
if (success) {
308+
imagePath = tdFleUrl
305309
}
306-
} catch (e: Exception) {
307-
println("Download error: ${e.message}")
310+
})
311+
} catch (e: Exception) {
312+
println("Download error: ${e.message}")
308313

309-
}
310-
delay(1000)
311314
}
312315
}
313316
}
314317

315318
Box(
316319
modifier = Modifier
317-
.size(45.dp)
320+
.size(size.dp)
318321
.clip(CircleShape)
319322
.clickable {
320323
// 在这里处理点击事件
@@ -328,15 +331,25 @@ fun ThumbnailChatPhoto(thumbnail: TdApi.File, callback: () -> Unit) {
328331
contentDescription = "Thumbnail",
329332
modifier = Modifier.clip(CircleShape)
330333
)
331-
}
332-
/*else {
333-
// 根据 painterResource 的状态显示占位符
334-
when (painterResource) {
335-
is AsyncImagePainter.State.Loading -> {/* 显示加载指示器 */}
336-
is AsyncImagePainter.State.Error -> {/* 显示错误指示器 */}
337-
else -> {/* 显示默认占位符 */}
334+
} else {
335+
if (title != "") {
336+
Surface(
337+
modifier = Modifier
338+
.size(35.dp), // 固定宽高为60dp
339+
color = Color(0xFF55A6EE),
340+
shape = CircleShape
341+
) {
342+
Box(contentAlignment = Alignment.Center) { // 居中显示文本
343+
Text(
344+
text = title[0].toString().uppercase(),
345+
color = Color.White,
346+
fontSize = 18.sp,
347+
textAlign = TextAlign.Center
348+
)
349+
}
350+
}
338351
}
339-
}*/
352+
}
340353
}
341354
}
342355

0 commit comments

Comments
 (0)