修改 bug

4fc098cd · yueweilu · 56b8833d · 4fc098cd · 4fc098cd · 4fc098cd
--- a/lib/pages/answer/index.dart
+++ b/lib/pages/answer/index.dart
@@ -2,6 +2,7 @@ library answer;

 import 'package:flutter/material.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+import 'package:go_router/go_router.dart';

 import '../../utils/index.dart';


--- a/lib/pages/answer/view.dart
+++ b/lib/pages/answer/view.dart
@@ -27,6 +27,12 @@ class _AnswerPageState extends State<AnswerPage> {
            String str = '$kServerUrl,${widget.params['book_id']},${widget.params['chapter_id']},${widget.params['token']},${widget.params['position']}';
            Console.log('知识测评--------传给前端的参数--------------------------------$str');
            controller.evaluateJavascript(source: 'callbackInFlutterComponent("$str");');
+
+            controller.addJavaScriptHandler(handlerName: 'evaluatingSubmitCallback', callback: (args){
+              Console.log('监听笔记回调------------------------------------------------$args');
+              context.pop();
+              // readController.titleInput.text = args.toString();
+            });
          },
          onConsoleMessage: (controller, consoleMessage) {
            // 接收从 WebView 发送的消息

--- a/lib/pages/bai_dict/view.dart
+++ b/lib/pages/bai_dict/view.dart
@@ -18,7 +18,7 @@ class _BaiKePageState extends State<BaiDictPage> {
    return Scaffold(
      appBar: AppBar(
        centerTitle: false,
-        title: Text('$widget.keyword',style: TextStyle(fontSize: 14.w,fontWeight: Fonts.medium,color: Colours.c3),),
+        title: Text(widget.keyword,style: TextStyle(fontSize: 14.w,fontWeight: Fonts.medium,color: Colours.c3),),
      ),
      body: InAppWebView(
        initialUrlRequest: URLRequest(

--- a/lib/pages/book_detail/view.dart
+++ b/lib/pages/book_detail/view.dart
@@ -87,6 +87,7 @@ class _BookDetailPageState extends State<BookDetailPage> with SingleTickerProvid
              Expanded(
                child: TabBarView(
                  controller: controller.tabController,
+                  physics: const NeverScrollableScrollPhysics(),
                  children: [
                    BookCategoryPage(
                      chapters: controller.chapters,
@@ -129,7 +130,28 @@ class _BookDetailPageState extends State<BookDetailPage> with SingleTickerProvid
                        options: ContextMenuOptions(hideDefaultSystemContextMenuItems: true),
                      ),
                      onWebViewCreated: (InAppWebViewController wcontroller){
-                        wcontroller.loadData(data: controller.bookDetails.content??'',);
+
+                        wcontroller.loadData(data: """
+                        <!DOCTYPE html>
+                        <html lang="zh-CN">
+                        <head>
+                        <meta charset="utf-8" />
+                        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+                        <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" />
+                        <meta http-equiv="Cache-Control" content="no-transform" />
+                        <meta http-equiv="Cache-Control" content="no-siteapp" />
+                        <style>
+                            *{ margin: 0; padding: 5px;}
+                            html{ font-size: 10px;}
+                            body p{ font-size: 1.5rem; line-height:2.4rem;color: #999}
+                            img{ max-width:100%}
+                        </style>
+                        </head>
+                        <body>
+                            ${controller.bookDetails.content}
+                        </body>
+                        </html>
+                        """,);
                      },
                    ),
                    BookInfoPage(model:controller.bookDetails,)

--- a/lib/pages/read_web/widgets/input_discuss.dart
+++ b/lib/pages/read_web/widgets/input_discuss.dart
@@ -140,7 +140,7 @@ class _ReadInputDiscussState extends State<ReadInputDiscuss> {
                                      mainAxisAlignment:MainAxisAlignment.spaceBetween,
                                      children: [
                                        Image.asset('assets/images/audio.png'),
-                                        Text('0:00/1:52',style: TextStyle(fontSize: 10.w,height: 1.4,color: Colours.c9),)
+                                        // Text('0:00/1:52',style: TextStyle(fontSize: 10.w,height: 1.4,color: Colours.c9),)
                                      ],
                                    ),
                                  ),
@@ -173,7 +173,7 @@ class _ReadInputDiscussState extends State<ReadInputDiscuss> {
                        },
                        child: Image.asset('assets/images/read_add_img.png')),
                      Gaps.hGaps10,
-                      GestureDetector(
+                      widget.controller.chatType ==0?const SizedBox():GestureDetector(
                        onTap: () async {
                          if(widget.controller.startRecording){
                            widget.controller.stopRecorder();

--- a/lib/pages/user_notes_des/widgets/list.dart
+++ b/lib/pages/user_notes_des/widgets/list.dart
@@ -28,18 +28,30 @@ class _BuildListPageState extends State<BuildListPage> with AutomaticKeepAliveCl
              NoteModel model = controller.notes[index];
              // 划线
              if(model.types == 1){
-                return  BuildLine(model: model,
+                return  GestureDetector(
+                  // TODO:跳转阅读页对应位置
+                  onTap: () async{
+                    // final result = await context.pushNamed(Routes.web,queryParameters: {'book_id': controller.bookDetails.bookId.toString(),'chapter_id': controller.bookDetails.chapterId.toString(),'chapter_name':controller.bookDetails.chapterName.toString()},extra: controller.bookDetails);
+                  },
+                  child: BuildLine(model: model,
                    onTapDel: (){
                      controller.delNotes(notesId: model.notesId.toString(), bookId:widget.model.bookId.toString());
                    },
+                  ),
                );
              }
              // 高亮
              else if(model.types == 2){
-                return BuildHigh(model: model,
+                return GestureDetector(
+                  // TODO:跳转阅读页对应位置
+                  onTap: (){
+                    // final result = await context.pushNamed(Routes.web,queryParameters: {'book_id': controller.bookDetails.bookId.toString(),'chapter_id': controller.bookDetails.chapterId.toString(),'chapter_name':controller.bookDetails.chapterName.toString()},extra: controller.bookDetails);
+                  },
+                  child: BuildHigh(model: model,
                    onTapDel: (){
                      controller.delNotes(notesId: model.notesId.toString(), bookId:widget.model.bookId.toString());
                    },
+                  ),
                );
              }
              // 笔记