mirrors/pilipala
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix' into alpha

Browse Source
This commit is contained in:
guozhigq
2023-09-18 23:52:14 +08:00
parent 820a1e9162 afcc5a9a02
commit 9f4b928257
4 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/http/user.dart
View File

@ -238,7 +238,7 @@ class UserHttp {
var res = await Request().post(
Api.delHistory,
queryParameters: {
'kid': 'archive_$kid',
'kid': kid,
'jsonp': 'jsonp',
'csrf': await Request.getCsrf(),
},

14
lib/pages/history/controller.dart
View File

@ -123,8 +123,15 @@ class HistoryController extends GetxController {
}
// 删除某条历史记录
Future delHistory(kid) async {
var res = await UserHttp.delHistory(kid);
Future delHistory(kid, business) async {
String resKid = 'archive_$kid';
if (business == 'live') {
resKid = 'live_$kid';
} else if (business.contains('article')) {
resKid = 'article_$kid';
}
var res = await UserHttp.delHistory(resKid);
if (res['status']) {
historyList.removeWhere((e) => e.kid == kid);
SmartDialog.showToast(res['msg']);
@ -136,7 +143,8 @@ class HistoryController extends GetxController {
List<HisListItem> result =
historyList.where((e) => e.progress == -1).toList();
for (HisListItem i in result) {
await UserHttp.delHistory(i.kid);
String resKid = 'archive_${i.kid}';
await UserHttp.delHistory(resKid);
historyList.removeWhere((e) => e.kid == i.kid);
}
SmartDialog.showToast('操作完成');

67
lib/pages/history/widgets/item.dart
View File

@ -247,26 +247,26 @@ class VideoContent extends StatelessWidget {
Theme.of(context).textTheme.labelMedium!.fontSize,
color: Theme.of(context).colorScheme.outline),
),
if (videoItem.badge != '番剧' &&
!videoItem.tagName.contains('动画') &&
videoItem.history.business != 'live' &&
!videoItem.history.business.contains('article'))
SizedBox(
width: 24,
height: 24,
child: PopupMenuButton<String>(
padding: EdgeInsets.zero,
tooltip: '功能菜单',
icon: Icon(
Icons.more_vert_outlined,
color: Theme.of(context).colorScheme.outline,
size: 14,
),
position: PopupMenuPosition.under,
// constraints: const BoxConstraints(maxHeight: 35),
onSelected: (String type) {},
itemBuilder: (BuildContext context) =>
<PopupMenuEntry<String>>[
SizedBox(
width: 24,
height: 24,
child: PopupMenuButton<String>(
padding: EdgeInsets.zero,
tooltip: '功能菜单',
icon: Icon(
Icons.more_vert_outlined,
color: Theme.of(context).colorScheme.outline,
size: 14,
),
position: PopupMenuPosition.under,
// constraints: const BoxConstraints(maxHeight: 35),
onSelected: (String type) {},
itemBuilder: (BuildContext context) =>
<PopupMenuEntry<String>>[
if (videoItem.badge != '番剧' &&
!videoItem.tagName.contains('动画') &&
videoItem.history.business != 'live' &&
!videoItem.history.business.contains('article'))
PopupMenuItem<String>(
onTap: () async {
var res = await UserHttp.toViewLater(
@ -283,21 +283,22 @@ class VideoContent extends StatelessWidget {
],
),
),
PopupMenuItem<String>(
onTap: () => ctr!.delHistory(videoItem.kid),
value: 'pause',
height: 35,
child: const Row(
children: [
Icon(Icons.close_outlined, size: 16),
SizedBox(width: 6),
Text('删除记录', style: TextStyle(fontSize: 13))
],
),
PopupMenuItem<String>(
onTap: () => ctr!.delHistory(
videoItem.kid, videoItem.history.business),
value: 'pause',
height: 35,
child: const Row(
children: [
Icon(Icons.close_outlined, size: 16),
SizedBox(width: 6),
Text('删除记录', style: TextStyle(fontSize: 13))
],
),
],
),
),
],
),
),
],
),
],

2
lib/pages/mine/view.dart
View File

@ -294,7 +294,7 @@ class _MinePageState extends State<MinePage> {
),
),
InkWell(
onTap: () => _mineController.pushFollow(),
onTap: () => _mineController.pushFans(),
borderRadius: StyleString.mdRadius,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,