Merge branch 'main' into fix

android/app/src/main/AndroidManifest.xml

@@ -12,7 +12,6 @@
             <category android:name="android.intent.category.BROWSABLE" />
             <data android:scheme="https" />
         </intent>
-
     </queries>
     <queries>
         <intent>
@@ -20,7 +19,6 @@
                 "android.support.customtabs.action.CustomTabsService" />
         </intent>
     </queries>
-
     <queries>
         <!-- If your app checks for http support -->
         <intent>
@@ -34,7 +32,6 @@
             <data android:scheme="https" />
         </intent>
     </queries>
-
     <application
         android:label="PiliPala"
         android:name="${applicationName}"
@@ -144,102 +141,55 @@
                 <data android:scheme="bilibili" android:host="assistant" />
                 <data android:scheme="bilibili" android:host="feedback" />
                 <data android:scheme="bilibili" android:host="auth" android:path="/launch" />
-
-                <data android:scheme="http" android:host="live.bilibili.com"
-                    android:pathPattern="/live/.*" />
                 <data android:scheme="https" android:host="live.bilibili.com"
                     android:pathPattern="/live/.*" />
-                    <data android:scheme="http" android:host="www.bilibili.com"
-                    android:pathPattern="/video/.*" />
                 <data android:scheme="https" android:host="www.bilibili.com"
                     android:pathPattern="/video/.*" />
-                <data android:scheme="http" android:host="www.bilibili.tv"
-                    android:pathPattern="/video/.*" />
                 <data android:scheme="https" android:host="www.bilibili.tv"
                     android:pathPattern="/video/.*" />
-                <data android:scheme="http" android:host="www.bilibili.cn"
-                    android:pathPattern="/video/.*" />
                 <data android:scheme="https" android:host="www.bilibili.cn"
                     android:pathPattern="/video/.*" />
-                <data android:scheme="http" android:host="www.bilibili.com"
-                    android:pathPattern="/mobile/video/.*" />
                 <data android:scheme="https" android:host="www.bilibili.com"
                     android:pathPattern="/mobile/video/.*" />
-                <data android:scheme="http" android:host="m.bilibili.com"
-                    android:pathPattern="/video/.*" />
                 <data android:scheme="https" android:host="m.bilibili.com"
                     android:pathPattern="/video/.*" />
-                <data android:scheme="http" android:host="www.bilibili.com"
-                    android:pathPattern="/story/.*" />
                 <data android:scheme="https" android:host="www.bilibili.com"
                     android:pathPattern="/story/.*" />
-                <data android:scheme="http" android:host="www.bilibili.com"
-                    android:pathPattern="/bangumi/i/.*" />
                 <data android:scheme="https" android:host="www.bilibili.com"
                     android:pathPattern="/bangumi/i/.*" />
-                <data android:scheme="http" android:host="www.bilibili.com"
-                    android:pathPattern="/mobile/bangumi/i/.*" />
                 <data android:scheme="https" android:host="www.bilibili.com"
                     android:pathPattern="/mobile/bangumi/i/.*" />
-                <data android:scheme="http" android:host="bangumi.bilibili.com"
-                    android:pathPattern="/.*" />
                 <data android:scheme="https" android:host="bangumi.bilibili.com"
                     android:pathPattern="/.*" />
-                <data android:scheme="http" android:host="www.bilibili.com"
-                    android:pathPattern="/bangumi/.*" />
                 <data android:scheme="https" android:host="www.bilibili.com"
                     android:pathPattern="/bangumi/.*" />
-                <data android:scheme="http" android:host="m.bilibili.com"
-                    android:pathPattern="/bangumi/.*" />
                 <data android:scheme="https" android:host="m.bilibili.com"
                     android:pathPattern="/bangumi/.*" />
-                <data android:scheme="http" android:host="www.bilibili.com"
-                    android:pathPattern="/cheese/play/ss.*" />
                 <data android:scheme="https" android:host="www.bilibili.com"
                     android:pathPattern="/cheese/play/ss.*" />
-                <data android:scheme="http" android:host="www.bilibili.com"
-                    android:pathPattern="/cheese/play/ep.*" />
                 <data android:scheme="https" android:host="www.bilibili.com"
                     android:pathPattern="/cheese/play/ep.*" />
-                <data android:scheme="http" android:host="m.bilibili.com"
-                    android:pathPattern="/bangumi/play/ss.*" />
                 <data android:scheme="https" android:host="m.bilibili.com"
                     android:pathPattern="/cheese/play/ss.*" />
-                <data android:scheme="http" android:host="m.bilibili.com"
-                    android:pathPattern="/cheese/play/ep.*" />
                 <data android:scheme="https" android:host="m.bilibili.com"
                     android:pathPattern="/cheese/play/ep.*" />
-                <data android:scheme="http" android:host="www.bilibili.com"
-                    android:pathPattern="/read/cv.*" />
                 <data android:scheme="https" android:host="www.bilibili.com"
                     android:pathPattern="/read/cv.*" />
-                <data android:scheme="http" android:host="www.bilibili.com" android:path="/review/" />
                 <data android:scheme="https" android:host="www.bilibili.com" android:path="/review/" />
-                <data android:scheme="http" android:host="bilibili.cn"
-                    android:pathPattern="/video/.*" />
                 <data android:scheme="https" android:host="bilibili.cn"
                     android:pathPattern="/video/.*" />
-                <data android:scheme="http" android:host="bilibili.com"
-                    android:pathPattern="/video/.*" />
                 <data android:scheme="https" android:host="bilibili.com"
                     android:pathPattern="/video/.*" />
-                <data android:scheme="http" android:host="www.bilibili.cn"
-                    android:pathPattern="/video/.*" />
                 <data android:scheme="https" android:host="www.bilibili.cn"
                     android:pathPattern="/video/.*" />
-                <data android:scheme="http" android:host="www.bilibili.com"
-                    android:pathPattern="/video/.*" />
                 <data android:scheme="https" android:host="www.bilibili.com"
                     android:pathPattern="/video/.*" />
-                <data android:scheme="http" android:host="www.bilibili.com"
-                    android:pathPattern="/mobile/video/.*" />
                 <data android:scheme="https" android:host="www.bilibili.com"
                     android:pathPattern="/mobile/video/.*" />
                 <data android:scheme="https" android:host="b23.tv"
                     android:pathPattern="/*" />
                 <data android:scheme="https" android:host="space.bilibili.com"
                     android:pathPattern="/*" />
-
             </intent-filter>
         </activity>
         <service 
@@ -251,7 +201,6 @@
                 <action android:name="android.media.browse.MediaBrowserService" />
             </intent-filter>
         </service>
