合并分支 'test' 到 'sim'

lib/pages/answer/view.dart

@@ -13,6 +13,13 @@ class AnswerPage extends StatefulWidget {
 }
 
 class _AnswerPageState extends State<AnswerPage> {
+
+  @override
+  void dispose() {
+    CustomToast.dismiss();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(

lib/pages/course/widgets/book.dart

@@ -45,7 +45,7 @@ class Book extends StatelessWidget {
               children: [
                 Text(model.bookName??'',style: TextStyle(fontSize: 15.w,color: Colours.c3),maxLines: 1,overflow: TextOverflow.ellipsis,),
                 SizedBox(height: 6.w,),
-                Text(model.authors ??'',style: TextStyle(fontSize:12.w,height: 1.3,color: Colours.c6,),textAlign: TextAlign.left,),
+                Text(model.authors ??'',style: TextStyle(fontSize:12.w,height: 1.3,color: Colours.c6,),textAlign: TextAlign.left,maxLines: 1,overflow: TextOverflow.ellipsis),
               ],
             ),
           ),

lib/pages/read_info/view.dart

@@ -41,6 +41,11 @@ class _ReadInfoPageState extends State<ReadInfoPage> {
               Console.log('监听图片预览---------------给页面传参---------------------------------$params');
               context.pushNamed(Routes.scaleImage,queryParameters: params);
             });
+            // 扩展阅读内的链接跳页
+            controller.addJavaScriptHandler(handlerName: 'openLinkCallback', callback: (args){
+              Console.log('监听外部链接------------------------------------------------$args');
+              context.pushNamed(Routes.link,queryParameters: {'url': args.first.toString()});
+            });
           },
 
           onConsoleMessage: (controller, consoleMessage) {

lib/pages/read_web/controller.dart

@@ -142,6 +142,7 @@ class ReadController extends FullLifeCycleController with GetSingleTickerProvide
     contentInput.dispose();
     flutterTts.stop();
     searchInput.dispose();
+    CustomToast.dismiss();
     _mRecorder.closeRecorder();
     // 关闭防截屏
     // await ScreenProtector.preventScreenshotOff();
@@ -928,8 +929,11 @@ class ReadController extends FullLifeCycleController with GetSingleTickerProvide
 
   /// 添加阅读时长
   void _addReadTime({required type}) async{
+    final status = await Tools.checkCurrentNetStatus();
+    if(status){
       LibraryAPI.addReadTime(bookId: bookId, readTypes: type);
     }
+  }
   /// 获取离线文件路径
   void getBookDown() async{
     final exit = await _isExistFile(bookId);

lib/pages/read_web/discuss_controller.dart

@@ -131,7 +131,14 @@ class DiscussController extends GetxController {
       tempModel.content= contentModel;
       tempModel.content?.text?.privacyStatus = 1;
       tempModel.replacePersonName = discussModel.personName;
-      tempModel.replacePersonPic = discussModel.personPic;
+
+      Map<String,dynamic> map = jsonDecode(StorageService.to.getString(kLocalUserInfo));
+      if (map.keys.contains('head_img')){
+        tempModel.personPic = map['head_img'];
+      }
+      if (map.keys.contains('name')){
+        tempModel.personName = map['name'];
+      }
       tempModel.replyNum = 0;
       fatherDiscussModel.commentAll?.add(tempModel);
       // fatherDiscussModel.replyNum = fatherDiscussModel.commentAll?.length;

lib/pages/read_web/index.dart

@@ -33,6 +33,7 @@ import 'package:sqflite/sqflite.dart';
 import '../../apis/index.dart';
 import '../../models/index.dart';
 import '../../routes/index.dart';
+import '../../services/index.dart';
 import '../../store/index.dart';
 import '../../widgets/index.dart';
 import '../book_category/index.dart';

lib/pages/user_discuss_des/controller.dart

@@ -89,7 +89,14 @@ class UserDiscussDesController extends GetxController {
       tempModel.content= contentModel;
       tempModel.content?.text?.privacyStatus = 1;
       tempModel.replacePersonName = discussModel.personName;
-      tempModel.replacePersonPic = discussModel.personPic;
+
+      Map<String,dynamic> map = jsonDecode(StorageService.to.getString(kLocalUserInfo));
+      if (map.keys.contains('head_img')){
+        tempModel.personPic = map['head_img'];
+      }
+      if (map.keys.contains('name')){
+        tempModel.personName = map['name'];
+      }
       tempModel.replyNum = 0;
       fatherDiscussModel.commentAll?.add(tempModel);
       // fatherDiscussModel.replyNum = fatherDiscussModel.commentAll?.length;

lib/pages/user_discuss_des/index.dart

@@ -13,6 +13,7 @@ import 'package:go_router/go_router.dart';
 import '../../apis/index.dart';
 import '../../models/index.dart';
 import '../../routes/index.dart';
+import '../../services/index.dart';
 import '../../theme.dart';
 import '../../utils/index.dart';
 import '../read_web/index.dart';

lib/pages/user_gender/controller.dart

@@ -11,6 +11,11 @@ class UserGenderController extends GetxController {
     if (result) {
       Toast.show('修改成功');
       userInfo.sex = sex ;
+      Map<String,dynamic> map = jsonDecode(StorageService.to.getString(kLocalUserInfo));
+      if (map.keys.contains('sex')){
+        map['sex'] = sex;
+        await StorageService.to.setString(kLocalUserInfo, jsonEncode(map));
+      }
       update();
     }
   }

lib/pages/user_gender/index.dart

 library user_gender;
 
+import 'dart:convert';
 import 'dart:ffi';
 
 import 'package:flutter/material.dart';
@@ -13,6 +14,7 @@ import 'package:go_router/go_router.dart';
 
 import '../../apis/index.dart';
 import '../../models/index.dart';
+import '../../services/index.dart';
 
 part 'view.dart';
 part 'controller.dart';
\ No newline at end of file

lib/pages/user_info/controller.dart

@@ -28,6 +28,11 @@ class UserInfoController extends GetxController {
     if(result){
       Toast.show('修改成功');
       userInfo.headImg = img;
+      Map<String,dynamic> map = jsonDecode(StorageService.to.getString(kLocalUserInfo));
+      if (map.keys.contains('head_img')){
+        map['head_img'] = img;
+        await StorageService.to.setString(kLocalUserInfo, jsonEncode(map));
+      }
       update();
       Get.put(MineController()).getInfo();
     }

lib/pages/user_info/index.dart

 library user_info;
 
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_book/pages/mine/index.dart';
 import 'package:flutter_book/theme.dart';
@@ -14,6 +16,7 @@ import 'package:image_picker/image_picker.dart';
 import '../../apis/index.dart';
 import '../../models/index.dart';
 import '../../routes/index.dart';
+import '../../services/index.dart';
 
 part 'view.dart';
 part 'controller.dart';
\ No newline at end of file

lib/pages/user_nick/controller.dart

@@ -10,7 +10,14 @@ class UserNickController extends GetxController {
     final result = await MineAPI.changeInfo(name: nick);
     if (result) {
       Toast.show('修改成功');
+
       userInfo.name = nick ;
+
+      Map<String,dynamic> map = jsonDecode(StorageService.to.getString(kLocalUserInfo));
+      if (map.keys.contains('name')){
+        map['name'] = nick;
+        await StorageService.to.setString(kLocalUserInfo, jsonEncode(map));
+      }
       update();
       Get.put(MineController()).getInfo();
     }

lib/pages/user_nick/index.dart

 library user_nick;
 
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_book/theme.dart';
 import 'package:flutter_book/utils/index.dart';
@@ -10,6 +12,7 @@ import 'package:get/get_state_manager/src/simple/get_controllers.dart';
 
 import '../../apis/index.dart';
 import '../../models/index.dart';
+import '../../services/index.dart';
 import '../mine/index.dart';
 import '../user_gender/index.dart';
 

lib/widgets/image.dart

@@ -111,7 +111,7 @@ class CustomImage extends StatelessWidget {
   Widget build(BuildContext context) {
     final borderRadius = BorderRadius.all(Radius.circular(radius ?? 3));
     final Widget errorChild =
-        error ?? const Icon(Icons.image_not_supported_outlined);
+        error ?? placeholder ?? const CupertinoActivityIndicator(radius: 12);
     final Widget placeholderChild =
         placeholder ?? const CupertinoActivityIndicator(radius: 12);
     Widget? image;