feat: 《一些更新》

orz12 · Dec 22, 2024 · d26257e · d26257e
1 parent 659455e
commit d26257e
Show file tree

Hide file tree

Showing 97 changed files with 3,076 additions and 1,604 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ flutter --version
 Android相关版本：
 > JDK: 21.0.4
 > gradle: 8.10.2
-> kotlin: 1.9.22
+> kotlin: 2.0.20
 > minSdk: 21
 > targetSdk: 34
 > compileSdk: 34

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -96,8 +96,8 @@ flutter {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.9.0'
-    implementation 'org.conscrypt:conscrypt-android:2.5.2'
+    api 'androidx.annotation:annotation:1.9.0'
+    api 'org.conscrypt:conscrypt-android:2.5.2'
 }
 
 ext.abiCodes = ["x86_64": 1, "armeabi-v7a": 2, "arm64-v8a": 3]

diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.orz12.PiliPalaX">
+    xmlns:tools="http://schemas.android.com/tools">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.orz12.PiliPalaX">
+    xmlns:tools="http://schemas.android.com/tools"
+    >
     <queries>
         <intent>
             <action android:name="android.intent.action.VIEW" />
@@ -39,7 +40,6 @@
         android:label="PiliPalaX"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        xmlns:tools="http://schemas.android.com/tools"
         android:enableOnBackInvokedCallback="false"
         android:allowBackup="false"
         android:fullBackupContent="false"
@@ -193,6 +193,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" tools:ignore="ProtectedPermissions"/>
     <!--
       Media access permissions.
       Android 13 or higher.

diff --git a/android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt b/android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt
@@ -3,7 +3,7 @@ package com.orz12.PiliPalaX
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 //import io.flutter.plugin.common.MethodChannel
-//import com.ryanheise.audioservice.AudioServiceActivity
+import com.ryanheise.audioservice.AudioServiceActivity
 import com.ryanheise.audioservice.AudioServicePlugin
 import android.os.Build
 import android.os.Bundle
@@ -13,7 +13,7 @@ import android.content.Context
 import androidx.annotation.NonNull
 
 //class AudioServiceActivity : FlPiPActivity() {
-class MainActivity : FlPiPActivity() {
+class MainActivity: FlPiPActivity() {
 //    private lateinit var methodChannel: MethodChannel
 
     override fun provideFlutterEngine(context: Context): FlutterEngine {

diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.orz12.PiliPalaX">
+    >
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

diff --git a/android/build.gradle b/android/build.gradle
@@ -48,6 +48,45 @@ subprojects {
                     namespace project.group
                 }
             }
+
+            // Task to ensure namespace and remove package attribute
+            project.tasks.register("fixManifestsAndNamespace") {
+                doLast {
+                    // Ensure namespace in build.gradle
+                    def buildGradleFile = file("${project.projectDir}/build.gradle")
+                    if (buildGradleFile.exists()) {
+                        def buildGradleContent = buildGradleFile.getText('UTF-8')
+                        def manifestFile = file("${project.projectDir}/src/main/AndroidManifest.xml")
+                        if (manifestFile.exists()) {
+                            def manifestContent = manifestFile.getText('UTF-8')
+                            def packageName = manifestContent.find(/package="([^"]+)"/) { match, p -> p }
+                            if (packageName && !buildGradleContent.contains("namespace")) {
+                                println "Setting namespace in ${buildGradleFile}"
+                                buildGradleContent = buildGradleContent.replaceFirst(
+                                        /android\s*\{/, "android {\n    namespace '${packageName}'"
+                                )
+                                buildGradleFile.write(buildGradleContent, 'UTF-8')
+                            }
+                        }
+                    }
+
+                    // Remove package attribute from AndroidManifest.xml
+                    def manifests = fileTree(dir: project.projectDir, includes: ['**/AndroidManifest.xml'])
+                    manifests.each { File manifestFile ->
+                        def manifestContent = manifestFile.getText('UTF-8')
+                        if (manifestContent.contains('package=')) {
+                            println "Removing package attribute from ${manifestFile}"
+                            manifestContent = manifestContent.replaceAll(/package="[^"]*"/, '')
+                            manifestFile.write(manifestContent, 'UTF-8')
+                        }
+                    }
+                }
+            }
+
+            // Ensure the task runs before the build process
+            project.tasks.matching { it.name.startsWith("preBuild") }.all {
+                dependsOn project.tasks.named("fixManifestsAndNamespace")
+            }
         }
     }
     project.buildDir = "${rootProject.buildDir}/${project.name}"
