From e70b4d341cce0e1ee54fc90e2bb1d6733633bcb2 Mon Sep 17 00:00:00 2001 From: dom Date: Mon, 11 May 2026 15:54:51 +0800 Subject: [PATCH] tweaks Signed-off-by: dom --- .../main/kotlin/com/example/piliplus/MainActivity.kt | 12 ++---------- lib/http/user.dart | 4 ++-- lib/models/user/info.dart | 2 +- lib/pages/dynamics_topic/view.dart | 2 +- lib/pages/fav/note/child_view.dart | 2 +- lib/pages/fav/pgc/child_view.dart | 2 +- lib/pages/fav_detail/view.dart | 2 +- lib/pages/later/view.dart | 7 +++---- lib/pages/live_room/widgets/bottom_control.dart | 3 ++- lib/pages/main_reply/view.dart | 2 +- lib/pages/match_info/view.dart | 2 +- lib/pages/member/widget/user_info_card.dart | 3 ++- 12 files changed, 18 insertions(+), 25 deletions(-) diff --git a/android/app/src/main/kotlin/com/example/piliplus/MainActivity.kt b/android/app/src/main/kotlin/com/example/piliplus/MainActivity.kt index 73fce2f4d..f90359fdb 100644 --- a/android/app/src/main/kotlin/com/example/piliplus/MainActivity.kt +++ b/android/app/src/main/kotlin/com/example/piliplus/MainActivity.kt @@ -1,29 +1,21 @@ package com.example.piliplus import android.app.PendingIntent -import android.app.PictureInPictureParams import android.app.SearchManager -import android.content.ComponentName import android.content.Intent import android.content.pm.PackageManager import android.content.pm.ShortcutInfo import android.content.pm.ShortcutManager import android.content.res.Configuration import android.graphics.BitmapFactory -import android.graphics.Point import android.graphics.drawable.Icon import android.os.Build -import android.os.Bundle import android.provider.MediaStore import android.provider.Settings -import android.view.WindowManager.LayoutParams import androidx.core.net.toUri import com.ryanheise.audioservice.AudioServiceActivity import io.flutter.embedding.engine.FlutterEngine import io.flutter.plugin.common.MethodChannel -import kotlin.math.roundToInt -import kotlin.system.exitProcess -import java.io.File class MainActivity : AudioServiceActivity() { override fun configureFlutterEngine(flutterEngine: FlutterEngine) { @@ -32,7 +24,7 @@ class MainActivity : AudioServiceActivity() { val methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "PiliPlus") methodChannel.setMethodCallHandler { call, result -> when (call.method) { - "back" -> back(); + "back" -> back() "linkVerifySettings" -> { val uri = ("package:" + context.packageName).toUri() @@ -119,7 +111,7 @@ class MainActivity : AudioServiceActivity() { pendingIntent.intentSender ) } - } catch (e: Exception) { + } catch (_: Exception) { } } } diff --git a/lib/http/user.dart b/lib/http/user.dart index 7f368e740..79c857d10 100644 --- a/lib/http/user.dart +++ b/lib/http/user.dart @@ -382,10 +382,10 @@ abstract final class UserHttp { } } - static Future> getCoin() async { + static Future> getCoin() async { final res = await Request.get(Api.getCoin); if (res.data['code'] == 0) { - return Success((res.data['data']?['money'] as num?)?.toDouble()); + return Success((res.data['data']?['money'] as num?)?.toDouble() ?? 0.0); } else { return Error(res.data['message']); } diff --git a/lib/models/user/info.dart b/lib/models/user/info.dart index b4eb0bc92..c230aaaf3 100644 --- a/lib/models/user/info.dart +++ b/lib/models/user/info.dart @@ -92,7 +92,7 @@ class UserInfoData { : null; mid = json['mid']; mobileVerified = json['mobile_verified']; - money = json['money'] is int ? json['money'].toDouble() : json['money']; + money = (json['money'] as num?)?.toDouble() ?? 0.0; moral = json['moral']; official = json['official']; officialVerify = json['officialVerify']; diff --git a/lib/pages/dynamics_topic/view.dart b/lib/pages/dynamics_topic/view.dart index d7e407d9e..4bfac3f73 100644 --- a/lib/pages/dynamics_topic/view.dart +++ b/lib/pages/dynamics_topic/view.dart @@ -131,7 +131,7 @@ class _DynTopicPageState extends State with DynMixin { ), ), Positioned( - right: kFloatingActionButtonMargin, + right: padding.right + kFloatingActionButtonMargin, bottom: padding.bottom + kFloatingActionButtonMargin, child: FloatingActionButton.extended( onPressed: () { diff --git a/lib/pages/fav/note/child_view.dart b/lib/pages/fav/note/child_view.dart index 4c9efa84e..94364c4d9 100644 --- a/lib/pages/fav/note/child_view.dart +++ b/lib/pages/fav/note/child_view.dart @@ -36,7 +36,7 @@ class _FavNoteChildPageState extends State Widget build(BuildContext context) { super.build(context); final theme = Theme.of(context); - final padding = MediaQuery.viewPaddingOf(context); + final padding = MediaQuery.viewPaddingOf(context).copyWith(top: 0); final bottomH = 50 + padding.bottom; return Stack( clipBehavior: Clip.none, diff --git a/lib/pages/fav/pgc/child_view.dart b/lib/pages/fav/pgc/child_view.dart index 0f0f43e65..600576302 100644 --- a/lib/pages/fav/pgc/child_view.dart +++ b/lib/pages/fav/pgc/child_view.dart @@ -42,7 +42,7 @@ class _FavPgcChildPageState extends State Widget build(BuildContext context) { super.build(context); final theme = Theme.of(context); - final padding = MediaQuery.viewPaddingOf(context); + final padding = MediaQuery.viewPaddingOf(context).copyWith(top: 0); final bottomH = 50 + padding.bottom; return Stack( clipBehavior: Clip.none, diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart index 758e91f18..60f43e1d5 100644 --- a/lib/pages/fav_detail/view.dart +++ b/lib/pages/fav_detail/view.dart @@ -88,7 +88,7 @@ class _FavDetailPageState extends State with GridMixin { ), ), Positioned( - right: 0, + right: padding.right, bottom: padding.bottom + kFloatingActionButtonMargin, child: Padding( padding: const .only(right: kFloatingActionButtonMargin), diff --git a/lib/pages/later/view.dart b/lib/pages/later/view.dart index 78ac45e85..02687b35f 100644 --- a/lib/pages/later/view.dart +++ b/lib/pages/later/view.dart @@ -62,6 +62,7 @@ class _LaterPageState extends State @override Widget build(BuildContext context) { + final padding = MediaQuery.viewPaddingOf(context); return Obx( () { final enableMultiSelect = _baseCtr.enableMultiSelect.value; @@ -119,10 +120,8 @@ class _LaterPageState extends State ), ), Positioned( - right: 0, - bottom: - MediaQuery.viewPaddingOf(context).bottom + - kFloatingActionButtonMargin, + right: padding.right, + bottom: padding.bottom + kFloatingActionButtonMargin, child: Padding( padding: const .only(right: kFloatingActionButtonMargin), child: Obx( diff --git a/lib/pages/live_room/widgets/bottom_control.dart b/lib/pages/live_room/widgets/bottom_control.dart index 487d465b8..76caf3214 100644 --- a/lib/pages/live_room/widgets/bottom_control.dart +++ b/lib/pages/live_room/widgets/bottom_control.dart @@ -7,6 +7,7 @@ import 'package:PiliPlus/plugin/pl_player/widgets/common_btn.dart'; import 'package:PiliPlus/plugin/pl_player/widgets/play_pause_btn.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/storage_key.dart'; +import 'package:flutter/foundation.dart' show kDebugMode; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; @@ -69,7 +70,7 @@ class _BottomControlState extends State with HeaderMixin { color: Colors.white, ), onTap: () { - if (liveRoomCtr.isLogin) { + if (kDebugMode || liveRoomCtr.isLogin) { Get.toNamed( '/liveDmBlockPage', parameters: { diff --git a/lib/pages/main_reply/view.dart b/lib/pages/main_reply/view.dart index b819eff6a..6df46eb6f 100644 --- a/lib/pages/main_reply/view.dart +++ b/lib/pages/main_reply/view.dart @@ -101,7 +101,7 @@ class _MainReplyPageState extends State position: fabAnimation, child: Padding( padding: .only( - right: kFloatingActionButtonMargin, + right: padding.right + kFloatingActionButtonMargin, bottom: padding.bottom + kFloatingActionButtonMargin, ), child: FloatingActionButton( diff --git a/lib/pages/match_info/view.dart b/lib/pages/match_info/view.dart index 25ccfd4e0..f5fb67d99 100644 --- a/lib/pages/match_info/view.dart +++ b/lib/pages/match_info/view.dart @@ -66,7 +66,7 @@ class _MatchInfoPageState extends CommonDynPageState { position: fabAnimation, child: Padding( padding: .only( - right: kFloatingActionButtonMargin, + right: padding.right + kFloatingActionButtonMargin, bottom: padding.bottom + kFloatingActionButtonMargin, ), child: replyButton, diff --git a/lib/pages/member/widget/user_info_card.dart b/lib/pages/member/widget/user_info_card.dart index 0331ddf12..8d0801224 100644 --- a/lib/pages/member/widget/user_info_card.dart +++ b/lib/pages/member/widget/user_info_card.dart @@ -778,7 +778,8 @@ class UserInfoCard extends StatelessWidget { crossAxisAlignment: .start, children: [ // _buildHeader(context), - const SizedBox(height: kToolbarHeight), + // const SizedBox(height: kToolbarHeight), + const SizedBox(height: 30), Row( children: [ const SizedBox(width: 20),