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

Merge branch 'main' into feature-m3Design

Browse Source
This commit is contained in:
guozhigq
2023-07-24 22:05:20 +08:00
parent 3307623846 85eeacebb8
commit 552e510c43
13 changed files with 276 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/http/api.dart
View File

@ -104,6 +104,9 @@ class Api {
// 楼中楼
static const String replyReplyList = '/x/v2/reply/reply';
// 评论点赞
static const String likeReply = '/x/v2/reply/action';
// 发表评论
// https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/action.md
static const String replyAdd = '/x/v2/reply/add';
@ -142,6 +145,10 @@ class Api {
// https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/all?host_mid=548196587&offset=&page=1&features=itemOpusStyle
static const String followDynamic = '/x/polymer/web-dynamic/v1/feed/all';
// 动态点赞
static const String likeDynamic =
'https://api.vc.bilibili.com/dynamic_like/v1/dynamic_like/thumb';
// 获取稍后再看
static const String seeYouLater = '/x/v2/history/toview';

1
lib/http/constants.dart
View File

@ -1,4 +1,5 @@
class HttpString {
static const String baseUrl = 'https://www.bilibili.com';
static const String baseApiUrl = 'https://api.bilibili.com';
static const String tUrl = 'https://api.vc.bilibili.com';
}

27
lib/http/dynamics.dart
View File

@ -50,4 +50,31 @@ class DynamicsHttp {
};
}
}
// 动态点赞
static Future likeDynamic({
required String? dynamicId,
required int? up,
}) async {
var res = await Request().post(
Api.likeDynamic,
queryParameters: {
'dynamic_id': dynamicId,
'up': up,
'csrf': await Request.getCsrf(),
},
);
if (res.data['code'] == 0) {
return {
'status': true,
'data': res.data['data'],
};
} else {
return {
'status': false,
'data': [],
'msg': res.data['message'],
};
}
}
}

10
lib/http/init.dart
View File

@ -38,6 +38,8 @@ class Request {
dio.interceptors.add(cookieManager);
var cookie = await cookieManager.cookieJar
.loadForRequest(Uri.parse(HttpString.baseUrl));
var cookie2 = await cookieManager.cookieJar
.loadForRequest(Uri.parse(HttpString.tUrl));
if (cookie.isEmpty) {
try {
await Request().get(HttpString.baseUrl);
@ -45,6 +47,13 @@ class Request {
log("setCookie, ${e.toString()}");
}
}
if (cookie2.isEmpty) {
try {
await Request().get(HttpString.tUrl);
} catch (e) {
log("setCookie, ${e.toString()}");
}
}
}
// 移除cookie
@ -99,7 +108,6 @@ class Request {
options.headers['x-bili-mid'] = user.get(UserBoxKey.userMid).toString();
}
dio.options = options;
//添加拦截器
dio.interceptors
..add(ApiInterceptor())

28
lib/http/reply.dart
View File

@ -70,4 +70,32 @@ class ReplyHttp {
};
}
}
// 评论点赞
static Future likeReply({
required int type,
required int oid,
required int rpid,
required int action,
}) async {
var res = await Request().post(
Api.likeReply,
queryParameters: {
'type': type,
'oid': oid,
'rpid': rpid,
'action': action,
'csrf': await Request.getCsrf(),
},
);
if (res.data['code'] == 0) {
return {'status': true, 'data': res.data['data']};
} else {
return {
'status': false,
'date': [],
'msg': res.data['message'],
};
}
}
}

6
lib/pages/dynamics/controller.dart
View File

