mirror of
https://github.com/HChaZZY/PiliPlus.git
synced 2025-12-06 09:13:48 +08:00
mod: article: show top
Closes #819 Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
@@ -97,6 +97,7 @@ class ItemModulesModel {
|
|||||||
// ModuleInterModel? moduleInter;
|
// ModuleInterModel? moduleInter;
|
||||||
|
|
||||||
// 专栏
|
// 专栏
|
||||||
|
ModuleTop? moduleTop;
|
||||||
List<ModuleTag>? moduleExtend; // opus的tag
|
List<ModuleTag>? moduleExtend; // opus的tag
|
||||||
List<ArticleContentModel>? moduleContent;
|
List<ArticleContentModel>? moduleContent;
|
||||||
ModuleBlocked? moduleBlocked;
|
ModuleBlocked? moduleBlocked;
|
||||||
@@ -122,6 +123,11 @@ class ItemModulesModel {
|
|||||||
ItemModulesModel.fromOpusJson(List<Map<String, dynamic>> json) {
|
ItemModulesModel.fromOpusJson(List<Map<String, dynamic>> json) {
|
||||||
for (var i in json) {
|
for (var i in json) {
|
||||||
switch (i['module_type']) {
|
switch (i['module_type']) {
|
||||||
|
case 'MODULE_TYPE_TOP':
|
||||||
|
moduleTop = i['module_top'] == null
|
||||||
|
? null
|
||||||
|
: ModuleTop.fromJson(i['module_top']);
|
||||||
|
break;
|
||||||
case 'MODULE_TYPE_TITLE':
|
case 'MODULE_TYPE_TITLE':
|
||||||
moduleTag = i['module_title'] == null
|
moduleTag = i['module_title'] == null
|
||||||
? null
|
? null
|
||||||
@@ -161,6 +167,37 @@ class ItemModulesModel {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class ModuleTop {
|
||||||
|
ModuleTopDisplay? display;
|
||||||
|
|
||||||
|
ModuleTop.fromJson(Map<String, dynamic> json) {
|
||||||
|
display = json['display'] == null
|
||||||
|
? null
|
||||||
|
: ModuleTopDisplay.fromJson(json['display']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ModuleTopDisplay {
|
||||||
|
ModuleTopAlbum? album;
|
||||||
|
int? type;
|
||||||
|
|
||||||
|
ModuleTopDisplay.fromJson(Map<String, dynamic> json) {
|
||||||
|
album =
|
||||||
|
json['album'] == null ? null : ModuleTopAlbum.fromJson(json['album']);
|
||||||
|
type = json['type'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ModuleTopAlbum {
|
||||||
|
List<Pic>? pics;
|
||||||
|
int? type;
|
||||||
|
|
||||||
|
ModuleTopAlbum.fromJson(Map<String, dynamic> json) {
|
||||||
|
pics = (json['pics'] as List?)?.map((e) => Pic.fromJson(e)).toList();
|
||||||
|
type = json['type'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class ModuleBlocked {
|
class ModuleBlocked {
|
||||||
BgImg? bgImg;
|
BgImg? bgImg;
|
||||||
int? blockedType;
|
int? blockedType;
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ class ArticleController extends ReplyController<MainListReply> {
|
|||||||
|
|
||||||
RxBool showTitle = false.obs;
|
RxBool showTitle = false.obs;
|
||||||
|
|
||||||
|
late final RxInt topIndex = 0.obs;
|
||||||
|
|
||||||
late final horizontalPreview = GStorage.horizontalPreview;
|
late final horizontalPreview = GStorage.horizontalPreview;
|
||||||
late final showDynActionBar = GStorage.showDynActionBar;
|
late final showDynActionBar = GStorage.showDynActionBar;
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
import 'dart:math';
|
import 'dart:math';
|
||||||
|
|
||||||
import 'package:PiliPlus/common/skeleton/video_reply.dart';
|
import 'package:PiliPlus/common/skeleton/video_reply.dart';
|
||||||
|
import 'package:PiliPlus/common/widgets/badge.dart';
|
||||||
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
|
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
|
||||||
import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
|
import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
|
||||||
import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
|
import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
|
||||||
import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart'
|
import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart'
|
||||||
show ReplyInfo;
|
show ReplyInfo;
|
||||||
import 'package:PiliPlus/http/loading_state.dart';
|
import 'package:PiliPlus/http/loading_state.dart';
|
||||||
|
import 'package:PiliPlus/models/common/image_preview_type.dart';
|
||||||
import 'package:PiliPlus/models/common/reply/reply_sort_type.dart';
|
import 'package:PiliPlus/models/common/reply/reply_sort_type.dart';
|
||||||
import 'package:PiliPlus/models/common/reply/reply_type.dart';
|
import 'package:PiliPlus/models/common/reply/reply_type.dart';
|
||||||
import 'package:PiliPlus/models/dynamics/result.dart' show DynamicStat;
|
import 'package:PiliPlus/models/dynamics/result.dart' show DynamicStat;
|
||||||
@@ -22,6 +24,7 @@ import 'package:PiliPlus/utils/grid.dart';
|
|||||||
import 'package:PiliPlus/utils/page_utils.dart';
|
import 'package:PiliPlus/utils/page_utils.dart';
|
||||||
import 'package:PiliPlus/utils/storage.dart';
|
import 'package:PiliPlus/utils/storage.dart';
|
||||||
import 'package:PiliPlus/utils/utils.dart';
|
import 'package:PiliPlus/utils/utils.dart';
|
||||||
|
import 'package:cached_network_image/cached_network_image.dart';
|
||||||
import 'package:easy_debounce/easy_throttle.dart';
|
import 'package:easy_debounce/easy_throttle.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/rendering.dart';
|
import 'package:flutter/rendering.dart';
|
||||||
@@ -390,6 +393,76 @@ class _ArticlePageState extends State<ArticlePage>
|
|||||||
_articleCtr.articleData?.publishTime;
|
_articleCtr.articleData?.publishTime;
|
||||||
return SliverMainAxisGroup(
|
return SliverMainAxisGroup(
|
||||||
slivers: [
|
slivers: [
|
||||||
|
if (_articleCtr.type != 'read' &&
|
||||||
|
_articleCtr.opusData?.modules.moduleTop?.display?.album
|
||||||
|
?.pics?.isNotEmpty ==
|
||||||
|
true)
|
||||||
|
SliverToBoxAdapter(
|
||||||
|
child: Builder(
|
||||||
|
builder: (context) {
|
||||||
|
final pics = _articleCtr.opusData!.modules.moduleTop!
|
||||||
|
.display!.album!.pics!;
|
||||||
|
final length = pics.length;
|
||||||
|
final first = pics.first;
|
||||||
|
double height;
|
||||||
|
double paddingRight;
|
||||||
|
if (first.height != null && first.width != null) {
|
||||||
|
final ratio = first.height! / first.width!;
|
||||||
|
height = min(maxWidth * ratio, Get.height * 0.55);
|
||||||
|
paddingRight = (maxWidth - height / ratio) / 2 + 12;
|
||||||
|
} else {
|
||||||
|
height = Get.height * 0.55;
|
||||||
|
paddingRight = 12;
|
||||||
|
}
|
||||||
|
return Stack(
|
||||||
|
clipBehavior: Clip.none,
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
height: height,
|
||||||
|
width: maxWidth,
|
||||||
|
margin: const EdgeInsets.only(bottom: 10),
|
||||||
|
child: PageView.builder(
|
||||||
|
physics: const ClampingScrollPhysics(),
|
||||||
|
onPageChanged: (value) {
|
||||||
|
_articleCtr.topIndex.value = value;
|
||||||
|
},
|
||||||
|
itemCount: length,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
final url = pics[0].url!;
|
||||||
|
return GestureDetector(
|
||||||
|
onTap: () {
|
||||||
|
context.imageView(
|
||||||
|
imgList: pics
|
||||||
|
.map((e) =>
|
||||||
|
SourceModel(url: e.url!))
|
||||||
|
.toList(),
|
||||||
|
initialPage: index,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
child: Hero(
|
||||||
|
tag: url,
|
||||||
|
child: CachedNetworkImage(
|
||||||
|
imageUrl:
|
||||||
|
Utils.thumbnailImgUrl(url, 60),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Obx(
|
||||||
|
() => PBadge(
|
||||||
|
top: 12,
|
||||||
|
right: paddingRight,
|
||||||
|
type: 'gray',
|
||||||
|
text:
|
||||||
|
'${_articleCtr.topIndex.value + 1}/$length'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
if (_articleCtr.summary.title != null)
|
if (_articleCtr.summary.title != null)
|
||||||
SliverToBoxAdapter(
|
SliverToBoxAdapter(
|
||||||
child: Text(
|
child: Text(
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import 'dart:math';
|
import 'dart:math';
|
||||||
|
|
||||||
import 'package:PiliPlus/common/constants.dart';
|
import 'package:PiliPlus/common/constants.dart';
|
||||||
|
import 'package:PiliPlus/common/widgets/image/image_view.dart';
|
||||||
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
|
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
|
||||||
import 'package:PiliPlus/models/common/image_preview_type.dart';
|
import 'package:PiliPlus/models/common/image_preview_type.dart';
|
||||||
import 'package:PiliPlus/models/dynamics/article_content_model.dart'
|
import 'package:PiliPlus/models/dynamics/article_content_model.dart'
|
||||||
@@ -124,6 +125,7 @@ class OpusContent extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
return widget;
|
return widget;
|
||||||
case 2 when (element.pic != null):
|
case 2 when (element.pic != null):
|
||||||
|
if (element.pic!.pics!.length == 1) {
|
||||||
element.pic!.pics!.first.onCalHeight(maxWidth);
|
element.pic!.pics!.first.onCalHeight(maxWidth);
|
||||||
return Hero(
|
return Hero(
|
||||||
tag: element.pic!.pics!.first.url!,
|
tag: element.pic!.pics!.first.url!,
|
||||||
@@ -148,6 +150,14 @@ class OpusContent extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
} else {
|
||||||
|
return imageView(
|
||||||
|
maxWidth,
|
||||||
|
element.pic!.pics!
|
||||||
|
.map(
|
||||||
|
(e) => ImageModel(width: 1, height: 1, url: e.url!))
|
||||||
|
.toList());
|
||||||
|
}
|
||||||
case 3 when (element.line != null):
|
case 3 when (element.line != null):
|
||||||
return CachedNetworkImage(
|
return CachedNetworkImage(
|
||||||
width: maxWidth,
|
width: maxWidth,
|
||||||
|
|||||||
Reference in New Issue
Block a user