-
         <receiver 
             android:name="com.ryanheise.audioservice.MediaButtonReceiver"
             android:exported="true" 
@@ -259,7 +208,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>
-        </receiver> 
+        </receiver>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
@@ -281,4 +230,4 @@
       -->
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
-</manifest>
+</manifest>

ios/Podfile.lock

@@ -1,8 +1,6 @@
 PODS:
   - app_links (0.0.2):
     - Flutter
-  - appscheme (1.0.4):
-    - Flutter
   - audio_service (0.0.1):
     - Flutter
   - audio_session (0.0.1):
@@ -71,7 +69,6 @@ PODS:
 
 DEPENDENCIES:
   - app_links (from `.symlinks/plugins/app_links/ios`)
-  - appscheme (from `.symlinks/plugins/appscheme/ios`)
   - audio_service (from `.symlinks/plugins/audio_service/ios`)
   - audio_session (from `.symlinks/plugins/audio_session/ios`)
   - auto_orientation (from `.symlinks/plugins/auto_orientation/ios`)
@@ -110,8 +107,6 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   app_links:
     :path: ".symlinks/plugins/app_links/ios"
-  appscheme:
-    :path: ".symlinks/plugins/appscheme/ios"
   audio_service:
     :path: ".symlinks/plugins/audio_service/ios"
   audio_session:
@@ -171,7 +166,6 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   app_links: e7a6750a915a9e161c58d91bc610e8cd1d4d0ad0
-  appscheme: b1c3f8862331cb20430cf9e0e4af85dbc1572ad8
   audio_service: f509d65da41b9521a61f1c404dd58651f265a567
   audio_session: 4f3e461722055d21515cf3261b64c973c062f345
   auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d

lib/common/pages_bottom_sheet.dart

