|
@@ -3,21 +3,18 @@ import 'package:electronic_assistant/data/bean/agenda.dart';
|
|
|
import 'package:electronic_assistant/data/bean/chat_item.dart';
|
|
import 'package:electronic_assistant/data/bean/chat_item.dart';
|
|
|
import 'package:electronic_assistant/data/bean/file_chat_item.dart';
|
|
import 'package:electronic_assistant/data/bean/file_chat_item.dart';
|
|
|
import 'package:electronic_assistant/data/bean/reference_chat_item.dart';
|
|
import 'package:electronic_assistant/data/bean/reference_chat_item.dart';
|
|
|
-import 'package:electronic_assistant/module/browser/view.dart';
|
|
|
|
|
import 'package:electronic_assistant/module/chat/controller.dart';
|
|
import 'package:electronic_assistant/module/chat/controller.dart';
|
|
|
import 'package:electronic_assistant/resource/colors.gen.dart';
|
|
import 'package:electronic_assistant/resource/colors.gen.dart';
|
|
|
import 'package:electronic_assistant/resource/string.gen.dart';
|
|
import 'package:electronic_assistant/resource/string.gen.dart';
|
|
|
import 'package:electronic_assistant/utils/expand.dart';
|
|
import 'package:electronic_assistant/utils/expand.dart';
|
|
|
|
|
+import 'package:electronic_assistant/widget/gradually_md_text.dart';
|
|
|
import 'package:flutter/cupertino.dart';
|
|
import 'package:flutter/cupertino.dart';
|
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter/material.dart';
|
|
|
import 'package:flutter/services.dart';
|
|
import 'package:flutter/services.dart';
|
|
|
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
|
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
|
|
-import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
|
|
|
|
|
import 'package:get/get.dart';
|
|
import 'package:get/get.dart';
|
|
|
import 'package:lottie/lottie.dart';
|
|
import 'package:lottie/lottie.dart';
|
|
|
-import 'package:markdown/markdown.dart' as md;
|
|
|
|
|
import 'package:pull_to_refresh/pull_to_refresh.dart';
|
|
import 'package:pull_to_refresh/pull_to_refresh.dart';
|
|
|
-
|
|
|
|
|
import '../../data/bean/progressing_chat_item.dart';
|
|
import '../../data/bean/progressing_chat_item.dart';
|
|
|
import '../../data/bean/talks.dart';
|
|
import '../../data/bean/talks.dart';
|
|
|
import '../../resource/assets.gen.dart';
|
|
import '../../resource/assets.gen.dart';
|
|
@@ -255,26 +252,27 @@ class ChatPage extends BasePage<ChatController> {
|
|
|
child: IntrinsicWidth(
|
|
child: IntrinsicWidth(
|
|
|
child: progressingChatItem == null
|
|
child: progressingChatItem == null
|
|
|
? _buildAssistantChatItemContent(
|
|
? _buildAssistantChatItemContent(
|
|
|
- null, chatItem.content, chatItem.id)
|
|
|
|
|
|
|
+ null, null, chatItem.content, chatItem.id)
|
|
|
: Obx(() {
|
|
: Obx(() {
|
|
|
bool? isStreamStarted = progressingChatItem == null
|
|
bool? isStreamStarted = progressingChatItem == null
|
|
|
? null
|
|
? null
|
|
|
- : progressingChatItem.streamContent.isNotEmpty ||
|
|
|
|
|
|
|
+ : progressingChatItem.isGradually.value ||
|
|
|
progressingChatItem.isFinished.value ||
|
|
progressingChatItem.isFinished.value ||
|
|
|
progressingChatItem.isFailed.value;
|
|
progressingChatItem.isFailed.value;
|
|
|
return _buildAssistantChatItemContent(
|
|
return _buildAssistantChatItemContent(
|
|
|
isStreamStarted,
|
|
isStreamStarted,
|
|
|
|
|
+ progressingChatItem?.graduallyController,
|
|
|
progressingChatItem!.isFailed.value
|
|
progressingChatItem!.isFailed.value
|
|
|
? progressingChatItem.error.value
|
|
? progressingChatItem.error.value
|
|
|
- : progressingChatItem.streamContent.value,
|
|
|
|
|
|
|
+ : chatItem.content,
|
|
|
chatItem.id);
|
|
chatItem.id);
|
|
|
}),
|
|
}),
|
|
|
),
|
|
),
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- Widget _buildAssistantChatItemContent(
|
|
|
|
|
- bool? isStreamStarted, String content, String id) {
|
|
|
|
|
|
|
+ Widget _buildAssistantChatItemContent(bool? isStreamStarted,
|
|
|
|
|
+ GraduallyController? graduallyController, String? content, String id) {
|
|
|
return Column(
|
|
return Column(
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
children: [
|
|
children: [
|
|
@@ -321,77 +319,12 @@ class ChatPage extends BasePage<ChatController> {
|
|
|
constraints: BoxConstraints(
|
|
constraints: BoxConstraints(
|
|
|
maxWidth: 0.78.sw,
|
|
maxWidth: 0.78.sw,
|
|
|
),
|
|
),
|
|
|
- child: SelectionArea(
|
|
|
|
|
- child: HtmlWidget(
|
|
|
|
|
- onTapUrl: (url) {
|
|
|
|
|
- BrowserPage.start(url);
|
|
|
|
|
- return true;
|
|
|
|
|
- },
|
|
|
|
|
- md.markdownToHtml(content, inlineSyntaxes: [
|
|
|
|
|
- md.InlineHtmlSyntax(),
|
|
|
|
|
- md.StrikethroughSyntax(),
|
|
|
|
|
- md.EmojiSyntax(),
|
|
|
|
|
- md.ColorSwatchSyntax(),
|
|
|
|
|
- md.AutolinkExtensionSyntax(),
|
|
|
|
|
- md.ImageSyntax()
|
|
|
|
|
- ], blockSyntaxes: [
|
|
|
|
|
- const md.FencedCodeBlockSyntax(),
|
|
|
|
|
- const md.HeaderWithIdSyntax(),
|
|
|
|
|
- const md.SetextHeaderWithIdSyntax(),
|
|
|
|
|
- const md.UnorderedListWithCheckboxSyntax(),
|
|
|
|
|
- const md.OrderedListWithCheckboxSyntax(),
|
|
|
|
|
- const md.FootnoteDefSyntax(),
|
|
|
|
|
- const md.AlertBlockSyntax(),
|
|
|
|
|
- ]),
|
|
|
|
|
|
|
+ child: GraduallyMdText(
|
|
|
|
|
+ initTxt: content,
|
|
|
|
|
+ graduallyController: graduallyController,
|
|
|
textStyle: TextStyle(
|
|
textStyle: TextStyle(
|
|
|
- fontSize: 14.w, color: ColorName.primaryTextColor),
|
|
|
|
|
- ),
|
|
|
|
|
- ),
|
|
|
|
|
|
|
+ fontSize: 14.w, color: ColorName.primaryTextColor)),
|
|
|
),
|
|
),
|
|
|
- // Container(
|
|
|
|
|
- // padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 8.h),
|
|
|
|
|
- // alignment: Alignment.centerLeft,
|
|
|
|
|
- // constraints: BoxConstraints(
|
|
|
|
|
- // maxWidth: 0.78.sw,
|
|
|
|
|
- // ),
|
|
|
|
|
- // decoration: BoxDecoration(
|
|
|
|
|
- // border: isStreamStarted == null || isStreamStarted == true
|
|
|
|
|
- // ? null
|
|
|
|
|
- // : Border.all(color: ColorName.colorPrimary, width: 1.w),
|
|
|
|
|
- // color: ColorName.white,
|
|
|
|
|
- // borderRadius: BorderRadius.only(
|
|
|
|
|
- // topRight: Radius.circular(20.w),
|
|
|
|
|
- // bottomRight: Radius.circular(20.w),
|
|
|
|
|
- // bottomLeft: Radius.circular(20.w))),
|
|
|
|
|
- // child: isStreamStarted != null && isStreamStarted == false
|
|
|
|
|
- // ? Lottie.asset("assets/anim/anim_chat_response_loading.zip",
|
|
|
|
|
- // width: 46.w, height: 20.w)
|
|
|
|
|
- // : SelectionArea(
|
|
|
|
|
- // child: HtmlWidget(
|
|
|
|
|
- // onTapUrl: (url) {
|
|
|
|
|
- // BrowserPage.start(url);
|
|
|
|
|
- // return true;
|
|
|
|
|
- // },
|
|
|
|
|
- // md.markdownToHtml(content, inlineSyntaxes: [
|
|
|
|
|
- // md.InlineHtmlSyntax(),
|
|
|
|
|
- // md.StrikethroughSyntax(),
|
|
|
|
|
- // md.EmojiSyntax(),
|
|
|
|
|
- // md.ColorSwatchSyntax(),
|
|
|
|
|
- // md.AutolinkExtensionSyntax(),
|
|
|
|
|
- // md.ImageSyntax()
|
|
|
|
|
- // ], blockSyntaxes: [
|
|
|
|
|
- // const md.FencedCodeBlockSyntax(),
|
|
|
|
|
- // const md.HeaderWithIdSyntax(),
|
|
|
|
|
- // const md.SetextHeaderWithIdSyntax(),
|
|
|
|
|
- // const md.UnorderedListWithCheckboxSyntax(),
|
|
|
|
|
- // const md.OrderedListWithCheckboxSyntax(),
|
|
|
|
|
- // const md.FootnoteDefSyntax(),
|
|
|
|
|
- // const md.AlertBlockSyntax(),
|
|
|
|
|
- // ]),
|
|
|
|
|
- // textStyle: TextStyle(
|
|
|
|
|
- // fontSize: 14.w, color: ColorName.primaryTextColor),
|
|
|
|
|
- // ),
|
|
|
|
|
- // )),
|
|
|
|
|
Obx(() {
|
|
Obx(() {
|
|
|
return Visibility(
|
|
return Visibility(
|
|
|
visible: id == controller.chatAiTagId.value,
|
|
visible: id == controller.chatAiTagId.value,
|