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

Merge branch 'main' into opt-videoPlayerControl

Browse Source
This commit is contained in:
guozhigq
2024-12-08 18:17:15 +08:00
parent 30c1a5037d 378b2098df
commit 4538844a96
25 changed files with 735 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/common/pages_bottom_sheet.dart
View File

@ -778,10 +778,15 @@ class UgcSeasonBuild extends StatelessWidget {
],
),
if (ugcSeason.intro != null && ugcSeason.intro != '') ...[
const SizedBox(height: 4),
Text(
ugcSeason.intro!,
style: TextStyle(color: outline, fontSize: 12),
const SizedBox(height: 6),
Container(
constraints: const BoxConstraints(maxHeight: 100),
child: SingleChildScrollView(
child: Text(
ugcSeason.intro!,
style: TextStyle(color: outline, fontSize: 12),
),
),
),
],
const SizedBox(height: 4),

5
lib/pages/video/detail/introduction/widgets/group_panel.dart → lib/common/widgets/group_panel.dart
View File

@ -1,12 +1,10 @@
import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/common/widgets/http_error.dart';
import 'package:pilipala/http/member.dart';
import 'package:pilipala/models/member/tags.dart';
import 'package:pilipala/utils/feed_back.dart';
import 'package:pilipala/utils/storage.dart';
class GroupPanel extends StatefulWidget {
final int? mid;
@ -18,7 +16,6 @@ class GroupPanel extends StatefulWidget {
}
class _GroupPanelState extends State<GroupPanel> {
final Box<dynamic> localCache = GStorage.localCache;
late Future _futureBuilderFuture;
late List<MemberTagItemModel> tagsList;
bool showDefault = true;
@ -137,7 +134,7 @@ class _GroupPanelState extends State<GroupPanel> {
left: 20,
right: 20,
top: 12,
bottom: MediaQuery.of(context).padding.bottom + 12,
bottom: MediaQuery.paddingOf(context).bottom + 12,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,

23
lib/http/init.dart
View File

@ -1,13 +1,11 @@
// ignore_for_file: avoid_print
import 'dart:async';
import 'dart:developer';
import 'dart:io';
import 'package:cookie_jar/cookie_jar.dart';
import 'package:dio/dio.dart';
import 'package:dio/io.dart';
import 'package:dio_cookie_manager/dio_cookie_manager.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/id_utils.dart';
import '../utils/storage.dart';
import '../utils/utils.dart';
@ -39,18 +37,7 @@ class Request {
dio.interceptors.add(cookieManager);
final List<Cookie> cookie = await cookieManager.cookieJar
.loadForRequest(Uri.parse(HttpString.baseUrl));
final UserInfoData? userInfo = userInfoCache.get('userInfoCache');
if (userInfo != null && userInfo.mid != null) {
final List<Cookie> cookie2 = await cookieManager.cookieJar
.loadForRequest(Uri.parse(HttpString.tUrl));
if (cookie2.isEmpty) {
try {
await Request().get(HttpString.tUrl);
} catch (e) {
log("setCookie, ${e.toString()}");
}
}
}
final userInfo = userInfoCache.get('userInfoCache');
setOptionsHeaders(userInfo, userInfo != null && userInfo.mid != null);
String baseUrlType = 'default';
if (setting.get(SettingBoxKey.enableGATMode, defaultValue: false)) {
@ -69,10 +56,10 @@ class Request {
static Future<String> getCsrf() async {
List<Cookie> cookies = await cookieManager.cookieJar
.loadForRequest(Uri.parse(HttpString.baseUrl));
String token = '';
if (cookies.where((e) => e.name == 'bili_jct').isNotEmpty) {
token = cookies.firstWhere((e) => e.name == 'bili_jct').value;
}
String token = cookies
.firstWhere((e) => e.name == 'bili_jct',
orElse: () => Cookie('bili_jct', ''))
.value;
return token;
}

12
lib/http/interceptor.dart
View File

@ -3,7 +3,7 @@
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:dio/dio.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:pilipala/utils/login.dart';
// import 'package:pilipala/utils/login.dart';
class ApiInterceptor extends Interceptor {
@override
@ -19,9 +19,9 @@ class ApiInterceptor extends Interceptor {
void onResponse(Response response, ResponseInterceptorHandler handler) {
try {
// 在响应之后处理数据
if (response.data is Map && response.data['code'] == -101) {
LoginUtils.loginOut();
}
// if (response.data is Map && response.data['code'] == -101) {
// LoginUtils.loginOut();
// }
} catch (err) {
print('ApiInterceptor: $err');
}
@ -39,6 +39,8 @@ class ApiInterceptor extends Interceptor {
SmartDialog.showToast(
await dioError(err),
displayType: SmartToastType.onlyRefresh,
displayTime: const Duration(seconds: 1),
debounce: true,
);
}
super.onError(err, handler);
@ -62,7 +64,7 @@ class ApiInterceptor extends Interceptor {
return '发送请求超时，请检查网络设置';
case DioExceptionType.unknown:
final String res = await checkConnect();
return '$res，网络异常！';
return '$res ${error.error}';
}
}

19
lib/main.dart
View File

@ -216,6 +216,21 @@ class BuildMainApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
Box setting = GStorage.setting;
/// 纯黑模式主题配置
ColorScheme? pureDarkColorScheme;
final bool enablePureBlack =
setting.get(SettingBoxKey.enablePureBlack, defaultValue: false);
if (enablePureBlack) {
pureDarkColorScheme = darkColorScheme.copyWith(
background: Colors.black,
surface: Colors.black,
onPrimary: Colors.black,
onSecondary: Colors.black,
);
}
final SnackBarThemeData snackBarTheme = SnackBarThemeData(
actionTextColor: lightColorScheme.primary,
backgroundColor: lightColorScheme.secondaryContainer,
@ -255,13 +270,13 @@ class BuildMainApp extends StatelessWidget {
title: 'PiliPala',
theme: buildThemeData(
currentThemeValue == ThemeType.dark
? darkColorScheme
? pureDarkColorScheme ?? darkColorScheme
: lightColorScheme,
),
darkTheme: buildThemeData(
currentThemeValue == ThemeType.light
? lightColorScheme
: darkColorScheme,
: pureDarkColorScheme ?? darkColorScheme,
),
localizationsDelegates: const [
GlobalCupertinoLocalizations.delegate,

5
lib/models/search/suggest.dart
View File

@ -84,10 +84,7 @@ Widget highlightText(String str) {
String remainingText = str.substring(currentIndex);
// 将剩余的普通文本部分添加到 children 列表中
children.add(TextSpan(
text: remainingText,
style: DefaultTextStyle.of(Get.context!).style,
));
children.add(TextSpan(text: remainingText));
}
// 使用 Text.rich 创建包含高亮显示的富文本小部件，并返回

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

@ -117,20 +117,23 @@ class DynamicsController extends GetxController {
/// 点击评论action 直接查看评论
if (action == 'comment') {
Get.toNamed('/dynamicDetail',
arguments: {'item': item, 'floor': floor, 'action': action});
arguments: {'item': item, 'floor': floor, 'action': action},
preventDuplicates: false);
return false;
}
switch (item!.type) {
/// 转发的动态
case 'DYNAMIC_TYPE_FORWARD':
Get.toNamed('/dynamicDetail',
arguments: {'item': item, 'floor': floor});
arguments: {'item': item, 'floor': floor},
preventDuplicates: false);
break;
/// 图文动态查看
case 'DYNAMIC_TYPE_DRAW':
Get.toNamed('/dynamicDetail',
arguments: {'item': item, 'floor': floor});
arguments: {'item': item, 'floor': floor},
preventDuplicates: false);
break;
case 'DYNAMIC_TYPE_AV':
String bvid = item.modules.moduleDynamic.major.archive.bvid;
@ -188,7 +191,8 @@ class DynamicsController extends GetxController {
case 'DYNAMIC_TYPE_WORD':
print('纯文本');
Get.toNamed('/dynamicDetail',
arguments: {'item': item, 'floor': floor});
arguments: {'item': item, 'floor': floor},
preventDuplicates: false);
break;
case 'DYNAMIC_TYPE_LIVE_RCMD':
DynamicLiveModel liveRcmd = item.modules.moduleDynamic.major.liveRcmd;

54
lib/pages/dynamics/up_dynamic/route_panel.dart
View File

@ -1,3 +1,5 @@
import 'dart:ui';
import 'package:easy_debounce/easy_throttle.dart';
import 'package:get/get.dart';
import 'package:flutter/material.dart';
@ -61,6 +63,7 @@ class _OverlayPanelState extends State<OverlayPanel>
void onClickUp(data, i, {type = 'click'}) {
if (type == 'click') {
data.hasUpdate = false;
pageController.jumpToPage(i);
}
}
@ -81,11 +84,11 @@ class _OverlayPanelState extends State<OverlayPanel>
color: Colors.transparent,
borderRadius: BorderRadius.circular(20),
),
child: Column(
children: [
SizedBox(
height: 50,
child: TabBar(
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 8.0, sigmaY: 8.0),
child: Column(
children: [
TabBar(
controller: _tabController,
dividerColor: Colors.transparent,
automaticIndicatorColorAdjustment: false,
@ -106,25 +109,26 @@ class _OverlayPanelState extends State<OverlayPanel>
});
},
),
),
Expanded(
child: PageView.builder(
itemCount: upList.length,
controller: pageController,
itemBuilder: (BuildContext context, int index) {
return Container(
clipBehavior: Clip.antiAlias,
margin: const EdgeInsets.fromLTRB(10, 12, 10, 0),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surface,
borderRadius: BorderRadius.circular(20),
),
child: UpDyanmicsPage(upInfo: upList[index], ctr: widget.ctr),
);
},
Expanded(
child: PageView.builder(
itemCount: upList.length,
controller: pageController,
itemBuilder: (BuildContext context, int index) {
return Container(
clipBehavior: Clip.antiAlias,
margin: const EdgeInsets.fromLTRB(10, 12, 10, 0),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surface,
borderRadius: BorderRadius.circular(20),
),
child:
UpDyanmicsPage(upInfo: upList[index], ctr: widget.ctr),
);
},
),
),
),
],
],
),
),
);
}
@ -139,8 +143,8 @@ class _OverlayPanelState extends State<OverlayPanel>
duration: const Duration(milliseconds: 200),
scale: currentMid == data.mid ? 1 : 0.9,
child: NetworkImgLayer(
width: contentWidth,
height: contentWidth,
width: 46,
height: 46,
src: data.face,
type: 'avatar',
),

1
lib/pages/dynamics/widgets/up_panel.dart
View File

@ -44,6 +44,7 @@ class _UpPanelState extends State<UpPanel> {
void onClickUp(data, i) {
currentMid.value = data.mid;
data.hasUpdate = false;
Navigator.push(
context,
PlPopupRoute(

27
lib/pages/follow/widgets/follow_item.dart
View File

@ -3,8 +3,8 @@ import 'package:get/get.dart';
import 'package:pilipala/common/widgets/network_img_layer.dart';
import 'package:pilipala/models/follow/result.dart';
import 'package:pilipala/pages/follow/index.dart';
import 'package:pilipala/pages/video/detail/introduction/widgets/group_panel.dart';
import 'package:pilipala/utils/feed_back.dart';
import 'package:pilipala/utils/follow.dart';
import 'package:pilipala/utils/utils.dart';
class FollowItem extends StatelessWidget {
@ -47,28 +47,11 @@ class FollowItem extends StatelessWidget {
height: 34,
child: TextButton(
onPressed: () async {
await showModalBottomSheet(
int followStatus = await FollowUtils(
context: context,
useSafeArea: true,
isScrollControlled: true,
builder: (BuildContext context) {
return DraggableScrollableSheet(
initialChildSize: 0.6,
minChildSize: 0,
maxChildSize: 1,
snap: true,
expand: false,
snapSizes: const [0.6],
builder: (BuildContext context,
ScrollController scrollController) {
return GroupPanel(
mid: item.mid!,
scrollController: scrollController,
);
},
);
},
);
followStatus: 2,
mid: item.mid!,
).showFollowSheet();
},
style: TextButton.styleFrom(
padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),

33
lib/pages/login/controller.dart
View File

@ -1,14 +1,19 @@
import 'dart:async';
import 'dart:io';
import 'package:cookie_jar/cookie_jar.dart';
import 'package:dio_cookie_manager/dio_cookie_manager.dart';
import 'package:encrypt/encrypt.dart';
import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'package:pilipala/http/constants.dart';
import 'package:pilipala/http/index.dart';
import 'package:pilipala/http/login.dart';
import 'package:gt3_flutter_plugin/gt3_flutter_plugin.dart';
import 'package:pilipala/models/login/index.dart';
import 'package:pilipala/utils/login.dart';
import 'package:pilipala/utils/utils.dart';
class LoginPageController extends GetxController {
final GlobalKey mobFormKey = GlobalKey<FormState>();
@ -341,4 +346,32 @@ class LoginPageController extends GetxController {
Get.back();
}
}
// cookie登录
Future loginInByCookie({
required String cookiesStr,
String domain = HttpString.baseUrl,
}) async {
final List<String> cookiesStrList = cookiesStr.split('; ');
final List<Cookie> cookiesList = cookiesStrList.map((cookie) {
final cookieArr = cookie.split('=');
return Cookie(cookieArr[0], cookieArr[1]);
}).toList();
final String cookiePath = await Utils.getCookiePath();
final cookieJar = PersistCookieJar(
ignoreExpires: true,
storage: FileStorage(cookiePath),
);
CookieManager cookieManager = CookieManager(cookieJar);
Request.cookieManager = cookieManager;
await Request.cookieManager.cookieJar
.saveFromResponse(Uri.parse(HttpString.baseUrl), cookiesList);
try {
Request.dio.options.headers['cookie'] = cookiesStr;
} catch (err) {
debugPrint(err.toString());
}
LoginUtils.confirmLogin('', null);
}
}

235
lib/pages/login/view.dart
View File

@ -14,6 +14,144 @@ class LoginPage extends StatefulWidget {
class _LoginPageState extends State<LoginPage> {
final LoginPageController _loginPageCtr = Get.put(LoginPageController());
// 浏览器登录
void loginInByWeb() {
Get.offNamed(
'/webview',
parameters: {
'url': 'https://passport.bilibili.com/h5-app/passport/login',
'type': 'login',
'pageTitle': '登录bilibili',
},
);
}
// 二维码方式登录
void loginInByWebQrcode() {
showDialog(
context: context,
builder: (context) {
return StatefulBuilder(builder: (context, StateSetter setState) {
return AlertDialog(
title: Row(
children: [
const Text('扫码登录'),
IconButton(
onPressed: () {
setState(() {});
},
icon: const Icon(Icons.refresh),
),
],
),
contentPadding: const EdgeInsets.fromLTRB(0, 0, 0, 4),
content: AspectRatio(
aspectRatio: 1,
child: Container(
width: 200,
padding: const EdgeInsets.all(12),
child: FutureBuilder(
future: _loginPageCtr.getWebQrcode(),
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.done) {
if (snapshot.data == null) {
return const SizedBox();
}
Map data = snapshot.data as Map;
return QrImageView(
data: data['data']['url'],
backgroundColor: Colors.white,
);
} else {
return const Center(
child: SizedBox(
width: 40,
height: 40,
child: CircularProgressIndicator(),
),
);
}
},
),
),
),
actions: [
TextButton(
onPressed: () {},
child: Obx(() {
return Text(
'有效期: ${_loginPageCtr.validSeconds.value}s',
style: Theme.of(context).textTheme.titleMedium,
);
}),
),
TextButton(
onPressed: () {},
child: Text(
'检查登录状态',
style: TextStyle(
fontSize: Theme.of(context).textTheme.titleMedium!.fontSize,
),
),
)
],
);
});
},
).then((value) {
_loginPageCtr.validTimer!.cancel();
});
}
// cookie登录
// cookie登录
void loginInByCookie() async {
var cookies = '';
final outline = Theme.of(context).colorScheme.outline;
showDialog(
context: context,
builder: (BuildContext context) {
return AlertDialog(
title: const Text('Cookie登录'),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
const Text('请将主站cookie粘贴到下方输入框中，点击「确认」即可完成登录。（记得清空粘贴板～）'),
const SizedBox(height: 12),
TextField(
minLines: 1,
maxLines: 3,
decoration: InputDecoration(
labelText: 'cookie',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(6.0),
),
),
onChanged: (e) => cookies = e,
),
],
),
actions: [
TextButton(
onPressed: Navigator.of(context).pop,
child: Text('取消', style: TextStyle(color: outline))),
TextButton(
onPressed: () async {
if (cookies.isEmpty) {
return;
}
await _loginPageCtr.loginInByCookie(cookiesStr: cookies);
if (context.mounted) {
Navigator.of(context).pop();
}
},
child: const Text('确认'))
],
);
},
);
}
@override
void dispose() {
_loginPageCtr.validTimer?.cancel();
@ -43,100 +181,17 @@ class _LoginPageState extends State<LoginPage> {
actions: [
IconButton(
tooltip: '浏览器打开',
onPressed: () {
Get.offNamed(
'/webview',
parameters: {
'url': 'https://passport.bilibili.com/h5-app/passport/login',
'type': 'login',
'pageTitle': '登录bilibili',
},
);
},
onPressed: loginInByWeb,
icon: const Icon(Icons.language, size: 20),
),
IconButton(
tooltip: 'cookie登录',
onPressed: loginInByCookie,
icon: const Icon(Icons.cookie_outlined, size: 20),
),
IconButton(
tooltip: '二维码登录',
onPressed: () {
showDialog(
context: context,
builder: (context) {
return StatefulBuilder(
builder: (context, StateSetter setState) {
return AlertDialog(
title: Row(
children: [
const Text('扫码登录'),
IconButton(
onPressed: () {
setState(() {});
},
icon: const Icon(Icons.refresh),
),
],
),
contentPadding: const EdgeInsets.fromLTRB(0, 0, 0, 4),
content: AspectRatio(
aspectRatio: 1,
child: Container(
width: 200,
padding: const EdgeInsets.all(12),
child: FutureBuilder(
future: _loginPageCtr.getWebQrcode(),
builder: (context, snapshot) {
if (snapshot.connectionState ==
ConnectionState.done) {
if (snapshot.data == null) {
return const SizedBox();
}
Map data = snapshot.data as Map;
return QrImageView(
data: data['data']['url'],
backgroundColor: Colors.white,
);
} else {
return const Center(
child: SizedBox(
width: 40,
height: 40,
child: CircularProgressIndicator(),
),
);
}
},
),
),
),
actions: [
TextButton(
onPressed: () {},
child: Obx(() {
return Text(
'有效期: ${_loginPageCtr.validSeconds.value}s',
style: Theme.of(context).textTheme.titleMedium,
);
}),
),
TextButton(
onPressed: () {},
child: Text(
'检查登录状态',
style: TextStyle(
fontSize: Theme.of(context)
.textTheme
.titleMedium!
.fontSize,
),
),
)
],
);
});
},
).then((value) {
_loginPageCtr.validTimer!.cancel();
});
},
onPressed: loginInByWebQrcode,
icon: const Icon(Icons.qr_code, size: 20),
),
const SizedBox(width: 22),

95
lib/pages/member/controller.dart
View File

@ -1,15 +1,14 @@
import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/http/member.dart';
import 'package:pilipala/http/user.dart';
import 'package:pilipala/http/video.dart';
import 'package:pilipala/models/member/archive.dart';
import 'package:pilipala/models/member/coin.dart';
import 'package:pilipala/models/member/info.dart';
import 'package:pilipala/models/member/like.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/follow.dart';
import 'package:pilipala/utils/storage.dart';
import 'package:share_plus/share_plus.dart';
@ -29,6 +28,12 @@ class MemberController extends GetxController {
RxList<MemberCoinsDataModel> recentCoinsList = <MemberCoinsDataModel>[].obs;
RxList<MemberLikeDataModel> recentLikeList = <MemberLikeDataModel>[].obs;
RxBool isOwner = false.obs;
final Map<int, String> attributeTextMap = {
1: '悄悄关注',
2: '已关注',
6: '已互粉',
128: '已拉黑',
};
@override
void onInit() {
@ -85,11 +90,12 @@ class MemberController extends GetxController {
SmartDialog.showToast('账号未登录');
return;
}
if (attribute.value == 128) {
modifyRelation('block');
} else {
modifyRelation('follow');
}
attribute.value = await FollowUtils(
context: Get.context!,
followStatus: attribute.value,
mid: mid,
).showFollowSheet();
attributeText.value = attributeTextMap[attribute.value] ?? '关注';
}
// 关系查询
@ -99,16 +105,10 @@ class MemberController extends GetxController {
var res = await UserHttp.hasFollow(mid);
if (res['status']) {
attribute.value = res['data']['attribute'];
final Map<int, String> attributeTextMap = {
1: '悄悄关注',
2: '已关注',
6: '已互关',
128: '已拉黑',
};
attributeText.value = attributeTextMap[attribute.value] ?? '关注';
if (res['data']['special'] == 1) {
attributeText.value = '特别关注';
}
attributeText.value = attributeTextMap[attribute.value] ?? '关注';
}
}
@ -118,66 +118,15 @@ class MemberController extends GetxController {
SmartDialog.showToast('账号未登录');
return;
}
modifyRelation('block');
}
// 合并关注/取关和拉黑逻辑
Future modifyRelation(String actionType) async {
String contentText;
int act;
if (actionType == 'follow') {
contentText = memberInfo.value.isFollowed! ? '确定取消关注UP主?' : '确定关注UP主?';
act = memberInfo.value.isFollowed! ? 2 : 1;
} else if (actionType == 'block') {
contentText = attribute.value != 128 ? '确定拉黑UP主?' : '确定从黑名单移除UP主?';
act = attribute.value != 128 ? 5 : 6;
} else {
return;
}
showDialog(
final String actionType = attribute.value == 128 ? 'remove' : 'block';
attribute.value = await FollowUtils(
context: Get.context!,
builder: (BuildContext context) {
return AlertDialog(
title: const Text('提示'),
content: Text(contentText),
actions: [
TextButton(
onPressed: () => Navigator.of(context).pop(),
child: Text(
'点错了',
style: TextStyle(color: Theme.of(context).colorScheme.outline),
),
),
TextButton(
onPressed: () async {
var res = await VideoHttp.relationMod(
mid: mid,
act: act,
reSrc: 11,
);
SmartDialog.dismiss();
if (res['status']) {
if (actionType == 'follow') {
memberInfo.value.isFollowed = !memberInfo.value.isFollowed!;
} else if (actionType == 'block') {
attribute.value = attribute.value != 128 ? 128 : 0;
attributeText.value = attribute.value == 128 ? '已拉黑' : '关注';
memberInfo.value.isFollowed = false;
}
relationSearch();
if (context.mounted) {
Navigator.of(context).pop();
}
memberInfo.update((val) {});
}
},
child: const Text('确定'),
)
],
);
},
);
followStatus: attribute.value,
mid: mid,
).modifyRelationFetch(actionType, isDirect: true);
if (attribute.value != -1) {
attributeText.value = attributeTextMap[attribute.value] ?? '关注';
}
}
void shareUser() {

3
lib/pages/member_search/controller.dart
View File

@ -37,6 +37,7 @@ class MemberSearchController extends GetxController {
} else {
Get.back();
}
loadingStatus.value = 'init';
}
void onChange(value) {
@ -76,7 +77,7 @@ class MemberSearchController extends GetxController {
archivePn += 1;
hasRequest = true;
}
// loadingStatus.value = 'finish';
loadingStatus.value = 'finish';
return res;
}

9
lib/pages/setting/style_setting.dart
View File

@ -249,6 +249,15 @@ class _StyleSettingState extends State<StyleSetting> {
'当前模式：${settingController.themeType.value.description}',
style: subTitleStyle)),
),
SetSwitchItem(
title: '纯黑模式',
subTitle: '深色模式时使用纯黑色背景，适用于OLED屏幕',
setKey: SettingBoxKey.enablePureBlack,
defaultVal: false,
callFn: (bool val) => {
if (val && Get.isDarkMode) {Get.appUpdate()}
},
),
ListTile(
dense: false,
onTap: () => settingController.setDynamicBadgeMode(context),

167
lib/pages/video/detail/introduction/controller.dart
View File

@ -17,6 +17,7 @@ import 'package:pilipala/pages/video/detail/controller.dart';
import 'package:pilipala/pages/video/detail/reply/index.dart';
import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
import 'package:pilipala/utils/feed_back.dart';
import 'package:pilipala/utils/follow.dart';
import 'package:pilipala/utils/global_data_cache.dart';
import 'package:pilipala/utils/id_utils.dart';
import 'package:pilipala/utils/storage.dart';
@ -26,7 +27,6 @@ import '../../../../common/pages_bottom_sheet.dart';
import '../../../../models/common/video_episode_type.dart';
import '../../../../utils/drawer.dart';
import '../related/index.dart';
import 'widgets/group_panel.dart';
class VideoIntroController extends GetxController {
VideoIntroController({required this.bvid});
@ -50,7 +50,7 @@ class VideoIntroController extends GetxController {
List addMediaIdsNew = [];
List delMediaIdsNew = [];
// 关注状态 默认未关注
RxMap followStatus = {}.obs;
RxInt followStatus = (-1).obs;
RxInt lastPlayCid = 0.obs;
UserInfoData? userInfo;
RxList<VideoTagItem> videoTags = <VideoTagItem>[].obs;
@ -66,6 +66,8 @@ class VideoIntroController extends GetxController {
late bool enableRelatedVideo;
UgcSeason? ugcSeason;
RxList<Part> pages = <Part>[].obs;
// 默认原创视频
int copyright = 1;
@override
void onInit() {
@ -94,6 +96,7 @@ class VideoIntroController extends GetxController {
videoDetail.value = result['data']!;
ugcSeason = result['data']!.ugcSeason;
pages.value = result['data']!.pages!;
copyright = result['data']!.copyright!;
if (type == null) {
lastPlayCid.value = cid ?? videoDetail.value.cid!;
}
@ -215,7 +218,7 @@ class VideoIntroController extends GetxController {
contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 24),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [1, 2]
children: (copyright == 2 ? [1] : [1, 2])
.map(
(e) => ListTile(
title: Padding(
@ -334,113 +337,23 @@ class VideoIntroController extends GetxController {
}
var result = await VideoHttp.hasFollow(mid: videoDetail.value.owner!.mid!);
if (result['status']) {
followStatus.value = result['data'];
followStatus.value = result['data']['attribute'];
}
return result;
}
// 关注/取关up
Future actionRelationMod() async {
Future actionRelationMod(BuildContext context) async {
feedBack();
if (userInfo == null) {
SmartDialog.showToast('账号未登录');
return;
}
final int currentStatus = followStatus['attribute'];
if (currentStatus == 128) {
modifyRelation('block', currentStatus);
} else {
modifyRelation('follow', currentStatus);
}
}
// 操作用户关系
Future modifyRelation(String actionType, int currentStatus) async {
final int mid = videoDetail.value.owner!.mid!;
String contentText;
int act;
if (actionType == 'follow') {
contentText = currentStatus != 0 ? '确定取消关注UP主?' : '确定关注UP主?';
act = currentStatus != 0 ? 2 : 1;
} else if (actionType == 'block') {
contentText = '确定从黑名单移除UP主?';
act = 6;
} else {
return;
}
showDialog(
context: Get.context!,
builder: (BuildContext context) {
final Color outline = Theme.of(Get.context!).colorScheme.outline;
return AlertDialog(
title: const Text('提示'),
content: Text(contentText),
actions: [
TextButton(
onPressed: Navigator.of(context).pop,
child: Text('点错了', style: TextStyle(color: outline)),
),
TextButton(
onPressed: () => modifyRelationFetch(
context,
mid,
act,
currentStatus,
actionType,
),
child: const Text('确定'),
)
],
);
},
);
}
// 操作用户关系Future
Future modifyRelationFetch(
BuildContext context,
mid,
act,
currentStatus,
actionType,
) async {
var res = await VideoHttp.relationMod(mid: mid, act: act, reSrc: 11);
if (context.mounted) {
Navigator.of(context).pop();
}
if (res['status']) {
if (actionType == 'follow') {
final Map<int, int> statusMap = {
0: 2,
2: 0,
};
late int actionStatus;
actionStatus = statusMap[currentStatus] ?? 0;
followStatus['attribute'] = actionStatus;
if (currentStatus == 0 && Get.context!.mounted) {
ScaffoldMessenger.of(Get.context!).showSnackBar(
SnackBar(
content: const Text('关注成功'),
duration: const Duration(seconds: 2),
action: SnackBarAction(
label: '设置分组',
onPressed: setFollowGroup,
),
showCloseIcon: true,
),
);
} else {
SmartDialog.showToast('取消关注成功');
}
} else if (actionType == 'block') {
followStatus['attribute'] = 0;
SmartDialog.showToast('取消拉黑成功');
}
followStatus.refresh();
} else {
SmartDialog.showToast(res['msg']);
}
followStatus.value = await FollowUtils(
context: context,
followStatus: followStatus.value,
mid: videoDetail.value.owner!.mid!,
).showFollowSheet();
}
// 修改分P或番剧分集
@ -565,33 +478,33 @@ class VideoIntroController extends GetxController {
}
// 设置关注分组
void setFollowGroup() async {
final mediaQueryData = MediaQuery.of(Get.context!);
final contentHeight = mediaQueryData.size.height - kToolbarHeight;
final double initialChildSize =
(contentHeight - Get.width * 9 / 16) / contentHeight;
await showModalBottomSheet(
context: Get.context!,
useSafeArea: true,
isScrollControlled: true,
builder: (BuildContext context) {
return DraggableScrollableSheet(
initialChildSize: initialChildSize,
minChildSize: 0,
maxChildSize: 1,
snap: true,
expand: false,
snapSizes: [initialChildSize],
builder: (BuildContext context, ScrollController scrollController) {
return GroupPanel(
mid: videoDetail.value.owner!.mid!,
scrollController: scrollController,
);
},
);
},
);
}
// void setFollowGroup() async {
// final mediaQueryData = MediaQuery.of(Get.context!);
// final contentHeight = mediaQueryData.size.height - kToolbarHeight;
// final double initialChildSize =
// (contentHeight - Get.width * 9 / 16) / contentHeight;
// await showModalBottomSheet(
// context: Get.context!,
// useSafeArea: true,
// isScrollControlled: true,
// builder: (BuildContext context) {
// return DraggableScrollableSheet(
// initialChildSize: initialChildSize,
// minChildSize: 0,
// maxChildSize: 1,
// snap: true,
// expand: false,
// snapSizes: [initialChildSize],
// builder: (BuildContext context, ScrollController scrollController) {
// return GroupPanel(
// mid: videoDetail.value.owner!.mid!,
// scrollController: scrollController,
// );
// },
// );
// },
// );
// }
// ai总结
Future aiConclusion() async {

51
lib/pages/video/detail/introduction/view.dart
View File

@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/common/constants.dart';
import 'package:pilipala/common/skeleton/video_intro.dart';
import 'package:pilipala/common/widgets/badge.dart';
import 'package:pilipala/common/widgets/http_error.dart';
import 'package:pilipala/pages/video/detail/index.dart';
import 'package:pilipala/common/widgets/network_img_layer.dart';
@ -17,6 +18,7 @@ import 'package:pilipala/models/video_detail_res.dart';
import 'package:pilipala/pages/video/detail/introduction/controller.dart';
import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart';
import 'package:pilipala/utils/feed_back.dart';
import 'package:pilipala/utils/follow.dart';
import 'package:pilipala/utils/global_data_cache.dart';
import 'package:pilipala/utils/storage.dart';
import 'package:pilipala/utils/utils.dart';
@ -264,6 +266,26 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
Widget build(BuildContext context) {
final ThemeData t = Theme.of(context);
final Color outline = t.colorScheme.outline;
const TextStyle titleStyle = TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
);
TextSpan titltWidget = TextSpan(
children: [
WidgetSpan(
child: Visibility(
visible: widget.videoDetail!.copyright == 2,
child: const PBadge(text: '转载', type: 'color'),
),
),
const TextSpan(text: ' '),
TextSpan(
text: widget.videoDetail!.title!,
style: titleStyle,
),
],
);
return SliverPadding(
padding: const EdgeInsets.only(
left: StyleString.safeSpace,
@ -285,25 +307,8 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
},
child: ExpandablePanel(
controller: _expandableCtr,
collapsed: Text(
widget.videoDetail!.title!,
softWrap: true,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
expanded: Text(
widget.videoDetail!.title!,
softWrap: true,
maxLines: 10,
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
collapsed: Text.rich(softWrap: true, maxLines: 2, titltWidget),
expanded: Text.rich(softWrap: true, maxLines: 10, titltWidget),
theme: const ExpandableThemeData(
animationDuration: Duration(milliseconds: 300),
scrollAnimationDuration: Duration(milliseconds: 300),
@ -454,14 +459,14 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
Obx(
() {
final int attr =
videoIntroController.followStatus['attribute'] ?? 0;
return videoIntroController.followStatus.isEmpty
videoIntroController.followStatus.value;
return attr == -1
? const SizedBox()
: SizedBox(
height: 32,
child: TextButton(
onPressed:
videoIntroController.actionRelationMod,
onPressed: () => videoIntroController
.actionRelationMod(context),
style: TextButton.styleFrom(
padding: const EdgeInsets.only(
left: 8,

81
lib/pages/video/detail/view.dart
View File

@ -1,5 +1,6 @@
import 'dart:async';
import 'dart:io';
import 'dart:math';
import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart';
import 'package:floating/floating.dart';
@ -76,7 +77,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
getStatusHeight();
heroTag = Get.arguments['heroTag'];
vdCtr = Get.put(VideoDetailController(), tag: heroTag);
vdCtr.sheetHeight.value = localCache.get('sheetHeight');
vdCtr.sheetHeight.value = GlobalDataCache.sheetHeight;
videoIntroController = Get.put(
VideoIntroController(bvid: Get.parameters['bvid']!),
tag: heroTag);
@ -223,8 +224,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
void _extendNestCtrListener() {
final double offset = _extendNestCtr.position.pixels;
if (vdCtr.videoDirection.value == 'horizontal') {
vdCtr.sheetHeight.value =
Get.size.height - videoHeight - statusBarHeight + offset;
vdCtr.sheetHeight.value = max(GlobalDataCache.sheetHeight,
Get.size.height - videoHeight - statusBarHeight + offset);
appbarStream.add(offset);
} else {
if (offset > (Get.size.width * 22 / 16 - videoHeight)) {
@ -502,7 +503,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
@override
Widget build(BuildContext context) {
final sizeContext = MediaQuery.sizeOf(context);
final _context = MediaQuery.of(context);
final orientation = MediaQuery.orientationOf(context);
late final double verticalHeight = sizeContext.width * 22 / 16;
late double defaultVideoHeight = vdCtr.videoDirection.value == 'vertical'
? verticalHeight
@ -517,12 +518,12 @@ class _VideoDetailPageState extends State<VideoDetailPage>
});
// 竖屏
final bool isPortrait = _context.orientation == Orientation.portrait;
final bool isPortrait = orientation == Orientation.portrait;
// 横屏
final bool isLandscape = _context.orientation == Orientation.landscape;
final bool isLandscape = orientation == Orientation.landscape;
final Rx<bool> isFullScreen = plPlayerController?.isFullScreen ?? false.obs;
// 全屏时高度撑满
if (isLandscape || isFullScreen.value == true) {
if (isLandscape || isFullScreen.value) {
videoHeight.value = Get.size.height;
enterFullScreen();
} else {
@ -634,10 +635,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
}
Widget childWhenDisabled = SafeArea(
top: MediaQuery.of(context).orientation == Orientation.portrait &&
plPlayerController?.isFullScreen.value == true,
bottom: MediaQuery.of(context).orientation == Orientation.portrait &&
plPlayerController?.isFullScreen.value == true,
top: isPortrait && isFullScreen.value,
bottom: isPortrait && isFullScreen.value,
left: false,
right: false,
child: Stack(
@ -660,22 +659,25 @@ class _VideoDetailPageState extends State<VideoDetailPage>
return <Widget>[
Obx(
() {
final Orientation orientation =
MediaQuery.of(context).orientation;
final bool isLandscape =
MediaQuery.orientationOf(context) ==
Orientation.landscape;
final bool isFullScreen =
plPlayerController?.isFullScreen.value == true;
final double expandedHeight =
orientation == Orientation.landscape || isFullScreen
? (MediaQuery.sizeOf(context).height -
(orientation == Orientation.landscape
? 0
: MediaQuery.of(context).padding.top))
: videoHeight.value;
if (orientation == Orientation.landscape ||
isFullScreen) {
plPlayerController?.isFullScreen.value ?? false;
late double expandedHeight;
if (isLandscape || isFullScreen) {
enterFullScreen();
expandedHeight = (MediaQuery.sizeOf(context).height -
(isLandscape
? 0
: MediaQuery.paddingOf(context).top));
} else {
exitFullScreen();
if (vdCtr.videoDirection.value == 'vertical') {
videoHeight.value = verticalHeight;
}
expandedHeight = videoHeight.value;
}
return SliverAppBar(
automaticallyImplyLeading: false,
@ -687,21 +689,24 @@ class _VideoDetailPageState extends State<VideoDetailPage>
backgroundColor: Colors.black,
flexibleSpace: SizedBox.expand(
child: PopScope(
canPop:
plPlayerController?.isFullScreen.value != true,
canPop: !isFullScreen,
onPopInvoked: (bool didPop) {
if (plPlayerController?.controlsLock.value ==
true) {
plPlayerController?.onLockControl(false);
return;
if (plPlayerController != null) {
if (plPlayerController!.controlsLock.value) {
plPlayerController!.onLockControl(false);
return;
}
if (isFullScreen) {
plPlayerController!
.triggerFullScreen(status: false);
if (vdCtr.videoDirection.value ==
'vertical') {
videoHeight.value = verticalHeight;
}
}
}
if (plPlayerController?.isFullScreen.value ==
true) {
plPlayerController!
.triggerFullScreen(status: false);
}
if (MediaQuery.of(context).orientation ==
Orientation.landscape) {
if (isLandscape) {
verticalScreen();
}
},
@ -746,9 +751,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
/// 不收回
pinnedHeaderSliverHeightBuilder: () {
return MediaQuery.of(context).orientation ==
Orientation.landscape ||
plPlayerController?.isFullScreen.value == true
return isLandscape || isFullScreen.value
? MediaQuery.sizeOf(context).height
: playerStatus.value != PlayerStatus.playing
? kToolbarHeight

58
lib/pages/whisper/controller.dart
View File

@ -45,36 +45,44 @@ class WhisperController extends GetxController {
if (isLoading) return;
var res = await MsgHttp.sessionList(
endTs: type == 'onLoad' ? sessionList.last.sessionTs : null);
if (res['status'] &&
res['data'].sessionList != null &&
res['data'].sessionList.isNotEmpty) {
await queryAccountList(res['data'].sessionList);
// 将 accountList 转换为 Map 结构
Map<int, dynamic> accountMap = {};
for (var j in accountList) {
accountMap[j.mid!] = j;
}
try {
if (res['status'] &&
res['data'].sessionList != null &&
res['data'].sessionList.isNotEmpty) {
await queryAccountList(res['data'].sessionList);
// 将 accountList 转换为 Map 结构
Map<int, dynamic> accountMap = {};
for (var j in accountList) {
accountMap[j.mid!] = j;
}
// 遍历 sessionList，通过 mid 查找并赋值 accountInfo
for (var i in res['data'].sessionList) {
var accountInfo = accountMap[i.talkerId];
if (accountInfo != null) {
i.accountInfo = accountInfo;
// 遍历 sessionList，通过 mid 查找并赋值 accountInfo
for (var i in res['data'].sessionList) {
var accountInfo = accountMap[i.talkerId];
if (accountInfo != null) {
i.accountInfo = accountInfo;
}
if (i.talkerId == 844424930131966) {
i.accountInfo = AccountListModel(
name: 'UP主小助手',
face:
'https://message.biliimg.com/bfs/im/489a63efadfb202366c2f88853d2217b5ddc7a13.png',
);
}
}
if (i.talkerId == 844424930131966) {
i.accountInfo = AccountListModel(
name: 'UP主小助手',
face:
'https://message.biliimg.com/bfs/im/489a63efadfb202366c2f88853d2217b5ddc7a13.png',
);
if (type == 'onLoad') {
sessionList.addAll(res['data'].sessionList);
} else {
sessionList.value = res['data'].sessionList;
}
}
if (type == 'onLoad') {
sessionList.addAll(res['data'].sessionList);
} else {
sessionList.value = res['data'].sessionList;
}
} catch (err) {
res = {
'status': false,
'message': err.toString(),
};
}
isLoading = false;
return res;
}

19
lib/pages/whisper/view.dart
View File

@ -44,7 +44,24 @@ class _WhisperPageState extends State<WhisperPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(title: const Text('消息')),
appBar: AppBar(
title: const Text('消息'),
actions: [
IconButton(
icon: Icon(Icons.open_in_browser_rounded,
color: Theme.of(context).colorScheme.primary),
tooltip: '用浏览器打开',
onPressed: () {
Get.toNamed('/webview', parameters: {
'url': 'https://message.bilibili.com',
'type': 'whisper',
'pageTitle': '消息中心',
});
},
),
const SizedBox(width: 12)
],
),
body: RefreshIndicator(
onRefresh: () async {
_whisperController.unread();

36
lib/pages/whisper_detail/widget/chat_item.dart
View File

@ -521,6 +521,7 @@ class SystemNotice extends StatelessWidget {
@override
Widget build(BuildContext context) {
Map content = item.content ?? '';
Color primary = Theme.of(context).colorScheme.primary;
return Row(
children: [
const SizedBox(width: 12),
@ -557,12 +558,35 @@ class SystemNotice extends StatelessWidget {
.labelSmall!
.copyWith(color: Theme.of(context).colorScheme.outline),
),
Divider(
color: Theme.of(context).colorScheme.primary.withOpacity(0.05),
),
SelectableText(
content['text'],
)
Divider(color: primary.withOpacity(0.05)),
SelectableText(content['text']),
if (content['jump_text'] != null &&
content['jump_uri'] != null) ...[
Divider(color: primary.withOpacity(0.05)),
Align(
alignment: Alignment.center,
child: TextButton(
onPressed: () {
Get.toNamed('/webview', parameters: {
'url': content['jump_uri'],
'type': 'url',
'pageTitle': content['jump_text'] == ''
? '查看详情'
: content['jump_text'],
});
},
style: ButtonStyle(
backgroundColor:
MaterialStateProperty.resolveWith((states) {
return primary.withAlpha(20);
}),
),
child: Text(content['jump_text'] == ''
? '查看详情'
: content['jump_text']),
),
),
]
],
),
),

207
lib/utils/follow.dart Normal file
View File

@ -0,0 +1,207 @@
import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:pilipala/common/widgets/drag_handle.dart';
import 'package:pilipala/common/widgets/group_panel.dart';
import 'package:pilipala/http/video.dart';
import 'package:pilipala/utils/global_data_cache.dart';
class FollowUtils {
final BuildContext context;
final int followStatus;
final int mid;
FollowUtils({
required this.context,
required this.followStatus,
required this.mid,
});
// static final Map<int, Map<String, dynamic>> followMap = {
// // 未关注
// 0: {
// 'desc': '确定关注UP主?',
// // 1 关注 5 拉黑
// 'act': 1,
// },
// // 已关注
// 2: {
// 'desc': '确定取消关注UP主?',
// 'act': 2,
// },
// // 已互粉
// 6: {
// 'desc': '确定取消关注UP主?',
// 'act': 2,
// },
// // 已拉黑
// 128: {
// 'desc': '确定从黑名单移除UP主?',
// 'act': 6,
// },
// };
static final Map<String, Map<String, dynamic>> actionTypeMap = {
'remove': {
'desc': '确定从黑名单移除UP主?',
'tips': '已从黑名单移除',
'act': 6,
'followStatus': 0,
},
'unFollow': {
'desc': '确定取消关注UP主?',
'tips': '已取消关注',
'act': 2,
'followStatus': 0,
},
'follow': {
'desc': '确定关注UP主?',
'tips': '关注成功',
'act': 1,
'followStatus': 2,
},
'block': {
'desc': '确定拉黑UP主?',
'tips': '已拉黑',
'act': 5,
'followStatus': 128,
},
};
Future<int> showFollowSheet() async {
var res = await showModalBottomSheet(
context: context,
isScrollControlled: true,
builder: (context) {
return Padding(
padding:
EdgeInsets.only(bottom: MediaQuery.paddingOf(context).bottom),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const DragHandle(),
if (followStatus == 128) ...[
ListTile(
leading: const Icon(Icons.remove_circle_outline_rounded),
onTap: () => modifyRelation('remove'),
title: const Text('从黑名单移除'),
),
],
if ([2, 6].contains(followStatus)) ...[
ListTile(
leading: const Icon(Icons.group_add_outlined),
onTap: () {
Navigator.of(context).pop();
setFollowGroup();
},
title: const Text('设置分组'),
),
ListTile(
leading: const Icon(Icons.heart_broken_outlined),
onTap: () => modifyRelation('unFollow'),
title: const Text('取消关注'),
),
],
if (followStatus == 0) ...[
ListTile(
leading: const Icon(Icons.favorite_border_rounded),
onTap: () => modifyRelation('follow'),
title: const Text('关注up主'),
),
ListTile(
leading: const Icon(Icons.block_rounded),
onTap: () => modifyRelation('block'),
title: const Text('拉黑up主'),
),
],
],
),
);
},
);
return res ?? followStatus;
}
// 操作用户关系
Future modifyRelation(String actionType) async {
showDialog(
context: context,
builder: (BuildContext context) {
final Color outline = Theme.of(context).colorScheme.outline;
return AlertDialog(
title: const Text('提示'),
content: Text(actionTypeMap[actionType]!['desc']),
actions: [
TextButton(
onPressed: Navigator.of(context).pop,
child: Text('点错了', style: TextStyle(color: outline)),
),
TextButton(
onPressed: () => modifyRelationFetch(actionType),
child: const Text('确定'),
)
],
);
},
);
}
// 操作用户关系Future
Future<int> modifyRelationFetch(String actionType, {bool? isDirect}) async {
if (isDirect != true) {
Navigator.of(context).pop();
}
SmartDialog.showLoading(msg: '请求中');
var res = await VideoHttp.relationMod(
mid: mid,
act: actionTypeMap[actionType]!['act'],
reSrc: 11,
);
SmartDialog.dismiss();
if (res['status']) {
final int newFollowStatus = actionTypeMap[actionType]!['followStatus'];
SmartDialog.showToast(actionTypeMap[actionType]!['tips']);
if (context.mounted) {
if (isDirect != true) {
Navigator.of(context).pop(newFollowStatus);
}
}
return newFollowStatus;
} else {
SmartDialog.showToast(res['msg']);
if (context.mounted && isDirect != true) {
Navigator.of(context).pop(-1);
}
return -1;
}
}
// 设置分组
Future setFollowGroup() async {
final size = MediaQuery.sizeOf(context);
final contentHeight = size.height - kToolbarHeight;
final double initialChildSize =
(contentHeight - size.width * 9 / 16) / contentHeight;
await showModalBottomSheet(
context: context,
useSafeArea: true,
isScrollControlled: true,
builder: (BuildContext context) {
return DraggableScrollableSheet(
initialChildSize: initialChildSize,
minChildSize: 0,
maxChildSize: 1,
snap: true,
expand: false,
snapSizes: [initialChildSize],
builder: (BuildContext context, ScrollController scrollController) {
return GroupPanel(
mid: GlobalDataCache.userInfo!.mid!,
scrollController: scrollController,
);
},
);
},
);
}
}

2
lib/utils/login.dart
View File

@ -12,7 +12,6 @@ import 'package:pilipala/http/user.dart';
import 'package:pilipala/pages/dynamics/index.dart';
import 'package:pilipala/pages/home/index.dart';
import 'package:pilipala/pages/mine/index.dart';
import 'package:pilipala/utils/cookie.dart';
import 'package:pilipala/utils/global_data_cache.dart';
import 'package:pilipala/utils/storage.dart';
import 'package:uuid/uuid.dart';
@ -68,7 +67,6 @@ class LoginUtils {
content = '${content + url}; \n';
}
try {
await SetCookie.onSet();
final result = await UserHttp.userInfo();
if (result['status'] && result['data'].isLogin) {
SmartDialog.showToast('登录成功');

3
lib/utils/storage.dart
View File

@ -137,7 +137,8 @@ class SettingBoxKey {
enableGradientBg = 'enableGradientBg',
enableDynamicSwitch = 'enableDynamicSwitch',
navBarSort = 'navBarSort',
actionTypeSort = 'actionTypeSort';
actionTypeSort = 'actionTypeSort',
enablePureBlack = 'enablePureBlack';
}
class LocalCacheKey {