@@ -408,17 +408,29 @@ class TitleBar extends StatelessWidget {
       toolbarHeight: 45,
       automaticallyImplyLeading: false,
       centerTitle: false,
-      title: Text(
+      elevation: 1,
-        title,
+      scrolledUnderElevation: 1,
-        style: Theme.of(context).textTheme.titleMedium,
+      title: Padding(
+        padding: const EdgeInsets.only(left: 12),
+        child: Text(
+          title,
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
       ),
       actions: !isFullScreen
           ? [
-              IconButton(
+              SizedBox(
-                icon: const Icon(Icons.close, size: 20),
+                width: 35,
-                onPressed: () => Navigator.pop(context),
+                height: 35,
+                child: IconButton(
+                  icon: const Icon(Icons.close, size: 20),
+                  style: ButtonStyle(
+                    padding: MaterialStateProperty.all(EdgeInsets.zero),
+                  ),
+                  onPressed: () => Navigator.pop(context),
+                ),
               ),
-              const SizedBox(width: 14),
+              const SizedBox(width: 8),
             ]
           : null,
     );
@@ -479,7 +491,7 @@ class EpisodeListItem extends StatelessWidget {
       dense: false,
       leading: isCurrentIndex
           ? Image.asset(
-              'assets/images/live.gif',
+              'assets/images/live.png',
               color: primary,
               height: 12,
             )

lib/http/danmaku.dart

@@ -17,7 +17,9 @@ class DanmakaHttp {
     var response = await Request().get(
       Api.webDanmaku,
       data: params,
-      extra: {'resType': ResponseType.bytes},
+      options: Options(
+        responseType: ResponseType.bytes,
+      ),
     );
     return DmSegMobileReply.fromBuffer(response.data);
   }

lib/http/init.dart

@@ -209,24 +209,12 @@ class Request {
    */
   get(url, {data, Options? options, cancelToken, extra}) async {
     Response response;
-    options ??= Options(); // 如果 options 为 null，则初始化一个新的 Options 对象
-    ResponseType resType = ResponseType.json;
-
     if (extra != null) {
-      resType = extra['resType'] ?? ResponseType.json;
       if (extra['ua'] != null) {
-        options.headers = {'user-agent': headerUa(type: extra['ua'])};
+        options ??= Options();
-      }
+        options.headers!['user-agent'] = headerUa(type: extra['ua']);
-      if (extra['opus-goback'] != null) {
-        if (extra['opus-goback'] != null) {
-          String cookieHeader = dio.options.headers['cookie'];
-          options.headers!['cookie'] =
-              '$cookieHeader; opus-goback = ${extra['opus-goback']}';
-        }
       }
     }
-    options.responseType = resType;
-
     try {
       response = await dio.get(
         url,

lib/http/read.dart

@@ -65,7 +65,12 @@ class ReadHttp {
   static Future parseArticleCv({required String id}) async {
     var res = await Request().get(
       'https://www.bilibili.com/read/cv$id',
-      extra: {'ua': 'pc', 'opus-goback': '1'},
+      extra: {'ua': 'pc'},
+      options: Options(
+        headers: {
+          'cookie': 'opus-goback=1',
+        },
+      ),
     );
     String scriptContent =
         extractScriptContents(parse(res.data).body!.outerHtml)[0];

lib/main.dart

@@ -222,13 +222,27 @@ class BuildMainApp extends StatelessWidget {
       elevation: 20,
     );
 
-    return GetMaterialApp(
+    AppBarTheme appBarTheme(ColorScheme colorScheme) {
-      title: 'PiliPala',
+      return AppBarTheme(
-      theme: ThemeData(
+        backgroundColor: currentThemeValue == ThemeType.dark
-        colorScheme: currentThemeValue == ThemeType.dark
+            ? darkColorScheme.surface
-            ? darkColorScheme
+            : lightColorScheme.surface,
-            : lightColorScheme,
+        foregroundColor: currentThemeValue == ThemeType.dark
+            ? darkColorScheme.onSurface
+            : lightColorScheme.onSurface,
+        elevation: 0,
+        titleSpacing: 0,
+        scrolledUnderElevation: 0,
+        // titleTextStyle: TextStyle(
+        //     fontSize: Theme.of(context).textTheme.titleLarge!.fontSize),
+      );
+    }
+
+    ThemeData buildThemeData(ColorScheme colorScheme) {
+      return ThemeData(
+        colorScheme: colorScheme,
         snackBarTheme: snackBarTheme,
+        appBarTheme: appBarTheme(colorScheme),
         pageTransitionsTheme: const PageTransitionsTheme(
           builders: <TargetPlatform, PageTransitionsBuilder>{
             TargetPlatform.android: ZoomPageTransitionsBuilder(
@@ -236,12 +250,20 @@ class BuildMainApp extends StatelessWidget {
             ),
           },
         ),
+      );
+    }
+
+    return GetMaterialApp(
+      title: 'PiliPala',
+      theme: buildThemeData(
+        currentThemeValue == ThemeType.dark
+            ? darkColorScheme
+            : lightColorScheme,
       ),
-      darkTheme: ThemeData(
+      darkTheme: buildThemeData(
-        colorScheme: currentThemeValue == ThemeType.light
+        currentThemeValue == ThemeType.light
             ? lightColorScheme
             : darkColorScheme,
-        snackBarTheme: snackBarTheme,
       ),
       localizationsDelegates: const [
         GlobalCupertinoLocalizations.delegate,

lib/models/video/reply/item.dart

@@ -125,6 +125,7 @@ class ReplyControl {
     this.upLike,
     this.isShow,
     this.entryText,
+    this.entryTextNum,
     this.titleText,
     this.time,
     this.location,
@@ -135,6 +136,7 @@ class ReplyControl {
   bool? upLike;
   bool? isShow;
   String? entryText;
+  int? entryTextNum;
   String? titleText;
   String? time;
   String? location;
@@ -155,6 +157,10 @@ class ReplyControl {
     }
 
     entryText = json['sub_reply_entry_text'];
+    // 正则匹配
+    entryTextNum = json['sub_reply_entry_text'] != null
+        ? int.parse(RegExp(r"\d+").stringMatch(json['sub_reply_entry_text']!)!)
+        : 0;
     titleText = json['sub_reply_title_text'];
     time = json['time_desc'];
     location = json['location'] != null ? json['location'].split('：')[1] : '';

lib/pages/about/index.dart

@@ -39,9 +39,7 @@ class _AboutPageState extends State<AboutPage> {
     TextStyle subTitleStyle =
         TextStyle(fontSize: 13, color: Theme.of(context).colorScheme.outline);
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('关于')),
-        title: Text('关于', style: Theme.of(context).textTheme.titleMedium),
-      ),
       body: SingleChildScrollView(
         child: Column(
           children: [

lib/pages/blacklist/index.dart

@@ -55,14 +55,9 @@ class _BlackListPageState extends State<BlackListPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        elevation: 0,
-        scrolledUnderElevation: 0,
-        titleSpacing: 0,
-        centerTitle: false,
         title: Obx(
           () => Text(
             '黑名单管理 ${_blackListController.total.value == 0 ? '' : '- ${_blackListController.total.value}'}',
-            style: Theme.of(context).textTheme.titleMedium,
           ),
         ),
       ),

lib/pages/dynamics/detail/controller.dart

@@ -123,4 +123,15 @@ class DynamicDetailController extends GetxController {
   Future onLoad() async {
     queryReplyList(reqType: 'onLoad');
   }
+
+  Future removeReply(int? rpid, int? frpid) async {
+    // 移除一楼评论
+    if (rpid != null) {
+      replyList.removeWhere((item) {
+        return item.rpid == rpid;
+      });
+    }
+
+    /// TODO 移除二楼评论
+  }
 }

lib/pages/dynamics/detail/view.dart

@@ -111,14 +111,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
     int rpid = replyItem.rpid!;
     Get.to(
       () => Scaffold(
-        appBar: AppBar(
+        appBar: AppBar(title: const Text('评论详情')),
-          titleSpacing: 0,
-          centerTitle: false,
-          title: Text(
-            '评论详情',
-            style: Theme.of(context).textTheme.titleMedium,
-          ),
-        ),
         body: VideoReplyReplyPanel(
           oid: oid,
           rpid: rpid,
@@ -192,10 +185,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        elevation: 0,
         scrolledUnderElevation: 1,
-        centerTitle: false,
-        titleSpacing: 0,
         title: StreamBuilder(
           stream: titleStreamC.stream,
           initialData: false,
@@ -335,6 +325,8 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                                             .replies!
                                             .add(replyItem);
                                       },
+                                      onDelete:
+                                          _dynamicDetailController.removeReply,
                                     );
                                   }
                                 },

lib/pages/dynamics/view.dart

@@ -78,8 +78,6 @@ class _DynamicsPageState extends State<DynamicsPage>
     super.build(context);
     return Scaffold(
       appBar: AppBar(
-        elevation: 0,
-        scrolledUnderElevation: 0,
         title: SizedBox(
           height: 34,
           child: Stack(

lib/pages/fan/view.dart

@@ -49,13 +49,8 @@ class _FansPageState extends State<FansPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        elevation: 0,
-        scrolledUnderElevation: 0,
-        centerTitle: false,
-        titleSpacing: 0,
         title: Text(
           _fansController.isOwner.value ? '我的粉丝' : '${_fansController.name}的粉丝',
-          style: Theme.of(context).textTheme.titleMedium,
         ),
       ),
       body: RefreshIndicator(

lib/pages/fav/view.dart

@@ -40,11 +40,8 @@ class _FavPageState extends State<FavPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        centerTitle: false,
-        titleSpacing: 0,
         title: Obx(() => Text(
               '${_favController.isOwner.value ? '我' : 'Ta'}的收藏',
-              style: Theme.of(context).textTheme.titleMedium,
             )),
         actions: [
           Obx(() => !_favController.isOwner.value

lib/pages/fav_edit/view.dart

@@ -19,8 +19,6 @@ class _FavEditPageState extends State<FavEditPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        elevation: 0,
-        scrolledUnderElevation: 0,
         title: Obx(
           () => _favEditController.type.value == 'add'
               ? Text(
@@ -32,7 +30,6 @@ class _FavEditPageState extends State<FavEditPage> {
                   style: Theme.of(context).textTheme.titleMedium,
                 ),
         ),
-        centerTitle: false,
         actions: [
           Obx(
             () => _favEditController.privacy.value == 0

lib/pages/fav_search/view.dart

@@ -47,7 +47,6 @@ class _FavSearchPageState extends State<FavSearchPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        titleSpacing: 0,
         actions: [
           IconButton(
               onPressed: () => _favSearchCtr.submit(),

lib/pages/follow/view.dart

@@ -27,15 +27,10 @@ class _FollowPageState extends State<FollowPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        elevation: 0,
-        scrolledUnderElevation: 0,
-        titleSpacing: 0,
-        centerTitle: false,
         title: Text(
           _followController.isOwner.value
               ? '我的关注'
               : '${_followController.name}的关注',
-          style: Theme.of(context).textTheme.titleMedium,
         ),
         actions: [
           IconButton(

lib/pages/follow_search/view.dart

@@ -47,7 +47,6 @@ class _FollowSearchPageState extends State<FollowSearchPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        titleSpacing: 0,
         actions: [
           IconButton(
             onPressed: reRequest,

lib/pages/history/view.dart

@@ -69,12 +69,7 @@ class _HistoryPageState extends State<HistoryPage> {
       appBar: AppBarWidget(
         visible: _historyController.enableMultiple.value,
         child1: AppBar(
-          titleSpacing: 0,
+          title: const Text('观看记录'),
-          centerTitle: false,
-          title: Text(
-            '观看记录',
-            style: Theme.of(context).textTheme.titleMedium,
-          ),
           actions: [
             IconButton(
               onPressed: () => Get.toNamed('/historySearch'),
@@ -127,8 +122,6 @@ class _HistoryPageState extends State<HistoryPage> {
           ],
         ),
         child2: AppBar(
-          titleSpacing: 0,
-          centerTitle: false,
           leading: IconButton(
             onPressed: () {
               _historyController.enableMultiple.value = false;
@@ -143,7 +136,6 @@ class _HistoryPageState extends State<HistoryPage> {
           title: Obx(
             () => Text(
               '已选择${_historyController.checkedCount.value}项',
-              style: Theme.of(context).textTheme.titleMedium,
             ),
           ),
           actions: [

lib/pages/history_search/view.dart

@@ -45,7 +45,6 @@ class _HistorySearchPageState extends State<HistorySearchPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        titleSpacing: 0,
         actions: [
           IconButton(
               onPressed: () => _hisCtr.submit(),

lib/pages/home/view.dart

@@ -54,7 +54,6 @@ class _HomePageState extends State<HomePage>
       backgroundColor: Colors.transparent,
       appBar: AppBar(
         toolbarHeight: 0,
-        elevation: 0,
         backgroundColor: Colors.transparent,
         systemOverlayStyle: Platform.isAndroid
             ? SystemUiOverlayStyle(

lib/pages/home/widgets/app_bar.dart

@@ -28,7 +28,6 @@ class HomeAppBar extends StatelessWidget {
             background: Column(
               children: [
                 AppBar(
-                  centerTitle: false,
                   title: const Text(
                     'PiLiPaLa',
                     style: TextStyle(
@@ -73,8 +72,6 @@ class HomeAppBar extends StatelessWidget {
 
                     const SizedBox(width: 10)
                   ],
-                  elevation: 0,
-                  scrolledUnderElevation: 0,
                 ),
               ],
             ),

lib/pages/html/view.dart

@@ -104,14 +104,7 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
     int rpid = replyItem.rpid!;
     Get.to(
       () => Scaffold(
-        appBar: AppBar(
+        appBar: AppBar(title: const Text('评论详情')),
-          titleSpacing: 0,
-          centerTitle: false,
-          title: Text(
-            '评论详情',
-            style: Theme.of(context).textTheme.titleMedium,
-          ),
-        ),
         body: VideoReplyReplyPanel(
           oid: oid,
           rpid: rpid,
@@ -127,12 +120,7 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        centerTitle: false,
+        title: Text(title),
-        titleSpacing: 0,
-        title: Text(
-          title,
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
         actions: [
           const SizedBox(width: 4),
           IconButton(

lib/pages/later/view.dart

@@ -28,18 +28,12 @@ class _LaterPageState extends State<LaterPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        titleSpacing: 0,
-        centerTitle: false,
         title: Obx(
           () => _laterController.laterList.isNotEmpty
               ? Text(
                   '稍后再看 (${_laterController.laterList.length})',
-                  style: Theme.of(context).textTheme.titleMedium,
                 )
-              : Text(
+              : const Text('稍后再看'),
-                  '稍后再看',
-                  style: Theme.of(context).textTheme.titleMedium,
-                ),
         ),
         actions: [
           Obx(

lib/pages/live_follow/view.dart

@@ -42,13 +42,8 @@ class _LiveFollowPageState extends State<LiveFollowPage> {
   Widget build(BuildContext context) {
     return Scaffold(
         appBar: AppBar(
-          elevation: 0,
-          scrolledUnderElevation: 0,
-          titleSpacing: 0,
-          centerTitle: false,
           title: Obx(() => Text(
                 '${_liveFollowController.liveFollowingCount}人正在直播中',
-                style: Theme.of(context).textTheme.titleMedium,
               )),
         ),
         body: Container(

lib/pages/live_room/view.dart

@@ -259,8 +259,6 @@ class _LiveRoomPageState extends State<LiveRoomPage>
             left: 0,
             right: 0,
             child: AppBar(
-              centerTitle: false,
-              titleSpacing: 0,
               backgroundColor: Colors.transparent,
               foregroundColor: Colors.white,
               toolbarHeight: isPortrait ? 56 : 0,

lib/pages/live_room/widgets/bottom_control.dart

@@ -47,10 +47,7 @@ class _BottomControlState extends State<BottomControl> {
     return AppBar(
       backgroundColor: Colors.transparent,
       foregroundColor: Colors.white,
-      elevation: 0,
-      scrolledUnderElevation: 0,
       primary: false,
-      centerTitle: false,
       automaticallyImplyLeading: false,
       titleSpacing: 14,
       title: Row(

lib/pages/member/widgets/profile.dart

@@ -122,7 +122,7 @@ class ProfilePanel extends StatelessWidget {
                         ),
                         child: Row(children: [
                           Image.asset(
-                            'assets/images/live.gif',
+                            'assets/images/live.png',
                             height: 10,
                           ),
                           Text(

lib/pages/member_archive/view.dart

@@ -47,12 +47,9 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        titleSpacing: 0,
-        centerTitle: false,
         title: Obx(
           () => Text(
             '${_memberArchivesController.isOwner.value ? '我' : 'Ta'}的投稿 - ${_memberArchivesController.currentOrder['label']}',
-            style: Theme.of(context).textTheme.titleMedium,
           ),
         ),
         actions: [

lib/pages/member_article/view.dart

@@ -48,12 +48,9 @@ class _MemberArticlePageState extends State<MemberArticlePage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        titleSpacing: 0,
-        centerTitle: false,
         title: Obx(
           () => Text(
             '${_memberArticleController.isOwner.value ? '我' : 'Ta'}的图文',
-            style: Theme.of(context).textTheme.titleMedium,
           ),
         ),
       ),

lib/pages/member_coin/widgets/item.dart

@@ -20,7 +20,6 @@ class MemberCoinsItem extends StatelessWidget {
   Widget build(BuildContext context) {
     String heroTag = Utils.makeHeroTag(coinItem.aid);
     return Card(
-      elevation: 0,
       clipBehavior: Clip.hardEdge,
       margin: EdgeInsets.zero,
       child: InkWell(

lib/pages/member_dynamics/view.dart

@@ -54,12 +54,9 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        titleSpacing: 0,
-        centerTitle: false,
         title: Obx(
           () => Text(
             '${_memberDynamicController.isOwner.value ? '我' : 'Ta'}的动态',
-            style: Theme.of(context).textTheme.titleMedium,
           ),
         ),
       ),

lib/pages/member_search/view.dart

@@ -49,7 +49,6 @@ class _MemberSearchPageState extends State<MemberSearchPage>
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        titleSpacing: 0,
         actions: [
           IconButton(
               onPressed: () => _memberSearchCtr.submit(),

lib/pages/member_seasons/view.dart

@@ -41,12 +41,7 @@ class _MemberSeasonsPageState extends State<MemberSeasonsPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: Text(Get.parameters['seasonName']!)),
-        titleSpacing: 0,
-        centerTitle: false,
-        title: Text(Get.parameters['seasonName']!,
-            style: Theme.of(context).textTheme.titleMedium),
-      ),
       body: Padding(
         padding: const EdgeInsets.only(
           left: StyleString.safeSpace,

lib/pages/message/at/view.dart

@@ -47,9 +47,7 @@ class _MessageAtPageState extends State<MessageAtPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('@我的')),
-        title: const Text('@我的'),
-      ),
       body: RefreshIndicator(
         onRefresh: () async {
           await _messageAtCtr.queryMessageAt(type: 'init');
@@ -129,7 +127,7 @@ class AtItem extends StatelessWidget {
 
     return InkWell(
       onTap: () async {
-        MessageUtils.onClickMessage(context, uri, nativeUri, type);
+        MessageUtils.onClickMessage(context, uri, nativeUri, type, null);
       },
       child: Padding(
         padding: const EdgeInsets.all(14),

lib/pages/message/like/view.dart

@@ -47,9 +47,7 @@ class _MessageLikePageState extends State<MessageLikePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('收到的赞')),
-        title: const Text('收到的赞'),
-      ),
       body: RefreshIndicator(
         onRefresh: () async {
           await _messageLikeCtr.queryMessageLike(type: 'init');
@@ -127,7 +125,7 @@ class LikeItem extends StatelessWidget {
     final String type = item.item!.type!;
     return InkWell(
       onTap: () async {
-        MessageUtils.onClickMessage(context, uri, nativeUri, type);
+        MessageUtils.onClickMessage(context, uri, nativeUri, type, null);
       },
       child: Stack(
         children: [

lib/pages/message/reply/view.dart

@@ -48,9 +48,7 @@ class _MessageReplyPageState extends State<MessageReplyPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('回复我的')),
-        title: const Text('回复我的'),
-      ),
       body: RefreshIndicator(
         onRefresh: () async {
           await _messageReplyCtr.queryMessageReply(type: 'init');
@@ -119,7 +117,7 @@ class ReplyItem extends StatelessWidget {
     final String type = item.item!.type!;
     return InkWell(
       onTap: () async {
-        MessageUtils.onClickMessage(context, uri, nativeUri, type);
+        MessageUtils.onClickMessage(context, uri, nativeUri, type, item.item!);
       },
       child: Padding(
         padding: const EdgeInsets.all(14),
@@ -157,6 +155,9 @@ class ReplyItem extends StatelessWidget {
                         text: '回复了我的评论',
                         style: TextStyle(color: outline),
                       ),
+                    if (item.item!.type! == 'dynamic')
+                      TextSpan(
+                          text: '对我的动态发表了评论', style: TextStyle(color: outline)),
                   ])),
                   const SizedBox(height: 6),
                   Text.rich(
@@ -199,11 +200,32 @@ class ReplyItem extends StatelessWidget {
                 ),
               ),
             if (item.item!.type! == 'video')
-              NetworkImgLayer(
+              // NetworkImgLayer(
+              //   width: 60,
+              //   height: 60,
+              //   src: item.item!.image,
+              //   radius: 6,
+              // ),
+              Container(
                 width: 60,
                 height: 60,
-                src: item.item!.image,
+                clipBehavior: Clip.hardEdge,
-                radius: 6,
+                decoration: const BoxDecoration(
+                  borderRadius: BorderRadius.all(Radius.circular(6)),
+                ),
+                child: Image.network(item.item!.image!, fit: BoxFit.cover),
+              ),
+            if (item.item!.type! == 'dynamic')
+              Container(
+                width: 60,
+                height: 80,
+                padding: const EdgeInsets.all(4),
+                child: Text(
+                  item.item!.title!,
+                  maxLines: 4,
+                  style: const TextStyle(fontSize: 12, letterSpacing: 0.3),
+                  overflow: TextOverflow.ellipsis,
+                ),
               ),
           ],
         ),

lib/pages/message/system/view.dart

@@ -29,9 +29,7 @@ class _MessageSystemPageState extends State<MessageSystemPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('系统通知')),
-        title: const Text('系统通知'),
-      ),
       body: RefreshIndicator(
         onRefresh: () async {
           await _messageSystemCtr.queryAndProcessMessages();

lib/pages/message/utils/index.dart

@@ -3,6 +3,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/search.dart';
 import 'package:pilipala/models/common/reply_type.dart';
+import 'package:pilipala/models/msg/reply.dart';
 import 'package:pilipala/pages/video/detail/reply_reply/index.dart';
 import 'package:pilipala/utils/app_scheme.dart';
 import 'package:pilipala/utils/utils.dart';
@@ -10,7 +11,12 @@ import 'package:pilipala/utils/utils.dart';
 class MessageUtils {
   // 回复我的、收到的赞点击
   static void onClickMessage(
-      BuildContext context, Uri uri, Uri nativeUri, String type) async {
+    BuildContext context,
+    Uri uri,
+    Uri nativeUri,
+    String type,
+    ReplyContentItem? item,
+  ) async {
     final String path = uri.path;
     final String bvid = path.split('/').last;
     String? sourceType;
@@ -24,8 +30,8 @@ class MessageUtils {
     if (nativePath.contains('detail')) {
       // 动态详情
       sourceType = 'opus';
-      oid = nativePath.split('/')[3];
+      oid = item?.subjectId!.toString() ?? nativePath.split('/')[3];
-      commentRootId = nativePath.split('/')[4];
+      commentRootId = item?.sourceId!.toString() ?? nativePath.split('/')[4];
     }
     switch (type) {
       case 'video':
@@ -47,6 +53,7 @@ class MessageUtils {
         }
         break;
       case 'reply':
+      case 'dynamic':
         debugPrint('commentRootId: $oid, $commentRootId');
         navigateToComment(
           context,

lib/pages/mine/view.dart

@@ -44,8 +44,6 @@ class _MinePageState extends State<MinePage>
     super.build(context);
     return Scaffold(
       appBar: AppBar(
-        scrolledUnderElevation: 0,
-        elevation: 0,
         actions: [
           IconButton(
             icon: const Icon(Icons.search_outlined),
@@ -355,7 +353,8 @@ class _MinePageState extends State<MinePage>
                       itemBuilder: (context, index) {
                         if (flag && index == favFolderList.length) {
                           return Padding(
-                            padding: const EdgeInsets.only(right: 14),
+                            padding:
+                                const EdgeInsets.only(right: 14, bottom: 70),
                             child: Center(
                               child: IconButton(
                                 style: ButtonStyle(
@@ -488,7 +487,7 @@ class FavFolderItem extends StatelessWidget {
               child: NetworkImgLayer(
                 src: item!.cover,
                 width: 180,
-                height: 110,
+                height: MediaQuery.textScalerOf(context).scale(110),
               ),
             ),
           ),

lib/pages/mine_edit/view.dart

@@ -23,9 +23,7 @@ class _MineEditPageState extends State<MineEditPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('编辑资料')),
-        title: const Text('编辑资料'),
-      ),
       body: SingleChildScrollView(
         padding: const EdgeInsets.all(16.0),
         child: FutureBuilder(

lib/pages/rank/view.dart

@@ -38,7 +38,6 @@ class _RankPageState extends State<RankPage>
       backgroundColor: Colors.transparent,
       appBar: AppBar(
         toolbarHeight: 0,
-        elevation: 0,
         backgroundColor: Colors.transparent,
         systemOverlayStyle: Platform.isAndroid
             ? SystemUiOverlayStyle(

lib/pages/search/view.dart

@@ -49,7 +49,6 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
             width: 1,
           ),
         ),
-        titleSpacing: 0,
         actions: [
           IconButton(
             onPressed: () => _searchController.submit(),

lib/pages/search_result/view.dart

@@ -51,8 +51,6 @@ class _SearchResultPageState extends State<SearchResultPage>
             width: 1,
           ),
         ),
-        titleSpacing: 0,
-        centerTitle: false,
         title: GestureDetector(
           onTap: () => Get.back(),
           child: SizedBox(

lib/pages/setting/extra_setting.dart

@@ -131,14 +131,7 @@ class _ExtraSettingState extends State<ExtraSetting> {
         .labelMedium!
         .copyWith(color: Theme.of(context).colorScheme.outline);
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('其他设置')),
-        centerTitle: false,
-        titleSpacing: 0,
-        title: Text(
-          '其他设置',
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
-      ),
       body: ListView(
         children: [
           const SetSwitchItem(

lib/pages/setting/pages/color_select.dart

@@ -38,10 +38,7 @@ class _ColorSelectPageState extends State<ColorSelectPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('选择应用主题')),
-        centerTitle: false,
-        title: const Text('选择应用主题'),
-      ),
       body: ListView(
         children: [
           Obx(

lib/pages/setting/pages/logs.dart

@@ -100,9 +100,7 @@ class _LogsPageState extends State<LogsPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        centerTitle: false,
+        title: const Text('日志'),
-        titleSpacing: 0,
-        title: Text('日志', style: Theme.of(context).textTheme.titleMedium),
         actions: [
           PopupMenuButton<String>(
             onSelected: (String type) {

lib/pages/setting/pages/play_gesture_set.dart

@@ -34,14 +34,7 @@ class _PlayGesturePageState extends State<PlayGesturePage> {
         .labelMedium!
         .copyWith(color: Theme.of(context).colorScheme.outline);
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('手势设置')),
-        centerTitle: false,
-        titleSpacing: 0,
-        title: Text(
-          '手势设置',
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
-      ),
       body: ListView(
         children: [
           ListTile(

lib/pages/setting/pages/play_speed_set.dart

@@ -204,16 +204,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('倍速设置')),
-        elevation: 0,
-        scrolledUnderElevation: 0,
-        titleSpacing: 0,
-        centerTitle: false,
-        title: Text(
-          '倍速设置',
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
-      ),
       body: SingleChildScrollView(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,

lib/pages/setting/play_setting.dart

@@ -67,14 +67,7 @@ class _PlaySettingState extends State<PlaySetting> {
         .labelMedium!
         .copyWith(color: Theme.of(context).colorScheme.outline);
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('播放设置')),
-        centerTitle: false,
-        titleSpacing: 0,
-        title: Text(
-          '播放设置',
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
-      ),
       body: ListView(
         children: [
           ListTile(

lib/pages/setting/privacy_setting.dart

@@ -32,14 +32,7 @@ class _PrivacySettingState extends State<PrivacySetting> {
         .labelMedium!
         .copyWith(color: Theme.of(context).colorScheme.outline);
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('隐私设置')),
-        centerTitle: false,
-        titleSpacing: 0,
-        title: Text(
-          '隐私设置',
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
-      ),
       body: Column(
         children: [
           ListTile(

lib/pages/setting/recommend_setting.dart

@@ -53,14 +53,7 @@ class _RecommendSettingState extends State<RecommendSetting> {
         .labelMedium!
         .copyWith(color: Theme.of(context).colorScheme.outline);
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('推荐设置')),
-        centerTitle: false,
-        titleSpacing: 0,
-        title: Text(
-          '推荐设置',
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
-      ),
       body: ListView(
         children: [
           ListTile(

lib/pages/setting/style_setting.dart

@@ -49,14 +49,7 @@ class _StyleSettingState extends State<StyleSetting> {
         .labelMedium!
         .copyWith(color: Theme.of(context).colorScheme.outline);
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('外观设置')),
-        centerTitle: false,
-        titleSpacing: 0,
-        title: Text(
-          '外观设置',
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
-      ),
       body: ListView(
         children: [
           Obx(

lib/pages/setting/view.dart

@@ -9,14 +9,7 @@ class SettingPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final SettingController settingController = Get.put(SettingController());
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('设置')),
-        centerTitle: false,
-        titleSpacing: 0,
-        title: Text(
-          '设置',
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
-      ),
       body: Column(
         children: [
           ListTile(

lib/pages/subscription/view.dart

@@ -40,12 +40,8 @@ class _SubPageState extends State<SubPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        centerTitle: false,
+        title:
-        titleSpacing: 0,
+            Obx(() => Text('${_subController.isOwner.value ? '我' : 'Ta'}的订阅')),
-        title: Obx(() => Text(
-              '${_subController.isOwner.value ? '我' : 'Ta'}的订阅',
-              style: Theme.of(context).textTheme.titleMedium,
-            )),
       ),
       body: FutureBuilder(
         future: _futureBuilderFuture,

lib/pages/video/detail/introduction/widgets/fav_panel.dart

@@ -30,8 +30,6 @@ class _FavPanelState extends State<FavPanel> {
     return Column(
       children: [
         AppBar(
-          centerTitle: false,
-          elevation: 0,
           shape: const RoundedRectangleBorder(
             borderRadius: BorderRadius.vertical(
               top: Radius.circular(20),

lib/pages/video/detail/introduction/widgets/group_panel.dart

@@ -57,8 +57,6 @@ class _GroupPanelState extends State<GroupPanel> {
     return Column(
       children: <Widget>[
         AppBar(
-          centerTitle: false,
-          elevation: 0,
           shape: const RoundedRectangleBorder(
             borderRadius: BorderRadius.vertical(
               top: Radius.circular(20),

lib/pages/video/detail/introduction/widgets/page_panel.dart

@@ -156,7 +156,7 @@ class _PagesPanelState extends State<PagesPanel> {
                         children: <Widget>[
                           if (isCurrentIndex) ...<Widget>[
                             Image.asset(
-                              'assets/images/live.gif',
+                              'assets/images/live.png',
                               color: Theme.of(context).colorScheme.primary,
                               height: 12,
                             ),

lib/pages/video/detail/introduction/widgets/season_panel.dart

@@ -101,7 +101,7 @@ class _SeasonPanelState extends State<SeasonPanel> {
       dense: false,
       leading: isCurrentIndex
           ? Image.asset(
-              'assets/images/live.gif',
+              'assets/images/live.png',
               color: primary,
               height: 12,
             )
@@ -159,7 +159,7 @@ class _SeasonPanelState extends State<SeasonPanel> {
                   ),
                   const SizedBox(width: 15),
                   Image.asset(
-                    'assets/images/live.gif',
+                    'assets/images/live.png',
                     color: Theme.of(context).colorScheme.primary,
                     height: 12,
                   ),

lib/pages/video/detail/reply/controller.dart

@@ -132,4 +132,32 @@ class VideoReplyController extends GetxController {
       queryReplyList(type: 'init');
     });
   }
+
+  // 移除评论
+  Future removeReply(int? rpid, int? frpid) async {
+    // 移除一楼评论
+    if (rpid != null) {
+      replyList.removeWhere((item) {
+        return item.rpid == rpid;
+      });
+    }
+    // 移除二楼评论
+    if (frpid != 0 && frpid != null) {
+      replyList.value = replyList.map((item) {
+        if (item.rpid! == frpid) {
+          item.replies!.removeWhere((reply) => reply.rpid == rpid);
+          // 【共xx条回复】
+          if (item.replyControl != null &&
+              item.replyControl!.entryTextNum! >= 1) {
+            item.replyControl!.entryTextNum =
+                item.replyControl!.entryTextNum! - 1;
+            item.rcount = item.replyControl!.entryTextNum;
+          }
+          return item;
+        } else {
+          return item;
+        }
+      }).toList();
+    }
+  }
 }

lib/pages/video/detail/reply/view.dart

@@ -242,10 +242,9 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                                             .replyList[index],
                                         showReplyRow: true,
                                         replyLevel: replyLevel,
-                                        replyReply: (replyItem, currentReply,
+                                        replyReply: replyReply,
-                                                loadMore) =>
+                                        onDelete:
-                                            replyReply(replyItem, currentReply,
+                                            _videoReplyController.removeReply,
-                                                loadMore),
                                         replyType: ReplyType.video,
                                       );
                                     }

lib/pages/video/detail/reply/widgets/reply_item.dart

@@ -37,6 +37,7 @@ class ReplyItem extends StatelessWidget {
     this.replyReply,
     this.replyType,
     this.replySave = false,
+    this.onDelete,
     super.key,
   });
   final ReplyItemModel? replyItem;
@@ -46,6 +47,7 @@ class ReplyItem extends StatelessWidget {
   final Function? replyReply;
   final ReplyType? replyType;
   final bool replySave;
+  final Function(int? rpid, int? frpid)? onDelete;
 
   @override
   Widget build(BuildContext context) {
@@ -75,6 +77,7 @@ class ReplyItem extends StatelessWidget {
                 item: replyItem,
                 mainFloor: true,
                 isOwner: isOwner,
+                onDelete: onDelete,
               );
             },
           );
@@ -275,6 +278,7 @@ class ReplyItem extends StatelessWidget {
               // f_rpid: replyItem!.rpid,
               replyItem: replyItem,
               replyReply: replyReply,
+              onDelete: onDelete,
             ),
           ),
         ],
@@ -371,15 +375,15 @@ class ReplyItemRow extends StatelessWidget {
     super.key,
     this.replies,
     this.replyControl,
-    // this.f_rpid,
     this.replyItem,
     this.replyReply,
+    this.onDelete,
   });
   final List? replies;
   ReplyControl? replyControl;
-  // int? f_rpid;
   ReplyItemModel? replyItem;
   Function? replyReply;
+  final Function(int? rpid, int? frpid)? onDelete;
 
   @override
   Widget build(BuildContext context) {
@@ -410,12 +414,18 @@ class ReplyItemRow extends StatelessWidget {
                   },
                   onLongPress: () {
                     feedBack();
+                    final bool isOwner = int.parse(replyItem!.member!.mid!) ==
+                        (GlobalDataCache().userInfo?.mid ?? -1);
                     showModalBottomSheet(
                       context: context,
                       useRootNavigator: true,
                       isScrollControlled: true,
                       builder: (context) {
-                        return MorePanel(item: replies![i]);
+                        return MorePanel(
+                          item: replies![i],
+                          isOwner: isOwner,
+                          onDelete: onDelete,
+                        );
                       },
                     );
                   },
@@ -493,7 +503,7 @@ class ReplyItemRow extends StatelessWidget {
                         if (replyControl!.upReply!)
                           const TextSpan(text: 'up主等人 '),
                         TextSpan(
-                          text: replyControl!.entryText!,
+                          text: '查看${replyControl!.entryTextNum}条回复',
                           style: TextStyle(
                             color: colorScheme.primary,
                           ),
@@ -1019,11 +1029,13 @@ class MorePanel extends StatelessWidget {
   final dynamic item;
   final bool mainFloor;
   final bool isOwner;
+  final Function(int? rpid, int? frpid)? onDelete;
   const MorePanel({
     super.key,
     required this.item,
     this.mainFloor = false,
     this.isOwner = false,
+    this.onDelete,
   });
 
   Future<dynamic> menuActionHandler(String type) async {
@@ -1083,7 +1095,7 @@ class MorePanel extends StatelessWidget {
                       rpid: item.rpid!,
                     );
                     if (result['status']) {
-                      SmartDialog.showToast('评论删除成功，需手动刷新');
+                      onDelete?.call(item.rpid!, item.root);
                       Get.back();
                     } else {
                       SmartDialog.showToast(result['msg']);

lib/pages/video/detail/reply_reply/controller.dart

@@ -84,6 +84,16 @@ class VideoReplyReplyController extends GetxController {
     return res;
   }
 
+  // 移除评论
+  Future removeReply(int? rpid, int? frpid) async {
+    // 移除一楼评论
+    if (rpid != null) {
+      replyList.removeWhere((item) {
+        return item.rpid == rpid;
+      });
+    }
+  }
+
   @override
   void onClose() {
     currentPage = 0;

lib/pages/video/detail/reply_reply/view.dart

@@ -89,7 +89,6 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
     return AppBar(
       toolbarHeight: 45,
       automaticallyImplyLeading: false,
-      centerTitle: false,
       title: Text(
         '评论详情',
         style: Theme.of(context).textTheme.titleSmall,
@@ -118,6 +117,7 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
       },
       replyType: widget.replyType,
       replyReply: (replyItem) => replyReply(replyItem),
+      onDelete: _videoReplyReplyController.removeReply,
     );
   }
 

lib/pages/video/detail/view.dart

@@ -614,8 +614,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                 builder: ((context, snapshot) {
                   return AppBar(
                     backgroundColor: Colors.black,
-                    elevation: 0,
-                    scrolledUnderElevation: 0,
                   );
                 }),
               ),
@@ -861,12 +859,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     return AppBar(
       backgroundColor: Colors.transparent, // 使背景透明
       foregroundColor: Colors.white,
-      elevation: 0,
-      scrolledUnderElevation: 0,
       primary: false,
-      centerTitle: false,
       automaticallyImplyLeading: false,
-      titleSpacing: 0,
       title: Container(
         height: kToolbarHeight,
         padding: const EdgeInsets.symmetric(horizontal: 14),

lib/pages/video/detail/widgets/app_bar.dart

@@ -33,8 +33,6 @@ class ScrollAppBar extends StatelessWidget {
           padding: EdgeInsets.only(top: statusBarHeight),
           child: AppBar(
             primary: false,
-            elevation: 0,
-            scrolledUnderElevation: 0,
             centerTitle: true,
             title: TextButton(
               onPressed: () => callback(),

lib/pages/video/detail/widgets/header_control.dart

@@ -1155,10 +1155,7 @@ class _HeaderControlState extends State<HeaderControl> {
     return AppBar(
       backgroundColor: Colors.transparent,
       foregroundColor: Colors.white,
-      elevation: 0,
-      scrolledUnderElevation: 0,
       primary: false,
-      centerTitle: false,
       automaticallyImplyLeading: false,
       titleSpacing: 14,
       title: Row(

lib/pages/video/detail/widgets/watch_later_list.dart

@@ -85,7 +85,6 @@ class _MediaListPanelState extends State<MediaListPanel> {
           AppBar(
             toolbarHeight: 45,
             automaticallyImplyLeading: false,
-            centerTitle: false,
             title: Text(
               widget.panelTitle ?? '稍后再看',
               style: Theme.of(context).textTheme.titleSmall,

lib/pages/webview/view.dart

@@ -19,12 +19,7 @@ class _WebviewPageState extends State<WebviewPage> {
   Widget build(BuildContext context) {
     return Scaffold(
         appBar: AppBar(
-          centerTitle: false,
+          title: Text(_webviewController.pageTitle),
-          titleSpacing: 0,
-          title: Text(
-            _webviewController.pageTitle,
-            style: Theme.of(context).textTheme.titleMedium,
-          ),
           actions: [
             const SizedBox(width: 4),
             IconButton(

lib/pages/whisper/view.dart

@@ -1,6 +1,5 @@
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/skeleton/skeleton.dart';
@@ -45,9 +44,7 @@ class _WhisperPageState extends State<WhisperPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: const Text('消息')),
-        title: const Text('消息'),
-      ),
       body: RefreshIndicator(
         onRefresh: () async {
           _whisperController.unread();

lib/utils/app_scheme.dart

@@ -1,5 +1,4 @@
 import 'package:app_links/app_links.dart';
-import 'package:appscheme/appscheme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -12,37 +11,20 @@ import 'utils.dart';
 
 class PiliSchame {
   static late AppLinks appLinks;
-  static AppScheme appScheme = AppSchemeImpl.getInstance()!;
   static Future<void> init() async {
     appLinks = AppLinks();
     appLinks.uriLinkStream.listen((Uri uri) {
       final String scheme = uri.scheme;
       if (RegExp(r'^pili', caseSensitive: false).hasMatch(scheme)) {
         piliScheme(uri);
-      }
+      } else {
-    });
+        routePush(uri);
-
-    appScheme.getInitScheme().then((SchemeEntity? value) {
-      if (value != null) {
-        routePush(value);
-      }
-    });
-
-    appScheme.getLatestScheme().then((SchemeEntity? value) {
-      if (value != null) {
-        routePush(value);
-      }
-    });
-
-    appScheme.registerSchemeListener().listen((SchemeEntity? event) {
-      if (event != null) {
-        routePush(event);
       }
     });
   }
 
   /// 路由跳转
-  static void routePush(value) async {
+  static void routePush(Uri value) async {
     final String scheme = value.scheme;
     if (scheme == 'bilibili') {
       biliScheme(value);
@@ -212,9 +194,9 @@ class PiliSchame {
     }
   }
 
-  static Future<void> biliScheme(SchemeEntity value) async {
+  static Future<void> biliScheme(Uri value) async {
-    final String host = value.host!;
+    final String host = value.host;
-    final String path = value.path!;
+    final String path = value.path;
     switch (host) {
       case 'root':
         Navigator.popUntil(
@@ -300,8 +282,14 @@ class PiliSchame {
         }
         break;
       default:
-        SmartDialog.showToast('未匹配地址，请联系开发者');
+        final Map<String, String> queryParameters = value.queryParameters;
-        Clipboard.setData(ClipboardData(text: value.toString()));
+        final String? enterUri = queryParameters['enterUri'];
+        if (enterUri != null && enterUri.startsWith('bilibili://')) {
+          biliScheme(Uri.parse(enterUri));
+        } else {
+          SmartDialog.showToast('未匹配地址，请联系开发者');
+          Clipboard.setData(ClipboardData(text: value.toString()));
+        }
         break;
     }
   }

pubspec.lock

@@ -49,14 +49,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
-  appscheme:
-    dependency: "direct main"
-    description:
-      name: appscheme
-      sha256: b885b65219f3839ebafc937024a1bc5ce5a75b0e458fd249ef15e80e81235b6f
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.0.8"
   archive:
     dependency: transitive
     description:

pubspec.yaml

@@ -111,7 +111,6 @@ dependencies:
   # 高帧率
   flutter_displaymode: ^0.6.0
   # scheme跳转
-  appscheme: ^1.0.8
   app_links: ^6.3.2
   # 弹幕
   ns_danmaku: