Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

Add episodeName to hive to display it in history card

ErBW_sf6d2bba0debc
diff --git a/lib/bean/card/bangumi_history_card.dart b/lib/bean/card/bangumi_history_card.dart
index 24b48821..a9e5d202 100644
--- a/lib/bean/card/bangumi_history_card.dart
+++ b/lib/bean/card/bangumi_history_card.dart
@@ -141,7 +141,7 @@ class _BangumiHistoryCardVState extends State<BangumiHistoryCardV> {
// 测试 因为API问题评分功能搁置
Text('番剧源: ${widget.historyItem.adapterName}',
style: style),
- Text('上次看到: 第${widget.historyItem.lastWatchEpisode}话',
+ Text('上次看到: ${widget.historyItem.lastWatchEpisodeName}',
style: style),
Text('排名: ${widget.historyItem.bangumiItem.rank}',
style: style),
diff --git a/lib/modules/history/history_module.dart b/lib/modules/history/history_module.dart
index 2b2f2d3a..60eb40bc 100644
--- a/lib/modules/history/history_module.dart
+++ b/lib/modules/history/history_module.dart
@@ -23,10 +23,13 @@ class History {
@HiveField(5)
String lastSrc;
+ @HiveField(6)
+ String lastWatchEpisodeName;
+
String get key => adapterName + bangumiItem.id.toString();
History(
- this.bangumiItem, this.lastWatchEpisode, this.adapterName, this.lastWatchTime, this.lastSrc);
+ this.bangumiItem, this.lastWatchEpisode, this.adapterName, this.lastWatchTime, this.lastSrc, this.lastWatchEpisodeName);
static String getKey(String n, BangumiItem s) => n + s.id.toString();
diff --git a/lib/modules/history/history_module.g.dart b/lib/modules/history/history_module.g.dart
index adcbeb9b..3d88c6ad 100644
--- a/lib/modules/history/history_module.g.dart
+++ b/lib/modules/history/history_module.g.dart
@@ -16,19 +16,24 @@ class HistoryAdapter extends TypeAdapter<History> {
final fields = <int, dynamic>{
for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
};
+ // 保留对旧版本历史数据兼容
+ if (fields[6] == null) {
+ fields[6] = '';
+ }
return History(
fields[3] as BangumiItem,
fields[1] as int,
fields[2] as String,
fields[4] as DateTime,
fields[5] as String,
+ fields[6] as String,
)..progresses = (fields[0] as Map).cast<int, Progress>();
}
@override
void write(BinaryWriter writer, History obj) {
writer
- ..writeByte(6)
+ ..writeByte(7)
..writeByte(0)
..write(obj.progresses)
..writeByte(1)
@@ -40,7 +45,9 @@ class HistoryAdapter extends TypeAdapter<History> {
..writeByte(4)
..write(obj.lastWatchTime)
..writeByte(5)
- ..write(obj.lastSrc);
+ ..write(obj.lastSrc)
+ ..writeByte(6)
+ ..write(obj.lastWatchEpisodeName);
}
@override
diff --git a/lib/pages/history/history_controller.dart b/lib/pages/history/history_controller.dart
index 882b1265..8a3fca9d 100644
--- a/lib/pages/history/history_controller.dart
+++ b/lib/pages/history/history_controller.dart
@@ -27,18 +27,21 @@ abstract class _HistoryController with Store {
}
void updateHistory(
- int episode, int road, String adapterName, BangumiItem bangumiItem, Duration progress, String lastSrc) {
+ int episode, int road, String adapterName, BangumiItem bangumiItem, Duration progress, String lastSrc, String lastWatchEpisodeName) {
bool privateMode = setting.get(SettingBoxKey.privateMode, defaultValue: false);
if (privateMode) {
return;
}
var history = storedHistories.get(History.getKey(adapterName, bangumiItem)) ??
- History(bangumiItem, episode, adapterName, DateTime.now(), lastSrc);
+ History(bangumiItem, episode, adapterName, DateTime.now(), lastSrc, lastWatchEpisodeName);
history.lastWatchEpisode = episode;
history.lastWatchTime = DateTime.now();
if (lastSrc != '') {
history.lastSrc = lastSrc;
}
+ if (lastWatchEpisodeName != '') {
+ history.lastWatchEpisodeName = lastWatchEpisodeName;
+ }
var prog = history.progresses[episode];
if (prog == null) {
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index 6c89bb24..ec8fc444 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -281,7 +281,8 @@ class _PlayerItemState extends State<PlayerItem>
videoPageController.currentPlugin.name,
infoController.bangumiItem,
playerController.mediaPlayer.value.position,
- videoPageController.src);
+ videoPageController.src,
+ videoPageController.roadList[videoPageController.currentRoad].identifier[videoPageController.currentEspisode - 1]);
}
// 自动播放下一集
if (playerController.completed &&