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

Merge branch 'design'

Browse Source
This commit is contained in:
guozhigq
2024-12-08 16:52:48 +08:00
parent 4742ec3dca a25826251e
commit b0d0a4ec8f
3 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'dart:math';
import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'; import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart';
import 'package:floating/floating.dart'; import 'package:floating/floating.dart';
@ -76,7 +77,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
getStatusHeight(); getStatusHeight();
heroTag = Get.arguments['heroTag']; heroTag = Get.arguments['heroTag'];
vdCtr = Get.put(VideoDetailController(), tag: heroTag); vdCtr = Get.put(VideoDetailController(), tag: heroTag);
vdCtr.sheetHeight.value = localCache.get('sheetHeight'); vdCtr.sheetHeight.value = GlobalDataCache.sheetHeight;
videoIntroController = Get.put( videoIntroController = Get.put(
VideoIntroController(bvid: Get.parameters['bvid']!), VideoIntroController(bvid: Get.parameters['bvid']!),
tag: heroTag); tag: heroTag);
@ -223,8 +224,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
void _extendNestCtrListener() { void _extendNestCtrListener() {
final double offset = _extendNestCtr.position.pixels; final double offset = _extendNestCtr.position.pixels;
if (vdCtr.videoDirection.value == 'horizontal') { if (vdCtr.videoDirection.value == 'horizontal') {
vdCtr.sheetHeight.value = vdCtr.sheetHeight.value = max(GlobalDataCache.sheetHeight,
Get.size.height - videoHeight - statusBarHeight + offset; Get.size.height - videoHeight - statusBarHeight + offset);
appbarStream.add(offset); appbarStream.add(offset);
} else { } else {
if (offset > (Get.size.width * 22 / 16 - videoHeight)) { if (offset > (Get.size.width * 22 / 16 - videoHeight)) {

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

@ -45,6 +45,7 @@ class WhisperController extends GetxController {
if (isLoading) return; if (isLoading) return;
var res = await MsgHttp.sessionList( var res = await MsgHttp.sessionList(
endTs: type == 'onLoad' ? sessionList.last.sessionTs : null); endTs: type == 'onLoad' ? sessionList.last.sessionTs : null);
try {
if (res['status'] && if (res['status'] &&
res['data'].sessionList != null && res['data'].sessionList != null &&
res['data'].sessionList.isNotEmpty) { res['data'].sessionList.isNotEmpty) {
@ -75,6 +76,13 @@ class WhisperController extends GetxController {
sessionList.value = res['data'].sessionList; sessionList.value = res['data'].sessionList;
} }
} }
} catch (err) {
res = {
'status': false,
'message': err.toString(),
};
}
isLoading = false; isLoading = false;
return res; return res;
} }

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

@ -44,7 +44,24 @@ class _WhisperPageState extends State<WhisperPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( 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( body: RefreshIndicator(
onRefresh: () async { onRefresh: () async {
_whisperController.unread(); _whisperController.unread();