@ -46,9 +46,9 @@ class DynamicsController extends GetxController {
RxInt initialValue = 1.obs;
Future queryFollowDynamic({type = 'init'}) async {
// if (type == 'init') {
// dynamicsList!.value = [];
// }
if (type == 'init') {
dynamicsList.clear();
}
var res = await DynamicsHttp.followDynamic(
page: type == 'init' ? 1 : page,
type: dynamicsType.value.values,

1
lib/pages/dynamics/deatil/controller.dart
View File

@ -42,7 +42,6 @@ class DynamicDetailController extends GetxController {
sort: sortType.index,
);
if (res['status']) {
res['data'] = ReplyData.fromJson(res['data']);
acount.value = res['data'].page.acount;
if (res['data'].replies.isNotEmpty) {
currentPage = currentPage + 1;

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

@ -236,7 +236,7 @@ class _DynamicsPageState extends State<DynamicsPage>
List<DynamicItemModel> list =
_dynamicsController.dynamicsList;
return Obx(
() => list.length == 1
() => list.isEmpty
? skeleton()
: SliverList(
delegate:

155
lib/pages/dynamics/widgets/action_panel.dart
View File

@ -1,55 +1,118 @@
// 操作栏
import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:get/get.dart';
import 'package:pilipala/http/dynamics.dart';
import 'package:pilipala/models/dynamics/result.dart';
import 'package:pilipala/pages/dynamics/index.dart';
final DynamicsController _dynamicsController = Get.put(DynamicsController());
class ActionPanel extends StatefulWidget {
ActionPanel({
super.key,
this.item,
});
var item;
Widget action(item, context) {
ModuleStatModel stat = item.modules.moduleStat;
return Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
TextButton.icon(
onPressed: () {},
icon: const Icon(
FontAwesomeIcons.shareFromSquare,
size: 16,
),
style: TextButton.styleFrom(
padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
foregroundColor: Theme.of(context).colorScheme.outline,
),
label: Text(stat.forward!.count ?? '转发'),
),
TextButton.icon(
onPressed: () =>
_dynamicsController.pushDetail(item, 1, action: 'comment'),
icon: const Icon(
FontAwesomeIcons.comment,
size: 16,
),
style: TextButton.styleFrom(
padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
foregroundColor: Theme.of(context).colorScheme.outline,
),
label: Text(stat.comment!.count ?? '评论'),
),
TextButton.icon(
onPressed: () {},
icon: const Icon(
FontAwesomeIcons.thumbsUp,
size: 16,
),
style: TextButton.styleFrom(
padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
foregroundColor: Theme.of(context).colorScheme.outline,
),
label: Text(stat.like!.count ?? '点赞'),
)
],
);
@override
State<ActionPanel> createState() => _ActionPanelState();
}
class _ActionPanelState extends State<ActionPanel> {
final DynamicsController _dynamicsController = Get.put(DynamicsController());
late ModuleStatModel stat;
@override
void initState() {
super.initState();
stat = widget.item!.modules.moduleStat;
}
// 动态点赞
onLikeDynamic() async {
var item = widget.item!;
String dynamicId = item.idStr!;
// 1 已点赞 2 不喜欢 0 未操作
Like like = item.modules.moduleStat.like;
int count = int.parse(like.count!);
bool status = like.status!;
int up = status ? 2 : 1;
var res = await DynamicsHttp.likeDynamic(dynamicId: dynamicId, up: up);
if (res['status']) {
SmartDialog.showToast(!status ? '点赞成功' : '取消赞');
if (up == 1) {
item.modules.moduleStat.like.count = (count + 1).toString();
item.modules.moduleStat.like.status = true;
} else {
item.modules.moduleStat.like.count = (count - 1).toString();
item.modules.moduleStat.like.status = false;
}
setState(() {});
} else {
SmartDialog.showToast(res['msg']);
}
}
@override
Widget build(BuildContext context) {
var color = Theme.of(context).colorScheme.outline;
var primary = Theme.of(context).colorScheme.primary;
return Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
TextButton.icon(
onPressed: () {},
icon: const Icon(
FontAwesomeIcons.shareFromSquare,
size: 16,
),
style: TextButton.styleFrom(
padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
foregroundColor: Theme.of(context).colorScheme.outline,
),
label: Text(stat.forward!.count ?? '转发'),
),
TextButton.icon(
onPressed: () =>
_dynamicsController.pushDetail(widget.item, 1, action: 'comment'),
icon: const Icon(
FontAwesomeIcons.comment,
size: 16,
),
style: TextButton.styleFrom(
padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
foregroundColor: Theme.of(context).colorScheme.outline,
),
label: Text(stat.comment!.count ?? '评论'),
),
TextButton.icon(
onPressed: () => onLikeDynamic(),
icon: Icon(
stat.like!.status!
? FontAwesomeIcons.solidThumbsUp
: FontAwesomeIcons.thumbsUp,
size: 16,
color: stat.like!.status! ? primary : color,
),
style: TextButton.styleFrom(
padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
foregroundColor: Theme.of(context).colorScheme.outline,
),
label: AnimatedSwitcher(
duration: const Duration(milliseconds: 400),
transitionBuilder: (Widget child, Animation<double> animation) {
return ScaleTransition(scale: animation, child: child);
},
child: Text(
stat.like!.count ?? '点赞',
key: ValueKey<String>(stat.like!.count!),
style: TextStyle(
color: stat.like!.status! ? primary : color,
),
),
),
)
],
);
}
}

2
lib/pages/dynamics/widgets/dynamic_panel.dart
View File

@ -42,7 +42,7 @@ class DynamicPanel extends StatelessWidget {
content(item, context, source),
forWard(item, context, _dynamicsController, source),
const SizedBox(height: 2),
if (source == null) action(item, context),
if (source == null) ActionPanel(item: item),
],
),
),

26
lib/pages/video/detail/reply/widgets/reply_item.dart
View File

@ -9,6 +9,8 @@ import 'package:pilipala/pages/video/detail/controller.dart';
import 'package:pilipala/pages/video/detail/replyNew/index.dart';
import 'package:pilipala/utils/utils.dart';
import 'zan.dart';
class ReplyItem extends StatelessWidget {
ReplyItem({
super.key,
@ -282,29 +284,7 @@ class ReplyItem extends StatelessWidget {
},
),
),
SizedBox(
height: 32,
child: TextButton(
child: Row(
children: [
Icon(
FontAwesomeIcons.thumbsUp,
size: 16,
color: color,
),
const SizedBox(width: 4),
Text(
replyItem!.like.toString(),
style: TextStyle(
color: color,
fontSize:
Theme.of(context).textTheme.labelSmall!.fontSize),
),
],
),
onPressed: () {},
),
),
ZanButton(replyItem: replyItem, replyType: replyType),
const SizedBox(width: 5)
],
);

82
lib/pages/video/detail/reply/widgets/zan.dart Normal file
View File

@ -0,0 +1,82 @@
import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:pilipala/http/reply.dart';
import 'package:pilipala/models/common/reply_type.dart';
import 'package:pilipala/models/video/reply/item.dart';
class ZanButton extends StatefulWidget {
ZanButton({
super.key,
this.replyItem,
this.replyType,
});
ReplyItemModel? replyItem;
final ReplyType? replyType;
@override
State<ZanButton> createState() => _ZanButtonState();
}
class _ZanButtonState extends State<ZanButton> {
// 评论点赞
onLikeReply() async {
ReplyItemModel replyItem = widget.replyItem!;
int oid = replyItem.oid!;
int rpid = replyItem.rpid!;
// 1 已点赞 2 不喜欢 0 未操作
int action = replyItem.action == 0 ? 1 : 0;
var res = await ReplyHttp.likeReply(
type: widget.replyType!.index, oid: oid, rpid: rpid, action: action);
if (res['status']) {
SmartDialog.showToast(replyItem.action == 0 ? '点赞成功' : '取消赞');
if (action == 1) {
replyItem.like = replyItem.like! + 1;
replyItem.action = 1;
} else {
replyItem.like = replyItem.like! - 1;
replyItem.action = 0;
}
setState(() {});
} else {
SmartDialog.showToast(res['msg']);
}
}
@override
Widget build(BuildContext context) {
var color = Theme.of(context).colorScheme.outline;
var primary = Theme.of(context).colorScheme.primary;
return SizedBox(
height: 32,
child: TextButton(
child: Row(
children: [
Icon(
widget.replyItem!.action == 1
? FontAwesomeIcons.solidThumbsUp
: FontAwesomeIcons.thumbsUp,
size: 16,
color: widget.replyItem!.action == 1 ? primary : color,
),
const SizedBox(width: 4),
AnimatedSwitcher(
duration: const Duration(milliseconds: 400),
transitionBuilder: (Widget child, Animation<double> animation) {
return ScaleTransition(scale: animation, child: child);
},
child: Text(widget.replyItem!.like.toString(),
key: ValueKey<int>(widget.replyItem!.like!),
style: TextStyle(
color: widget.replyItem!.action == 1 ? primary : color,
fontSize:
Theme.of(context).textTheme.labelSmall!.fontSize)),
),
],
),
onPressed: () => onLikeReply(),
),
);
}
}

7
lib/pages/webview/controller.dart
View File

@ -58,10 +58,13 @@ class WebviewController extends GetxController {
try {
var cookies =
await WebviewCookieManager().getCookies(HttpString.baseUrl);
var apiCookies =
await WebviewCookieManager().getCookies(HttpString.baseUrl);
var apiCookies = await WebviewCookieManager()
.getCookies(HttpString.baseApiUrl);
var tCookies =
await WebviewCookieManager().getCookies(HttpString.tUrl);
await SetCookie.onSet(cookies, HttpString.baseUrl);
await SetCookie.onSet(apiCookies, HttpString.baseApiUrl);
await SetCookie.onSet(tCookies, HttpString.tUrl);
await UserHttp.userInfo();
var result = await UserHttp.userInfo();
print('网页登录： $result');