@@ -59,3 +98,7 @@ subprojects {
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
+
+ext {
+    kotlin_version = '2.0.20'
+}
diff --git a/lib/common/constants.dart b/lib/common/constants.dart
@@ -21,7 +21,7 @@ class Constants {
   static const String traceId =
       '11111111111111111111111111111111:1111111111111111:0:0';
   static const String userAgent =
-  'Mozilla/5.0 BiliDroid/1.46.2 ([email protected]) os/android model/vivo mobi_app/android_hd build/1462100 channel/yingyongbao innerVer/1462100 osVer/14 network/2';
+  'Mozilla/5.0 BiliDroid/1.46.2 ([email protected]) os/android model/vivo mobi_app/android_hd build/2001100 channel/yingyongbao innerVer/2001100 osVer/14 network/2';
   static const String statistics = '%7B%22appId%22%3A5%2C%22platform%22%3A3%2C%22version%22%3A%221.46.2%22%2C%22abtest%22%3A%22%22%7D';
   //Uri.encodeComponent('{"appId": 5,"platform": 3,"version": "1.46.2","abtest": ""}');
 

diff --git a/lib/common/widgets/audio_video_progress_bar.dart b/lib/common/widgets/audio_video_progress_bar.dart
@@ -5,6 +5,8 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 
+import '../../utils/utils.dart';
+
 /// This is where the current time and total time labels should appear in
 /// relation to the progress bar.
 enum TimeLabelLocation {
@@ -1102,7 +1104,9 @@ class _RenderProgressBar extends RenderBox {
     // description
     config.textDirection = TextDirection.ltr;
     config.label = '进度条'; //'Progress bar';
-    config.value = '${(_thumbValue * 100).round()}%';
+    config.value = '${(_thumbValue * 100).round()}%，'
+        '已播放${Utils.durationReadFormat(Utils.timeFormat(progress.inSeconds))}，'
+        '共${Utils.durationReadFormat(Utils.timeFormat(total.inSeconds))}';
 
     // increase action
     config.onIncrease = increaseAction;

diff --git a/lib/common/widgets/badge.dart b/lib/common/widgets/badge.dart
@@ -68,7 +68,7 @@ class PBadge extends StatelessWidget {
         border: Border.all(color: borderColor),
       ),
       child: Text(
-        text ?? "",
+        text == "ketang" ? "课堂" : text ?? "",
         style: TextStyle(
           height: 1,
           fontSize: fs ?? fontSize,

diff --git a/lib/common/widgets/spring_physics.dart b/lib/common/widgets/spring_physics.dart
@@ -10,7 +10,7 @@ class CustomTabBarViewScrollPhysics extends ScrollPhysics {
 
   @override
   SpringDescription get spring => const SpringDescription(
-    mass: 100,
+    mass: 40,
     stiffness: 10,
     damping: 1,
   );

diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart
@@ -36,6 +36,7 @@ class VideoCardV extends StatelessWidget {
 
   void onPushDetail(heroTag) async {
     String goto = videoItem.goto;
+    print("goto $goto");
     switch (goto) {
       case 'bangumi':
         if (videoItem.bangumiBadge == '电影') {
@@ -63,12 +64,17 @@ class VideoCardV extends StatelessWidget {
         }
         break;
       case 'av':
+        print("currentRoute: ${Get.currentRoute}");
         String bvid = videoItem.bvid ?? IdUtils.av2bv(videoItem.aid);
-        Get.toNamed('/video?bvid=$bvid&cid=${videoItem.cid}', arguments: {
-          // 'videoItem': videoItem,
-          'pic': videoItem.pic,
-          'heroTag': heroTag,
-        });
+        Get.toNamed(
+          '/video?bvid=$bvid&cid=${videoItem.cid}',
+          arguments: {
+            // 'videoItem': videoItem,
+            'pic': videoItem.pic,
+            'heroTag': heroTag,
+          },
+          // preventDuplicates: false,
+        );
         break;
       // 动态
       case 'picture':

diff --git a/lib/common/widgets/video_popup_menu.dart b/lib/common/widgets/video_popup_menu.dart
@@ -47,16 +47,21 @@ class VideoCustomActions {
         }
         if (videoItem is RecVideoItemAppModel) {
           RecVideoItemAppModel v = videoItem as RecVideoItemAppModel;
-          ThreePoint? tp = v.threePoint;
-          if (tp == null) {
-            SmartDialog.showToast("未能获取threePoint");
+          // ThreePoint? tp = v.threePoint;
+          // if (tp == null) {
+          //   SmartDialog.showToast("未能获取threePoint");
+          //   return;
+          // }
+          // if (tp.dislikeReasons == null && tp.feedbacks == null) {
+          //   SmartDialog.showToast("未能获取dislikeReasons或feedbacks");
+          //   return;
+          // }
+          if (v.dislikeReasons == null) {
+            SmartDialog.showToast("未能获取dislikeReasons");
             return;
           }
-          if (tp.dislikeReasons == null && tp.feedbacks == null) {
-            SmartDialog.showToast("未能获取dislikeReasons或feedbacks");
-            return;
-          }
-          Widget actionButton(DislikeReason? r, FeedbackReason? f) {
+          Widget actionButton(DislikeReason? r) {
+            //, FeedbackReason? f) {
             return ElevatedButton(
               style: ElevatedButton.styleFrom(
                 padding:
@@ -66,16 +71,17 @@ class VideoCustomActions {
                 SmartDialog.showLoading(msg: '正在提交');
                 var res = await VideoHttp.feedDislike(
                   reasonId: r?.id,
-                  feedbackId: f?.id,
+                  // feedbackId: f?.id,
                   id: v.param!,
                   goto: v.goto!,
                 );
                 SmartDialog.dismiss();
-                SmartDialog.showToast(
-                    res['status'] ? (r?.toast ?? f?.toast) : res['msg']);
+                SmartDialog.showToast(res['status'] ? (r?.toast) : res['msg']);
+                // res['status'] ? (r?.toast ?? f?.toast) : res['msg']);
                 Get.back();
               },
-              child: Text(r?.name ?? f?.name ?? '未知'),
+              child: Text(r?.name ?? '未知'),
+              // child: Text(r?.name ?? f?.name ?? '未知'),
             );
           }
 
@@ -87,32 +93,32 @@ class VideoCustomActions {
                 content: SingleChildScrollView(
                   child: Column(
                     children: [
-                      if (tp.dislikeReasons != null)
+                      if (v.dislikeReasons != null)
                         const Padding(
                           padding: EdgeInsets.symmetric(vertical: 8.0),
                           child: Text('我不想看'),
                         ),
-                      if (tp.dislikeReasons != null)
-                        Wrap(
-                          spacing: 5.0,
-                          runSpacing: 2.0,
-                          children: tp.dislikeReasons!.map((item) {
-                            return actionButton(item, null);
-                          }).toList(),
-                        ),
-                      if (tp.feedbacks != null)
-                        const Padding(
-                          padding: EdgeInsets.symmetric(vertical: 8.0),
-                          child: Text('反馈'),
-                        ),
-                      if (tp.feedbacks != null)
+                      if (v.dislikeReasons != null)
                         Wrap(
                           spacing: 5.0,
                           runSpacing: 2.0,
-                          children: tp.feedbacks!.map((item) {
-                            return actionButton(null, item);
+                          children: v.dislikeReasons!.map((item) {
+                            return actionButton(item);
                           }).toList(),
                         ),
+                      // if (tp.feedbacks != null)
+                      //   const Padding(
+                      //     padding: EdgeInsets.symmetric(vertical: 8.0),
+                      //     child: Text('反馈'),
+                      //   ),
+                      // if (tp.feedbacks != null)
+                      //   Wrap(
+                      //     spacing: 5.0,
+                      //     runSpacing: 2.0,
+                      //     children: tp.feedbacks!.map((item) {
+                      //       return actionButton(null, item);
+                      //     }).toList(),
+                      //   ),
                       //分割线
                       const Divider(),
                       ElevatedButton(

diff --git a/lib/http/api.dart b/lib/http/api.dart
@@ -223,7 +223,7 @@ class Api {
       'https://s.search.bilibili.com/main/suggest';
 
   // 分类搜索
-  static const String searchByType = '/x/web-interface/search/type';
+  static const String searchByType = '/x/web-interface/wbi/search/type';
 
   // 记录视频播放进度
   // https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/video/report.md
@@ -614,6 +614,9 @@ class Api {
   /// 排行榜
   static const String getRankApi = "/x/web-interface/ranking/v2";
 
+  /// 分区视频
+  static const String getRegionApi = "/x/web-interface/dynamic/region";
+
   /// 取消订阅-合集
   static const String unfavSeason = '/x/v3/fav/season/unfav';
 

diff --git a/lib/http/html.dart b/lib/http/html.dart
@@ -1,3 +1,7 @@
+import 'dart:io';
+
+import 'package:dio/dio.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:html/dom.dart';
 import 'package:html/parser.dart';
 import 'index.dart';
@@ -84,8 +88,9 @@ class HtmlHttp {
         .group(1)!
         .replaceAll(r'\u002F', '/')
         .split('@')[0];
-    // print(avatar);
+    print("avatar: $avatar");
     String uname = authorHeader.querySelector('.up-name')!.text.trim();
+    print("uname: $uname");
     // 动态详情
     Element opusDetail = appDom.querySelector('.article-content')!;
     // 发布时间
@@ -94,8 +99,7 @@ class HtmlHttp {
     // print(updateTime);
 
     //
-    String opusContent =
-        opusDetail.querySelector('#read-article-holder')?.innerHtml ?? '';
+    String opusContent = opusDetail.innerHtml ?? '';
     RegExp digitRegExp = RegExp(r'\d+');
     Iterable<Match> matches = digitRegExp.allMatches(id);
     String number = matches.first.group(0)!;

diff --git a/lib/http/init.dart b/lib/http/init.dart
@@ -11,6 +11,7 @@ import 'package:dio_cookie_manager/dio_cookie_manager.dart';
 // import 'package:dio_http2_adapter/dio_http2_adapter.dart';
 import 'package:hive/hive.dart';
 import 'package:PiliPalaX/utils/id_utils.dart';
+import '../utils/login.dart';
 import '../utils/storage.dart';
 import '../utils/utils.dart';
 import 'api.dart';
@@ -81,6 +82,23 @@ class Request {
     return token;
   }
 
+  static Future<String> getBUVID() async {
+    List<Cookie> cookies = await cookieManager.cookieJar
+        .loadForRequest(Uri.parse(HttpString.apiBaseUrl));
+    // String token = '';
+    print("cookies $cookies");
+    if (cookies.where((e) => e.name == 'Buvid').isNotEmpty) {
+      return cookies.firstWhere((e) => e.name == 'Buvid').value;
+    }
+    return LoginUtils.buvid();
+  }
+
+  static String getRandomSessionId() {
+    // 返回8位随机16进制数
+    return List.generate(8, (index) => Random().nextInt(16).toRadixString(16))
+        .join();
+  }
+
   static setOptionsHeaders(userInfo, bool status) {
     if (status) {
       dio.options.headers['x-bili-mid'] = userInfo.mid.toString();