Merge branch 'main' into feature-rank

lib/http/api.dart

@@ -484,6 +484,9 @@ class Api {
  /// 激活buvid3
  static const activateBuvidApi = '/x/internal/gaia-gateway/ExClimbWuzhi';
 
+ /// 获取字幕配置
+ static const getSubtitleConfig = '/x/player/v2';
+
  /// 我的订阅
  static const userSubFolder = '/x/v3/fav/folder/collected/list';
 

lib/http/interceptor.dart

@@ -45,10 +45,13 @@ class ApiInterceptor extends Interceptor {
  void onError(DioException err, ErrorInterceptorHandler handler) async {
  // 处理网络请求错误
  // handler.next(err);
- SmartDialog.showToast(
- await dioError(err),
- displayType: SmartToastType.onlyRefresh,
- );
+ String url = err.requestOptions.uri.toString();
+ if (!url.contains('heartBeat')) {
+ SmartDialog.showToast(
+ await dioError(err),
+ displayType: SmartToastType.onlyRefresh,
+ );
+ }
  super.onError(err, handler);
  }
 
@@ -75,23 +78,24 @@ class ApiInterceptor extends Interceptor {
  }
 
  static Future<String> checkConnect() async {
- final ConnectivityResult connectivityResult =
+ final List<ConnectivityResult> connectivityResult =
  await Connectivity().checkConnectivity();
- switch (connectivityResult) {
- case ConnectivityResult.mobile:
- return '正在使用移动流量';
- case ConnectivityResult.wifi:
- return '正在使用wifi';
- case ConnectivityResult.ethernet:
- return '正在使用局域网';
- case ConnectivityResult.vpn:
- return '正在使用代理网络';
- case ConnectivityResult.other:
- return '正在使用其他网络';
- case ConnectivityResult.none:
- return '未连接到任何网络';
- default:
- return '';
+ if (connectivityResult.contains(ConnectivityResult.mobile)) {
+ return '正在使用移动流量';
+ } else if (connectivityResult.contains(ConnectivityResult.wifi)) {
+ return '正在使用wifi';
+ } else if (connectivityResult.contains(ConnectivityResult.ethernet)) {
+ return '正在使用局域网';
+ } else if (connectivityResult.contains(ConnectivityResult.vpn)) {
+ return '正在使用代理网络';
+ } else if (connectivityResult.contains(ConnectivityResult.bluetooth)) {
+ return '正在使用蓝牙网络';
+ } else if (connectivityResult.contains(ConnectivityResult.other)) {
+ return '正在使用其他网络';
+ } else if (connectivityResult.contains(ConnectivityResult.none)) {
+ return '未连接到任何网络';
+ } else {
+ return '';
  }
  }
 }

lib/http/video.dart

@@ -8,9 +8,11 @@ import '../models/model_rec_video_item.dart';
 import '../models/user/fav_folder.dart';
 import '../models/video/ai.dart';
 import '../models/video/play/url.dart';
+import '../models/video/subTitile/result.dart';
 import '../models/video_detail_res.dart';
 import '../utils/recommend_filter.dart';
 import '../utils/storage.dart';
+import '../utils/subtitle.dart';
 import '../utils/wbi_sign.dart';
 import 'api.dart';
 import 'init.dart';
@@ -476,6 +478,25 @@ class VideoHttp {
  }
  }
 
+ static Future getSubtitle({int? cid, String? bvid}) async {
+ var res = await Request().get(Api.getSubtitleConfig, data: {
+ 'cid': cid,
+ 'bvid': bvid,
+ });
+ try {
+ if (res.data['code'] == 0) {
+ return {
+ 'status': true,
+ 'data': SubTitlteModel.fromJson(res.data['data']),
+ };
+ } else {
+ return {'status': false, 'data': [], 'msg': res.data['msg']};
+ }
+ } catch (err) {
+ print(err);
+ }
+ }
+
  // 视频排行
  static Future getRankVideoList(int rid) async {
  try {
@@ -498,4 +519,12 @@ class VideoHttp {
  return {'status': false, 'data': [], 'msg': err};
  }
  }
+
+ // 获取字幕内容
+ static Future<Map<String, dynamic>> getSubtitleContent(url) async {
+ var res = await Request().get('https:$url');
+ final String content = SubTitleUtils.convertToWebVTT(res.data['body']);
+ final List body = res.data['body'];
+ return {'content': content, 'body': body};
+ }
 }

lib/models/common/subtitle_type.dart

@@ -0,0 +1,47 @@
+enum SubtitleType {
+ // 中文（中国）
+ zhCN,
+ // 中文（自动翻译）
+ aizh,
+ // 英语（自动生成）
+ aien,
+}
+
+extension SubtitleTypeExtension on SubtitleType {
+ String get description {
+ switch (this) {
+ case SubtitleType.zhCN:
+ return '中文（中国）';
+ case SubtitleType.aizh:
+ return '中文（自动翻译）';
+ case SubtitleType.aien:
+ return '英语（自动生成）';
+ }
+ }
+}
+
+extension SubtitleIdExtension on SubtitleType {
+ String get id {
+ switch (this) {
+ case SubtitleType.zhCN:
+ return 'zh-CN';
+ case SubtitleType.aizh:
+ return 'ai-zh';
+ case SubtitleType.aien:
+ return 'ai-en';
+ }
+ }
+}
+
+extension SubtitleCodeExtension on SubtitleType {
+ int get code {
+ switch (this) {
+ case SubtitleType.zhCN:
+ return 1;
+ case SubtitleType.aizh:
+ return 2;
+ case SubtitleType.aien:
+ return 3;
+ }
+ }
+}

lib/models/video/subTitile/content.dart

@@ -0,0 +1,20 @@
+class SubTitileContentModel {
+ double? from;
+ double? to;
+ int? location;
+ String? content;
+
+ SubTitileContentModel({
+ this.from,
+ this.to,
+ this.location,
+ this.content,
+ });
+
+ SubTitileContentModel.fromJson(Map<String, dynamic> json) {
+ from = json['from'];
+ to = json['to'];
+ location = json['location'];
+ content = json['content'];
+ }
+}

lib/models/video/subTitile/result.dart

@@ -0,0 +1,89 @@
+import 'package:get/get.dart';
+import '../../common/subtitle_type.dart';
+
+class SubTitlteModel {
+ SubTitlteModel({
+ this.aid,
+ this.bvid,
+ this.cid,
+ this.loginMid,
+ this.loginMidHash,
+ this.isOwner,
+ this.name,
+ this.subtitles,
+ });
+
+ int? aid;
+ String? bvid;
+ int? cid;
+ int? loginMid;
+ String? loginMidHash;
+ bool? isOwner;
+ String? name;
+ List<SubTitlteItemModel>? subtitles;
+
+ factory SubTitlteModel.fromJson(Map<String, dynamic> json) => SubTitlteModel(
+ aid: json["aid"],
+ bvid: json["bvid"],
+ cid: json["cid"],
+ loginMid: json["login_mid"],
+ loginMidHash: json["login_mid_hash"],
+ isOwner: json["is_owner"],
+ name: json["name"],
+ subtitles: json["subtitle"] != null
+ ? json["subtitle"]["subtitles"]
+ .map<SubTitlteItemModel>((x) => SubTitlteItemModel.fromJson(x))
+ .toList()
+ : [],
+ );
+}
+
+class SubTitlteItemModel {
+ SubTitlteItemModel({
+ this.id,
+ this.lan,
+ this.lanDoc,
+ this.isLock,
+ this.subtitleUrl,
+ this.type,
+ this.aiType,
+ this.aiStatus,
+ this.title,
+ this.code,
+ this.content,
+ this.body,
+ });
+
+ int? id;
+ String? lan;
+ String? lanDoc;
+ bool? isLock;
+ String? subtitleUrl;
+ int? type;
+ int? aiType;
+ int? aiStatus;
+ String? title;
+ int? code;
+ String? content;
+ List? body;
+
+ factory SubTitlteItemModel.fromJson(Map<String, dynamic> json) =>
+ SubTitlteItemModel(
+ id: json["id"],
+ lan: json["lan"].replaceAll('-', ''),
+ lanDoc: json["lan_doc"],
+ isLock: json["is_lock"],
+ subtitleUrl: json["subtitle_url"],
+ type: json["type"],
+ aiType: json["ai_type"],
+ aiStatus: json["ai_status"],
+ title: json["lan_doc"],
+ code: SubtitleType.values
+ .firstWhereOrNull(
+ (element) => element.id.toString() == json["lan"])
+ ?.index ??
+ -1,
+ content: '',
+ body: [],
+ );
+}

lib/pages/history/controller.dart

@@ -88,8 +88,10 @@ class HistoryController extends GetxController {
  // 观看历史暂停状态
  Future historyStatus() async {
  var res = await UserHttp.historyStatus();
- pauseStatus.value = res.data['data'];
- localCache.put(LocalCacheKey.historyPause, res.data['data']);
+ if (res.data['code'] == 0) {
+ pauseStatus.value = res.data['data'];
+ localCache.put(LocalCacheKey.historyPause, res.data['data']);
+ }
  }
 
  // 清空观看历史

lib/pages/media/view.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
+import 'package:media_kit/media_kit.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
 import 'package:pilipala/pages/main/index.dart';
@@ -102,7 +103,11 @@ class _MediaPageState extends State<MediaPage>
  ],
  Obx(() => mediaController.userLogin.value
  ? favFolder(mediaController, context)
- : const SizedBox())
+ : const SizedBox()),
+ SizedBox(
+ height: MediaQuery.of(context).padding.bottom +
+ kBottomNavigationBarHeight,
+ )
  ],
  ),
  ),