EchoZenith/PiliPlus
1
0
Fork 0
mirror of https://github.com/bggRGjQaUbCoE/PiliPlus.git synced 2026-05-16 14:14:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

drop gif emote, static thumbnail gif

Browse Source 
Signed-off-by: dom <githubaccount56556@proton.me>
This commit is contained in:
dom
2026-04-26 14:11:37 +08:00
parent 877bdf64b4
commit 7d1b393511
16 changed files with 61 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/live/live.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.2 KiB

BIN
assets/images/live/live.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

4
lib/common/assets.dart
View File

@@ -15,9 +15,9 @@ abstract final class Assets {
static const trendingBanner = 'assets/images/trending_banner.png';
static const ai = 'assets/images/ai.png';
static const livingChart = 'assets/images/live.gif';
// static const livingChart = 'assets/images/live.gif';
static const livingStatic = 'assets/images/live.png';
static const livingRect = 'assets/images/live/live.gif';
static const livingRect = 'assets/images/live/live.png';
static const livingBackground = 'assets/images/live/default_bg.webp';
static const thunder1 = 'assets/images/paycoins/ic_thunder_1.png';

10
lib/common/widgets/image/network_img_layer.dart
View File

@@ -71,7 +71,15 @@ class NetworkImgLayer extends StatelessWidget {
memCacheHeight = height.cacheSize(context);
}
return CachedNetworkImage(
imageUrl: ImageUtils.thumbnailUrl(src, quality),
imageUrl: ImageUtils.thumbnailUrl(
src,
maxQuality: quality,
/// remove gif
suffix: src!.endsWith(ImageUtils.kSuffixGIF)
? ImageUtils.kSuffixJPG
: ImageUtils.kSuffixWEBP,
),
width: width,
height: height,
memCacheWidth: memCacheWidth,

12
lib/common/widgets/image_grid/image_grid_view.dart
View File

@@ -22,7 +22,6 @@ import 'package:PiliPlus/common/style.dart';
import 'package:PiliPlus/common/widgets/badge.dart';
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
import 'package:PiliPlus/common/widgets/image_grid/image_grid_builder.dart';
import 'package:PiliPlus/models/common/badge_type.dart';
import 'package:PiliPlus/models/common/image_preview_type.dart';
import 'package:PiliPlus/utils/extension/context_ext.dart';
import 'package:PiliPlus/utils/extension/num_ext.dart';
@@ -59,6 +58,8 @@ class ImageModel {
bool get isLivePhoto =>
_isLivePhoto ??= enableLivePhoto && liveUrl?.isNotEmpty == true;
bool get isGif => url.endsWith(ImageUtils.kSuffixGIF);
static bool enableLivePhoto = Pref.enableLivePhoto;
}
@@ -245,13 +246,20 @@ class ImageGridView extends StatelessWidget {
text: 'Live',
right: 8,
bottom: 8,
type: PBadgeType.gray,
type: .gray,
)
else if (item.isLongPic)
const PBadge(
text: '长图',
right: 8,
bottom: 8,
)
else if (item.isGif)
const PBadge(
text: 'GIF',
right: 8,
bottom: 8,
type: .gray,
),
],
);

7
lib/common/widgets/image_viewer/gallery_viewer.dart
View File

@@ -98,7 +98,7 @@ class _GalleryViewerState extends State<GalleryViewer>
String _getActualUrl(String url) {
return _quality != 100
? ImageUtils.thumbnailUrl(url, _quality)
? ImageUtils.thumbnailUrl(url, maxQuality: _quality)
: url.http2https;
}
@@ -413,7 +413,10 @@ class _GalleryViewerState extends State<GalleryViewer>
_containerSize.width.cacheSize(context),
null,
CachedNetworkImageProvider(
ImageUtils.thumbnailUrl(item.url, widget.quality),
ImageUtils.thumbnailUrl(
item.url,
maxQuality: widget.quality,
),
),
),
minScale: widget.minScale,

5
lib/models/dynamics/result.dart
View File

