qzl/eryao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 新增追问模式和iOS本地化，重构后端输出模型

Browse Source
This commit is contained in:
qzl
2026-04-29 14:26:15 +08:00
parent f497afbff2
commit 16cb47e75a
39 changed files with 1346 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/lib/features/divination/data/apis/divination_api.dart
+18 -5
View File
@@ -93,6 +93,7 @@ class DivinationApi {
advice: _asStringList(agentOutputRaw['advice']),
keywords: _asStringList(agentOutputRaw['keywords']),
answer: _asString(agentOutputRaw['answer']),
status: _parseStatus(agentOutputRaw['status']),
);
records.add(aggregate.toViewData(params));
} catch (error, stackTrace) {
@@ -472,12 +473,24 @@ String _asString(Object? value) {
return value is String ? value : '';
}
List<String> _asStringList(Object? value) {
if (value is! List<dynamic>) {
return const <String>[];
List<String> _asStringList(Object? value) {
if (value is! List<dynamic>) {
return const <String>[];
}
return value.whereType<String>().toList(growable: false);
}
DivinationRunStatus _parseStatus(Object? value) {
if (value is! String) {
return DivinationRunStatus.success;
}
return switch (value) {
'success' => DivinationRunStatus.success,
'failed' => DivinationRunStatus.failed,
'refused' => DivinationRunStatus.refused,
_ => DivinationRunStatus.success,
};
}
return value.whereType<String>().toList(growable: false);
}
String _yaoTypeToText(YaoType type) {
return switch (type) {
apps/lib/features/divination/data/models/divination_backend_models.dart
+5 -13
View File
@@ -60,6 +60,7 @@ class DivinationRunAggregate {
required this.advice,
required this.keywords,
required this.answer,
this.status = DivinationRunStatus.success,
});
final DerivedDivinationData derived;
@@ -70,6 +71,7 @@ class DivinationRunAggregate {
final List<String> advice;
final List<String> keywords;
final String answer;
final DivinationRunStatus status;
DivinationResultData toViewData(DivinationParams params) {
return DivinationResultData(
@@ -84,9 +86,9 @@ class DivinationRunAggregate {
signType: signLevel,
keywords: keywords.join('、'),
focusPoints: focusPoints,
conclusion: _asBullet(conclusion),
conclusion: conclusion.join('\n'),
analysis: answer,
suggestion: _asBullet(advice),
suggestion: advice.join('\n'),
ganzhi: GanzhiData(
yearGanZhi: derived.ganzhi.yearGanZhi,
monthGanZhi: derived.ganzhi.monthGanZhi,
@@ -108,19 +110,9 @@ class DivinationRunAggregate {
targetYaoLines: derived.targetYaoInfoList
.map((line) => line.toViewModel())
.toList(growable: false),
status: status,
);
}
String _asBullet(List<String> lines) {
if (lines.isEmpty) {
return '';
}
return List<String>.generate(
lines.length,
(i) => '${i + 1}. ${lines[i]}',
growable: false,
).join('\n');
}
}
class DerivedDivinationData {
apps/lib/features/divination/data/models/divination_result.dart
+19
View File
@@ -1,5 +1,7 @@
import 'divination_params.dart';
enum DivinationRunStatus { success, failed, refused }
class DivinationResultData {
const DivinationResultData({
this.threadId,
@@ -20,6 +22,7 @@ class DivinationResultData {
required this.wuXingStatus,
required this.yaoLines,
required this.targetYaoLines,
this.status = DivinationRunStatus.success,
});
final DivinationParams params;
@@ -40,8 +43,10 @@ class DivinationResultData {
final Map<String, String> wuXingStatus;
final List<YaoLineData> yaoLines;
final List<YaoLineData> targetYaoLines;
final DivinationRunStatus status;
bool get hasChangingYao => binaryCode != changedBinaryCode;
bool get isSuccess => status == DivinationRunStatus.success;
Map<String, dynamic> toJson() {
return <String, dynamic>{
@@ -65,6 +70,7 @@ class DivinationResultData {
'targetYaoLines': targetYaoLines
.map((line) => line.toJson())
.toList(growable: false),
'status': status.name,
};
}
@@ -117,8 +123,21 @@ class DivinationResultData {
return YaoLineData.fromJson(raw);
})
.toList(growable: false),
status: _parseStatus(json['status']),
);
}
static DivinationRunStatus _parseStatus(Object? value) {
if (value is! String) {
return DivinationRunStatus.success;
}
return switch (value) {
'success' => DivinationRunStatus.success,
'failed' => DivinationRunStatus.failed,
'refused' => DivinationRunStatus.refused,
_ => DivinationRunStatus.success,
};
}
}
List<String> _requiredStringList(Map<String, dynamic> json, String key) {
apps/lib/features/divination/data/services/divination_run_service.dart
+16
View File
@@ -5,6 +5,7 @@ import '../../../../core/network/api_problem.dart';
import '../apis/divination_api.dart';
import '../models/divination_backend_models.dart';
import '../models/divination_params.dart';
import '../models/divination_result.dart';
class DivinationRunService {
const DivinationRunService({required DivinationApi api}) : _api = api;
@@ -38,6 +39,7 @@ class DivinationRunService {
List<String> advice = const <String>[];
List<String> keywords = const <String>[];
String answer = '';
DivinationRunStatus status = DivinationRunStatus.success;
await for (final event in _api.streamEvents(
threadId: threadId,
@@ -68,6 +70,7 @@ class DivinationRunService {
advice = _requiredStringList(event, 'advice');
keywords = _requiredStringList(event, 'keywords');
answer = _requiredString(event, 'answer');
status = _parseStatus(event['status']);
onTextMessageEnd?.call();
continue;
}
@@ -111,9 +114,22 @@ class DivinationRunService {
advice: advice,
keywords: keywords,
answer: answer,
status: status,
);
}
DivinationRunStatus _parseStatus(Object? value) {
if (value is! String) {
return DivinationRunStatus.success;
}
return switch (value) {
'success' => DivinationRunStatus.success,
'failed' => DivinationRunStatus.failed,
'refused' => DivinationRunStatus.refused,
_ => DivinationRunStatus.success,
};
}
String _requiredString(Map<String, dynamic> json, String key) {
final value = json[key];
if (value is! String || value.isEmpty) {
apps/lib/features/divination/presentation/screens/divination_result_screen.dart
+61 -62
View File
@@ -207,8 +207,6 @@ class _DivinationResultScreenState extends State<DivinationResultScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_ResultHeader(data: widget.data),
const SizedBox(height: AppSpacing.md),
_SignCard(
key: _finalSignCardKey,
signType: widget.data.signType,
@@ -221,17 +219,17 @@ class _DivinationResultScreenState extends State<DivinationResultScreen> {
content: widget.data.conclusion,
),
const SizedBox(height: AppSpacing.md),
_FocusPointsCard(points: widget.data.focusPoints),
_AnalysisCard(
title: l10n.resultSuggestion,
content: widget.data.suggestion,
),
const SizedBox(height: AppSpacing.md),
_AnalysisCard(
title: l10n.resultAnalysis,
content: widget.data.analysis,
),
const SizedBox(height: AppSpacing.md),
_AnalysisCard(
title: l10n.resultSuggestion,
content: widget.data.suggestion,
),
_FocusPointsCard(points: widget.data.focusPoints),
const SizedBox(height: AppSpacing.md),
Container(
width: double.infinity,
@@ -270,13 +268,16 @@ class _DivinationResultScreenState extends State<DivinationResultScreen> {
),
const SizedBox(height: AppSpacing.md),
_InfoCard(data: widget.data),
const SizedBox(height: AppSpacing.xl),
Text(
l10n.resultHexagramDetail,
style: Theme.of(context).textTheme.titleLarge,
),
const SizedBox(height: AppSpacing.md),
_HexagramDetailCard(data: widget.data),
if (widget.data.isSuccess) ...[
const SizedBox(height: AppSpacing.xl),
Text(
l10n.resultHexagramDetail,
style: Theme.of(context).textTheme.titleLarge,
),
const SizedBox(height: AppSpacing.md),
_HexagramDetailCard(data: widget.data),
] else
_HexagramDetailPlaceholder(status: widget.data.status),
],
),
),
@@ -412,27 +413,6 @@ class _DivinationResultScreenState extends State<DivinationResultScreen> {
}
}
class _ResultHeader extends StatelessWidget {
const _ResultHeader({required this.data});
final DivinationResultData data;
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
return Row(
children: [
Text(
l10n.resultAIAnalysis,
style: Theme.of(
context,
).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.w700),
),
],
);
}
}
class _SignCard extends StatelessWidget {
const _SignCard({super.key, required this.signType});
@@ -543,8 +523,7 @@ class _FocusPointsCard extends StatelessWidget {
Widget build(BuildContext context) {
final colors = Theme.of(context).colorScheme;
final l10n = AppLocalizations.of(context)!;
final languageCode = Localizations.localeOf(context).languageCode;
final title = languageCode == 'en' ? 'Focus Points' : '断卦要点';
final title = l10n.resultFocusPoints;
if (points.isEmpty) {
return const SizedBox.shrink();
}
@@ -572,11 +551,7 @@ class _FocusPointsCard extends StatelessWidget {
const Spacer(),
TextButton(
onPressed: () {
final content = points
.asMap()
.entries
.map((e) => '${e.key + 1}. ${e.value}')
.join('\n');
final content = points.join('\n');
Clipboard.setData(ClipboardData(text: content));
Toast.show(
context,
@@ -589,28 +564,12 @@ class _FocusPointsCard extends StatelessWidget {
],
),
const SizedBox(height: AppSpacing.sm),
...List<Widget>.generate(points.length, (index) {
...points.map((point) {
return Padding(
padding: const EdgeInsets.only(bottom: AppSpacing.xs),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'${index + 1}. ',
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: colors.primary,
fontWeight: FontWeight.w700,
),
),
Expanded(
child: Text(
points[index],
style: Theme.of(
context,
).textTheme.bodyMedium?.copyWith(height: 1.55),
),
),
],
child: Text(
point,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(height: 1.55),
),
);
}),
@@ -781,6 +740,46 @@ class _InfoCard extends StatelessWidget {
}
}
class _HexagramDetailPlaceholder extends StatelessWidget {
const _HexagramDetailPlaceholder({required this.status});
final DivinationRunStatus status;
@override
Widget build(BuildContext context) {
final colors = Theme.of(context).colorScheme;
final l10n = AppLocalizations.of(context)!;
final message = switch (status) {
DivinationRunStatus.failed => l10n.resultHexagramDetailFailed,
DivinationRunStatus.refused => l10n.resultHexagramDetailRefused,
DivinationRunStatus.success => '',
};
return Padding(
padding: const EdgeInsets.only(top: AppSpacing.xl),
child: Card(
margin: EdgeInsets.zero,
color: colors.surfaceContainerHighest,
elevation: 0,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppRadius.md),
),
child: Padding(
padding: const EdgeInsets.all(AppSpacing.xl),
child: Center(
child: Text(
message,
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: colors.onSurfaceVariant,
),
),
),
),
),
);
}
}
class _HexagramDetailCard extends StatelessWidget {
const _HexagramDetailCard({required this.data});