Browse Source

Merge branch 'new_dev' of https://github.com/deepcloud2048/deep_voice into new_dev

weicu
lxm 1 year ago
parent
commit
7f88e72dbb
  1. 17
      lib/modules/meeting/views/meeting_view.dart
  2. 17
      lib/modules/meeting/views/summary_tab.dart
  3. 2
      local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentService.kt

17
lib/modules/meeting/views/meeting_view.dart

@ -535,7 +535,7 @@ class MeetingView extends GetView<MeetingController> {
),
2.horizontalSpace,
Text(
'${data.seconds}s',
_formatDateSeconds(data.seconds),
style: TextStyle(
color: isDarkMode ? Colors.grey[400] : Colors.grey[500],
fontSize: 12.sp,
@ -798,6 +798,21 @@ class MeetingView extends GetView<MeetingController> {
);
}
String _formatDateSeconds(int seconds) {
if (seconds < 60) {
return '${seconds}s';
} else if (seconds < 3600) {
int minutes = seconds ~/ 60;
int remainingSeconds = seconds % 60;
return '${minutes}m ${remainingSeconds}s';
} else {
int hours = seconds ~/ 3600;
int remainingMinutes = (seconds % 3600) ~/ 60;
int remainingSeconds = seconds % 60;
return '${hours}h ${remainingMinutes}m ${remainingSeconds}s';
}
}
// ...existing code...
// // 选项框
// Widget _importAudioItem1(

17
lib/modules/meeting/views/summary_tab.dart

@ -179,7 +179,7 @@ class _SummaryTabState extends State<SummaryTab> {
),
2.horizontalSpace,
Text(
'${_controller.meetingData.value.seconds}s',
_formatDateSeconds(_controller.meetingData.value.seconds),
style: TextStyle(
color: isDarkMode ? Colors.grey[400] : Colors.grey[500],
fontSize: 12.sp,
@ -388,4 +388,19 @@ class _SummaryTabState extends State<SummaryTab> {
),
);
}
String _formatDateSeconds(int seconds) {
if (seconds < 60) {
return '${seconds}s';
} else if (seconds < 3600) {
int minutes = seconds ~/ 60;
int remainingSeconds = seconds % 60;
return '${minutes}m ${remainingSeconds}s';
} else {
int hours = seconds ~/ 3600;
int remainingMinutes = (seconds % 3600) ~/ 60;
int remainingSeconds = seconds % 60;
return '${hours}h ${remainingMinutes}m ${remainingSeconds}s';
}
}
}

2
local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentService.kt

@ -749,7 +749,7 @@ object AgentService : CoroutineScope {
val responseBuilder = StringBuilder()
var aiMetadata:String = ""
var userMetadata = JSONObject()
var reply = false; //是否回复
var reply = true; //是否回复
var broadcast = true //是否播发
// 如果有图片,添加图片信息到元数据
if (hasImage) {

Loading…
Cancel
Save