@@ -1173,10 +1173,11 @@ class Emoji {
String? url;
late num size;
/// remove gif
Emoji.fromJson(Map<String, dynamic> json) {
url =
noneNullOrEmptyString(json['webp_url']) ??
noneNullOrEmptyString(json['gif_url']) ??
// noneNullOrEmptyString(json['webp_url']) ??
// noneNullOrEmptyString(json['gif_url']) ??
noneNullOrEmptyString(json['icon_url']);
size = json['size'] ?? 1;
}

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

@@ -298,7 +298,7 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
: null,
imageUrl: ImageUtils.thumbnailUrl(
pic.url,
60,
maxQuality: 60,
),
fadeInDuration: const Duration(
milliseconds: 120,

5
lib/pages/article/widgets/article_ops.dart
View File

@@ -73,7 +73,10 @@ class ArticleOpus extends StatelessWidget {
width: width,
height: height,
memCacheWidth: width.cacheSize(context),
imageUrl: ImageUtils.thumbnailUrl(card.url, 60),
imageUrl: ImageUtils.thumbnailUrl(
card.url,
maxQuality: 60,
),
placeholder: (_, _) => const SizedBox.shrink(),
),
),

2
lib/pages/article/widgets/html_render.dart
View File

@@ -62,7 +62,7 @@ Widget htmlRender({
width: width,
height: isEmote ? 22.0 : null,
memCacheWidth: width.cacheSize(context),
imageUrl: ImageUtils.thumbnailUrl(imgUrl, 60),
imageUrl: ImageUtils.thumbnailUrl(imgUrl, maxQuality: 60),
fadeInDuration: const Duration(milliseconds: 120),
fadeOutDuration: const Duration(milliseconds: 120),
placeholder: (context, url) => Image.asset(Assets.loading),

2
lib/pages/article/widgets/opus_content.dart
View File

@@ -229,7 +229,7 @@ class OpusContent extends StatelessWidget {
width: width,
height: height,
memCacheWidth: width.cacheSize(context),
imageUrl: ImageUtils.thumbnailUrl(pic.url!, 60),
imageUrl: ImageUtils.thumbnailUrl(pic.url!, maxQuality: 60),
fadeInDuration: const Duration(milliseconds: 120),
fadeOutDuration: const Duration(milliseconds: 120),
placeholder: (_, _) => Image.asset(Assets.loading),

4
lib/pages/audio/view.dart
View File

@@ -293,7 +293,7 @@ class _AudioPageState extends State<AudioPage> {
WidgetSpan(
alignment: .bottom,
child: Image.asset(
Assets.livingChart,
Assets.livingStatic,
width: 16,
height: 16,
cacheWidth: 16.cacheSize(
@@ -337,7 +337,7 @@ class _AudioPageState extends State<AudioPage> {
WidgetSpan(
alignment: .bottom,
child: Image.asset(
Assets.livingChart,
Assets.livingStatic,
width: 16,
height: 16,
cacheWidth: 16.cacheSize(

2
lib/pages/member/widget/medal_wall.dart
View File

@@ -107,7 +107,7 @@ class MedalWall extends StatelessWidget {
Padding(
padding: const .only(left: 4),
child: Image.asset(
Assets.livingChart,
Assets.livingStatic,
height: 16,
cacheHeight: 16.cacheSize(context),
color: colorScheme.primary,

12
lib/pages/video/reply/widgets/reply_item_grpc.dart
View File

@@ -794,11 +794,13 @@ class ReplyItemGrpc extends StatelessWidget {
spanChildren.add(
WidgetSpan(
child: NetworkImgLayer(
src: emote.hasWebpUrl()
? emote.webpUrl
: emote.hasGifUrl()
? emote.gifUrl
: emote.url,
/// remove gif
src: emote.url,
// src: emote.hasWebpUrl()
// ? emote.webpUrl
// : emote.hasGifUrl()
// ? emote.gifUrl
// : emote.url,
type: ImageType.emote,
width: size,
height: size,

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

@@ -671,7 +671,9 @@ class ChatItem extends StatelessWidget {
if (eInfos != null) {
for (final e in eInfos!) {
emojiMap[e.text] ??= {
'url': e.hasGifUrl() ? e.gifUrl : e.url,
/// remove gif
'url': e.url,
// 'url': e.hasGifUrl() ? e.gifUrl : e.url,
'size': e.size * 22.0,
};
}

16
lib/utils/image_utils.dart
View File

@@ -266,7 +266,16 @@ abstract final class ImageUtils {
r'(@(\d+[a-z]_?)*)(\..*)?$',
caseSensitive: false,
);
static String thumbnailUrl(String? src, [int maxQuality = 1]) {
static const kSuffixJPG = '.jpg';
static const kSuffixGIF = '.gif';
static const kSuffixWEBP = '.webp';
static String thumbnailUrl(
String? src, {
int maxQuality = 1,
String suffix = kSuffixWEBP,
}) {
if (src != null && maxQuality != 100) {
maxQuality = math.max(maxQuality, GlobalData().imgQuality);
bool hasMatch = false;
@@ -274,15 +283,14 @@ abstract final class ImageUtils {
_thumbRegex,
onMatch: (match) {
hasMatch = true;
String suffix = match.group(3) ?? '.webp';
return '${match.group(1)}_${maxQuality}q$suffix';
return '${match.group(1)}_${maxQuality}q${match.group(3) ?? suffix}';
},
onNonMatch: (String str) {
return str;
},
);
if (!hasMatch) {
src += '@${maxQuality}q.webp';
src += '@${maxQuality}q$suffix';
}
}
return src.http2https;