Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d06ff2ade |
@@ -13,8 +13,8 @@ android {
|
|||||||
applicationId = "com.tsmobile.app"
|
applicationId = "com.tsmobile.app"
|
||||||
minSdk = 26
|
minSdk = 26
|
||||||
targetSdk = 35
|
targetSdk = 35
|
||||||
versionCode = 10
|
versionCode = 11
|
||||||
versionName = "1.0.10"
|
versionName = "1.0.11"
|
||||||
}
|
}
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
|
|||||||
@@ -48,6 +48,17 @@
|
|||||||
android:name=".ConnectionService"
|
android:name=".ConnectionService"
|
||||||
android:foregroundServiceType="dataSync"
|
android:foregroundServiceType="dataSync"
|
||||||
android:exported="false" />
|
android:exported="false" />
|
||||||
|
|
||||||
|
<!-- FileProvider:导出/分享崩溃日志文件 -->
|
||||||
|
<provider
|
||||||
|
android:name="androidx.core.content.FileProvider"
|
||||||
|
android:authorities="${applicationId}.fileprovider"
|
||||||
|
android:exported="false"
|
||||||
|
android:grantUriPermissions="true">
|
||||||
|
<meta-data
|
||||||
|
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||||
|
android:resource="@xml/file_paths" />
|
||||||
|
</provider>
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|||||||
@@ -56,6 +56,52 @@ class ConnectionService : LifecycleService() {
|
|||||||
fun stop(context: Context) {
|
fun stop(context: Context) {
|
||||||
android.util.Log.i(TAG, "Stopping connection service")
|
android.util.Log.i(TAG, "Stopping connection service")
|
||||||
context.stopService(Intent(context, ConnectionService::class.java))
|
context.stopService(Intent(context, ConnectionService::class.java))
|
||||||
|
// 兜底:立即取消保活通知,避免服务已停但通知残留(部分 ROM 不会随 stopService 移除前台通知)
|
||||||
|
cancelNotification(context)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 移除保活通知(前台通知的兜底清理) */
|
||||||
|
private fun cancelNotification(context: Context) {
|
||||||
|
try {
|
||||||
|
(context.getSystemService(NotificationManager::class.java) as NotificationManager)
|
||||||
|
.cancel(NOTIFICATION_ID)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
android.util.Log.w(TAG, "Failed to cancel keepalive notification", e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新保活通知(用于“重连中”等状态变化)。
|
||||||
|
* 服务仍在运行时,会更新前台通知;否则投递一条普通通知。
|
||||||
|
*/
|
||||||
|
fun update(context: Context, title: String, contentText: String) {
|
||||||
|
android.util.Log.i(TAG, "Updating keepalive notification: $title")
|
||||||
|
try {
|
||||||
|
(context.getSystemService(NotificationManager::class.java) as NotificationManager)
|
||||||
|
.notify(NOTIFICATION_ID, buildNotification(context, title, contentText))
|
||||||
|
} catch (e: Exception) {
|
||||||
|
android.util.Log.w(TAG, "Failed to update keepalive notification", e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun buildNotification(context: Context, title: String, contentText: String): Notification {
|
||||||
|
val pendingIntent = PendingIntent.getActivity(
|
||||||
|
context,
|
||||||
|
0,
|
||||||
|
Intent(context, MainActivity::class.java).apply {
|
||||||
|
flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
|
||||||
|
},
|
||||||
|
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
|
||||||
|
)
|
||||||
|
return NotificationCompat.Builder(context, CHANNEL_ID)
|
||||||
|
.setSmallIcon(android.R.drawable.ic_dialog_info)
|
||||||
|
.setContentTitle(title)
|
||||||
|
.setContentText(contentText)
|
||||||
|
.setPriority(NotificationCompat.PRIORITY_LOW)
|
||||||
|
.setOngoing(true)
|
||||||
|
.setShowWhen(false)
|
||||||
|
.setContentIntent(pendingIntent)
|
||||||
|
.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -106,7 +152,7 @@ class ConnectionService : LifecycleService() {
|
|||||||
} else {
|
} else {
|
||||||
0
|
0
|
||||||
}
|
}
|
||||||
ServiceCompat.startForeground(this, NOTIFICATION_ID, buildNotification(serverName), serviceType)
|
ServiceCompat.startForeground(this, NOTIFICATION_ID, buildNotification("已连接到 TeamSpeak", serverName), serviceType)
|
||||||
|
|
||||||
android.util.Log.i(TAG, "Foreground service started for $serverName")
|
android.util.Log.i(TAG, "Foreground service started for $serverName")
|
||||||
return Service.START_NOT_STICKY
|
return Service.START_NOT_STICKY
|
||||||
@@ -114,6 +160,9 @@ class ConnectionService : LifecycleService() {
|
|||||||
|
|
||||||
override fun onDestroy() {
|
override fun onDestroy() {
|
||||||
releaseLocks()
|
releaseLocks()
|
||||||
|
// 显式移除前台通知,确保断开/停止服务后通知被清除,而不是残留“已连接”
|
||||||
|
ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
|
||||||
|
cancelNotification(this)
|
||||||
super.onDestroy()
|
super.onDestroy()
|
||||||
android.util.Log.i(TAG, "Connection service destroyed, locks released")
|
android.util.Log.i(TAG, "Connection service destroyed, locks released")
|
||||||
}
|
}
|
||||||
@@ -180,24 +229,6 @@ class ConnectionService : LifecycleService() {
|
|||||||
nm.createNotificationChannel(channel)
|
nm.createNotificationChannel(channel)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun buildNotification(serverName: String): Notification {
|
private fun buildNotification(title: String, contentText: String): Notification =
|
||||||
val pendingIntent = PendingIntent.getActivity(
|
buildNotification(this, title, contentText)
|
||||||
this,
|
|
||||||
0,
|
|
||||||
Intent(this, MainActivity::class.java).apply {
|
|
||||||
flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
|
|
||||||
},
|
|
||||||
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
|
|
||||||
)
|
|
||||||
|
|
||||||
return NotificationCompat.Builder(this, CHANNEL_ID)
|
|
||||||
.setSmallIcon(android.R.drawable.ic_dialog_info)
|
|
||||||
.setContentTitle("已连接到 TeamSpeak")
|
|
||||||
.setContentText(serverName)
|
|
||||||
.setPriority(NotificationCompat.PRIORITY_LOW)
|
|
||||||
.setOngoing(true)
|
|
||||||
.setShowWhen(false)
|
|
||||||
.setContentIntent(pendingIntent)
|
|
||||||
.build()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.tsmobile.app.ui.components
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
|
import androidx.core.content.FileProvider
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.ColumnScope
|
import androidx.compose.foundation.layout.ColumnScope
|
||||||
@@ -233,20 +234,26 @@ private fun readCrashLog(context: Context): String {
|
|||||||
return texts.distinct().joinToString("\n\n")
|
return texts.distinct().joinToString("\n\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 通过系统分享面板导出崩溃日志(无日志时提示)。 */
|
/** 通过系统分享面板导出崩溃日志:写入 .log 文件并作为附件分享(非纯文本)。 */
|
||||||
private fun shareCrashLog(context: Context) {
|
private fun shareCrashLog(context: Context) {
|
||||||
val log = readCrashLog(context)
|
val log = readCrashLog(context)
|
||||||
if (log.isBlank()) {
|
if (log.isBlank()) {
|
||||||
Toast.makeText(context, "暂无崩溃日志", Toast.LENGTH_SHORT).show()
|
Toast.makeText(context, "暂无崩溃日志", Toast.LENGTH_SHORT).show()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
val file = writeCrashLogToFile(context, log)
|
||||||
|
if (file == null) {
|
||||||
|
Toast.makeText(context, "生成日志文件失败", Toast.LENGTH_SHORT).show()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
val uri = FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file)
|
||||||
val send = Intent(Intent.ACTION_SEND).apply {
|
val send = Intent(Intent.ACTION_SEND).apply {
|
||||||
type = "text/plain"
|
type = "text/plain"
|
||||||
putExtra(Intent.EXTRA_SUBJECT, "TeamSpeak Mobile 崩溃日志")
|
putExtra(Intent.EXTRA_SUBJECT, "TeamSpeak Mobile 崩溃日志")
|
||||||
putExtra(Intent.EXTRA_TEXT, log)
|
putExtra(Intent.EXTRA_STREAM, uri)
|
||||||
|
addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
||||||
}
|
}
|
||||||
val chooser = Intent.createChooser(send, "导出崩溃日志")
|
val chooser = Intent.createChooser(send, "导出崩溃日志")
|
||||||
// 若 context 不是 Activity,需 NEW_TASK
|
|
||||||
if (context !is android.app.Activity) chooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
|
if (context !is android.app.Activity) chooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
|
||||||
try {
|
try {
|
||||||
context.startActivity(chooser)
|
context.startActivity(chooser)
|
||||||
@@ -254,3 +261,15 @@ private fun shareCrashLog(context: Context) {
|
|||||||
Toast.makeText(context, "无法打开分享:${e.message}", Toast.LENGTH_SHORT).show()
|
Toast.makeText(context, "无法打开分享:${e.message}", Toast.LENGTH_SHORT).show()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 将日志写入 cacheDir/logs/tsmobile_crash_<时间戳>.log 文件(供 FileProvider 分享)。 */
|
||||||
|
private fun writeCrashLogToFile(context: Context, log: String): File? {
|
||||||
|
return try {
|
||||||
|
val dir = File(context.cacheDir, "logs").apply { mkdirs() }
|
||||||
|
val file = File(dir, "tsmobile_crash_${System.currentTimeMillis()}.log")
|
||||||
|
file.writeText(log)
|
||||||
|
file
|
||||||
|
} catch (e: Exception) {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -192,7 +192,7 @@ class ServerViewModel(application: Application) : AndroidViewModel(application)
|
|||||||
lastChannelId = chId
|
lastChannelId = chId
|
||||||
}
|
}
|
||||||
_connectionState.value = ConnectionState.WaitingForNetwork()
|
_connectionState.value = ConnectionState.WaitingForNetwork()
|
||||||
ConnectionService.stop(getApplication())
|
ConnectionService.update(getApplication(), "网络已断开,正在重连...", _state.value.address.trim())
|
||||||
if (networkMonitor.isAvailable.value) {
|
if (networkMonitor.isAvailable.value) {
|
||||||
startReconnect("网络变化,正在重连...")
|
startReconnect("网络变化,正在重连...")
|
||||||
}
|
}
|
||||||
@@ -898,6 +898,7 @@ class ServerViewModel(application: Application) : AndroidViewModel(application)
|
|||||||
|
|
||||||
// 重连失败
|
// 重连失败
|
||||||
android.util.Log.w(TAG, "All reconnect attempts failed")
|
android.util.Log.w(TAG, "All reconnect attempts failed")
|
||||||
|
ConnectionService.stop(getApplication()) // 清除“重连中”通知
|
||||||
Repository.clearSession()
|
Repository.clearSession()
|
||||||
channelViewModel?.clearChannels()
|
channelViewModel?.clearChannels()
|
||||||
_connectionState.value = ConnectionState.Disconnected(
|
_connectionState.value = ConnectionState.Disconnected(
|
||||||
@@ -916,6 +917,7 @@ class ServerViewModel(application: Application) : AndroidViewModel(application)
|
|||||||
|
|
||||||
val params = lastConnectParams ?: return
|
val params = lastConnectParams ?: return
|
||||||
_connectionState.value = ConnectionState.Reconnecting(attempt = 0, reason = "手动重连")
|
_connectionState.value = ConnectionState.Reconnecting(attempt = 0, reason = "手动重连")
|
||||||
|
ConnectionService.update(getApplication(), "正在重连...", _state.value.address.trim())
|
||||||
|
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
val error = withContext(Dispatchers.IO) {
|
val error = withContext(Dispatchers.IO) {
|
||||||
@@ -951,6 +953,7 @@ class ServerViewModel(application: Application) : AndroidViewModel(application)
|
|||||||
|
|
||||||
lastChannelId = ""
|
lastChannelId = ""
|
||||||
networkMonitor.reset()
|
networkMonitor.reset()
|
||||||
|
ConnectionService.stop(getApplication()) // 清除“重连中”通知
|
||||||
Repository.clearSession()
|
Repository.clearSession()
|
||||||
channelViewModel?.clearChannels()
|
channelViewModel?.clearChannels()
|
||||||
_connectionState.value = ConnectionState.Disconnected(
|
_connectionState.value = ConnectionState.Disconnected(
|
||||||
@@ -1077,17 +1080,14 @@ class ServerViewModel(application: Application) : AndroidViewModel(application)
|
|||||||
if (_connectionState.value is ConnectionState.WaitingForNetwork ||
|
if (_connectionState.value is ConnectionState.WaitingForNetwork ||
|
||||||
_connectionState.value is ConnectionState.Reconnecting
|
_connectionState.value is ConnectionState.Reconnecting
|
||||||
) {
|
) {
|
||||||
android.util.Log.d(TAG, "onDisconnected while already handling reconnect, stopping notification")
|
android.util.Log.d(TAG, "onDisconnected while already handling reconnect, keeping reconnecting notification")
|
||||||
ConnectionService.stop(getApplication())
|
ConnectionService.update(getApplication(), "连接已断开,正在重连...", _state.value.address.trim())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 语音断开处理
|
// 语音断开处理
|
||||||
voiceViewModel?.onDisconnected()
|
voiceViewModel?.onDisconnected()
|
||||||
|
|
||||||
// 停止前台服务
|
|
||||||
ConnectionService.stop(getApplication())
|
|
||||||
|
|
||||||
// 判断断线原因:网络丢失 vs 服务器主动断线
|
// 判断断线原因:网络丢失 vs 服务器主动断线
|
||||||
// - ConnectivityManager 明确检测到网络切换 → 网络丢失
|
// - ConnectivityManager 明确检测到网络切换 → 网络丢失
|
||||||
// - 断线原因为空或 timeout → TCP 静默断开(NAT 超时、运营商丢弃等),
|
// - 断线原因为空或 timeout → TCP 静默断开(NAT 超时、运营商丢弃等),
|
||||||
@@ -1098,6 +1098,8 @@ class ServerViewModel(application: Application) : AndroidViewModel(application)
|
|||||||
message.contains("timeout", ignoreCase = true)
|
message.contains("timeout", ignoreCase = true)
|
||||||
|
|
||||||
if (isNetworkLoss) {
|
if (isNetworkLoss) {
|
||||||
|
// 网络丢失 → 重连,通知显示“重连中”(保留前台服务与保活)
|
||||||
|
ConnectionService.update(getApplication(), "连接已断开,正在重连...", _state.value.address.trim())
|
||||||
// 记录当前频道,供重连后自动回到原频道
|
// 记录当前频道,供重连后自动回到原频道
|
||||||
val currentChId = Repository.currentChannelId.value
|
val currentChId = Repository.currentChannelId.value
|
||||||
if (currentChId != "0" && currentChId.isNotEmpty()) {
|
if (currentChId != "0" && currentChId.isNotEmpty()) {
|
||||||
@@ -1110,8 +1112,9 @@ class ServerViewModel(application: Application) : AndroidViewModel(application)
|
|||||||
android.util.Log.i(TAG, "Network-loss disconnect detected (fallback path)")
|
android.util.Log.i(TAG, "Network-loss disconnect detected (fallback path)")
|
||||||
startReconnect("网络变化,正在重连...")
|
startReconnect("网络变化,正在重连...")
|
||||||
} else {
|
} else {
|
||||||
// 服务器主动断线 — 清理会话,回到首页
|
// 服务器主动断线 — 清除通知、清理会话,回到首页
|
||||||
android.util.Log.w(TAG, "Server-initiated disconnect: $message")
|
android.util.Log.w(TAG, "Server-initiated disconnect: $message")
|
||||||
|
ConnectionService.stop(getApplication())
|
||||||
lastChannelId = ""
|
lastChannelId = ""
|
||||||
Repository.clearSession()
|
Repository.clearSession()
|
||||||
channelViewModel?.clearChannels()
|
channelViewModel?.clearChannels()
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- FileProvider 路径映射:暴露 cacheDir/logs 下的日志文件用于分享 -->
|
||||||
|
<paths>
|
||||||
|
<cache-path name="logs" path="logs/" />
|
||||||
|
</paths>
|
||||||
Reference in New Issue
Block a user