通时调整
This commit is contained in:
@@ -90,19 +90,24 @@ class MainActivity : ComponentActivity() {
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
if (false) {
|
// 添加一个可切换状态
|
||||||
LoginScreen(
|
var isSmsLogin by remember { mutableStateOf(true) }
|
||||||
|
if (isSmsLogin) {
|
||||||
|
// 验证码登录
|
||||||
|
LoginSmsScreen(
|
||||||
onLoginSuccess = { token ->
|
onLoginSuccess = { token ->
|
||||||
// 登录成功后跳转到主页,并传递 token
|
|
||||||
navController.navigate("main/$token") {
|
navController.navigate("main/$token") {
|
||||||
popUpTo("login") { inclusive = true }
|
popUpTo("login") { inclusive = true }
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
onSwitchToPasswordLogin = {
|
||||||
|
isSmsLogin = false // 切换到密码登录
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
LoginSmsScreen(
|
// 密码登录
|
||||||
|
LoginScreen(
|
||||||
onLoginSuccess = { token ->
|
onLoginSuccess = { token ->
|
||||||
// 登录成功后跳转到主页,并传递 token
|
|
||||||
navController.navigate("main/$token") {
|
navController.navigate("main/$token") {
|
||||||
popUpTo("login") { inclusive = true }
|
popUpTo("login") { inclusive = true }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ data class CallRecordUploadRequest(
|
|||||||
return CallRecordUploadRequest(
|
return CallRecordUploadRequest(
|
||||||
phone = callRecord.phoneNumber,
|
phone = callRecord.phoneNumber,
|
||||||
duration = callRecord.duration,
|
duration = callRecord.duration,
|
||||||
status = callRecord.status == CallStatus.COMPLETED, // 根据你的业务逻辑调整
|
status = audioFileUrl != null,
|
||||||
fileUrl = audioFileUrl ?: callRecord.audioFileUri,
|
fileUrl = audioFileUrl,
|
||||||
createTime = formatDateTimeForApi(callRecord.startTime)
|
createTime = formatDateTimeForApi(callRecord.startTime)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -178,6 +178,24 @@ object CallRecordManager {
|
|||||||
println(" 🕐 修改时间: ${latestFile.dateModified}")
|
println(" 🕐 修改时间: ${latestFile.dateModified}")
|
||||||
println(" 📊 文件大小: ${latestFile.size} 字节")
|
println(" 📊 文件大小: ${latestFile.size} 字节")
|
||||||
|
|
||||||
|
// 判断latestFile文件名是否匹配callRecord.phoneNumber
|
||||||
|
val fileNameLower = latestFile.displayName.lowercase()
|
||||||
|
val phoneLower = callRecord.phoneNumber.lowercase()
|
||||||
|
|
||||||
|
if (!fileNameLower.contains(phoneLower)) {
|
||||||
|
println("⚠️ 最新录音文件与当前手机号不匹配,忽略此文件")
|
||||||
|
println(" ❌ 文件名: ${latestFile.displayName}")
|
||||||
|
println(" ❌ 不包含号码: ${callRecord.phoneNumber}")
|
||||||
|
|
||||||
|
// 上传没有录音的通话记录
|
||||||
|
_recentCall.value = callRecord.copy(
|
||||||
|
audioFileName = null,
|
||||||
|
audioFileUri = null
|
||||||
|
)
|
||||||
|
uploadCallRecord(callRecord)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// 创建 SelectedAudioFile
|
// 创建 SelectedAudioFile
|
||||||
val selectedAudioFile = SelectedAudioFile(
|
val selectedAudioFile = SelectedAudioFile(
|
||||||
uri = latestFile.contentUri,
|
uri = latestFile.contentUri,
|
||||||
@@ -313,9 +331,8 @@ object CallRecordManager {
|
|||||||
println("🚀 CallRecordManager: 开始真实上传流程")
|
println("🚀 CallRecordManager: 开始真实上传流程")
|
||||||
println(" 📍 通话状态: ${callRecord.status}")
|
println(" 📍 通话状态: ${callRecord.status}")
|
||||||
println(" 🎵 是否有录音文件: ${callRecord.audioFileName != null}")
|
println(" 🎵 是否有录音文件: ${callRecord.audioFileName != null}")
|
||||||
|
// 根据是否有录音判断通话状态
|
||||||
// 根据通话状态决定上传方式
|
val success = if (callRecord.audioFileName != null) {
|
||||||
val success = if (callRecord.status == CallStatus.CONNECTED && callRecord.audioFileName != null) {
|
|
||||||
// 已接通且有录音文件:上传完整记录(包含录音)
|
// 已接通且有录音文件:上传完整记录(包含录音)
|
||||||
repository.uploadCallRecordWithAudio(callRecord)
|
repository.uploadCallRecordWithAudio(callRecord)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -347,7 +347,7 @@ fun HomeScreen(
|
|||||||
Text("🕐 开始时间: ${call.formattedStartTime}")
|
Text("🕐 开始时间: ${call.formattedStartTime}")
|
||||||
Text("🕐 结束时间: ${call.formattedEndTime}")
|
Text("🕐 结束时间: ${call.formattedEndTime}")
|
||||||
Text("⏱️ 时长: ${call.formattedDuration}")
|
Text("⏱️ 时长: ${call.formattedDuration}")
|
||||||
Text("🎵 音频文件: ${call.audioFileName ?: "自动查找中..."}")
|
Text("🎵 音频文件: ${call.audioFileName ?: "无录音文件"}")
|
||||||
Text("📍 状态: ${call.status}")
|
Text("📍 状态: ${call.status}")
|
||||||
Text(
|
Text(
|
||||||
text = if (call.uploaded) "✅ 已上传" else "⏳ ${if (call.audioFileName != null) "准备上传" else "查找文件中"}",
|
text = if (call.uploaded) "✅ 已上传" else "⏳ ${if (call.audioFileName != null) "准备上传" else "查找文件中"}",
|
||||||
|
|||||||
Reference in New Issue
Block a user