Skip to content

Commit

Permalink
fix: view forwarded dyn
Browse files Browse the repository at this point in the history 
Signed-off-by: bggRGjQaUbCoE <[email protected]>
  • Loading branch information
@bggRGjQaUbCoE
bggRGjQaUbCoE committed Feb 16, 2025
1 parent a48d262 commit 5dd3ff3
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 83 deletions.
34 changes: 5 additions & 29 deletions lib/models/dynamics/result.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,47 +35,23 @@ class DynamicItemModel {
Map? basic;
dynamic idStr;
ItemModulesModel? modules;
ItemOrigModel? orig;
DynamicItemModel? orig;
String? type;
bool? visible;
bool? isForwarded;

DynamicItemModel.fromJson(Map<String, dynamic> json) {
basic = json['basic'];
idStr = json['id_str'];
modules = ItemModulesModel.fromJson(json['modules']);
orig = json['orig'] != null ? ItemOrigModel.fromJson(json['orig']) : null;
orig =
json['orig'] != null ? DynamicItemModel.fromJson(json['orig']) : null;
orig?.isForwarded = true;
type = json['type'];
visible = json['visible'];
}
}

class ItemOrigModel {
ItemOrigModel({
this.basic,
this.isStr,
this.modules,
this.type,
this.visible,
this.idStr,
});

Map? basic;
String? isStr;
ItemModulesModel? modules;
String? type;
bool? visible;
dynamic idStr;

ItemOrigModel.fromJson(Map<String, dynamic> json) {
basic = json['basic'];
isStr = json['is_str'];
modules = ItemModulesModel.fromJson(json['modules']);
type = json['type'];
visible = json['visible'];
idStr = json['id_str'];
}
}

// 单个动态详情
class ItemModulesModel {
ItemModulesModel({
Expand Down
3 changes: 2 additions & 1 deletion lib/pages/dynamics/detail/controller.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/models/dynamics/result.dart';
import 'package:PiliPlus/pages/common/reply_controller.dart';
import 'package:PiliPlus/utils/global_data.dart';
import 'package:PiliPlus/utils/storage.dart';
Expand All @@ -12,7 +13,7 @@ class DynamicDetailController extends ReplyController {
DynamicDetailController(this.oid, this.type);
int? oid;
int? type;
dynamic item;
late DynamicItemModel item;
int? floor;

late final horizontalPreview = GStorage.horizontalPreview;
Expand Down
54 changes: 37 additions & 17 deletions lib/pages/dynamics/detail/view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,15 +474,19 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
_dynamicDetailController
.item
.modules
.moduleStat
.forward
?.moduleStat
?.forward
?.count ??
'0') ??
0;
_dynamicDetailController.item.modules
?.moduleStat ??= ModuleStatModel();
_dynamicDetailController.item.modules!
.moduleStat?.forward ??= ForWard();
_dynamicDetailController
.item
.modules
.moduleStat
.modules!
.moduleStat!
.forward!
.count = (count + 1).toString();
if (btnContext.mounted) {
Expand All @@ -507,12 +511,12 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
),
label: Text(
_dynamicDetailController.item.modules
.moduleStat.forward!.count !=
?.moduleStat?.forward?.count !=
null
? Utils.numFormat(_dynamicDetailController
.item
.modules
.moduleStat
.modules!
.moduleStat!
.forward!
.count)
: '转发',
Expand Down Expand Up @@ -553,17 +557,24 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
},
),
icon: Icon(
_dynamicDetailController
.item.modules.moduleStat.like!.status!
_dynamicDetailController.item.modules
?.moduleStat?.like?.status ==
true
? FontAwesomeIcons.solidThumbsUp
: FontAwesomeIcons.thumbsUp,
size: 16,
color: _dynamicDetailController
.item.modules.moduleStat.like!.status!
color: _dynamicDetailController.item.modules
?.moduleStat?.like?.status ==
true
? Theme.of(context).colorScheme.primary
: Theme.of(context).colorScheme.outline,
semanticLabel: _dynamicDetailController
.item.modules.moduleStat.like!.status!
.item
.modules
?.moduleStat
?.like
?.status ==
true
? "已赞"
: "点赞",
),
Expand All @@ -582,15 +593,24 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
},
child: Text(
_dynamicDetailController.item.modules
.moduleStat.like!.count !=
?.moduleStat?.like?.count !=
null
? Utils.numFormat(
_dynamicDetailController.item
.modules.moduleStat.like!.count)
_dynamicDetailController
.item
.modules!
.moduleStat!
.like!
.count)
: '点赞',
style: TextStyle(
color: _dynamicDetailController.item
.modules.moduleStat.like!.status!
color: _dynamicDetailController
.item
.modules
?.moduleStat
?.like
?.status ==
true
? Theme.of(context)
.colorScheme
.primary
Expand Down
3 changes: 1 addition & 2 deletions lib/pages/dynamics/widgets/author_panel.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:PiliPlus/common/widgets/radio_widget.dart';
import 'package:PiliPlus/http/index.dart';
import 'package:PiliPlus/models/dynamics/result.dart';
import 'package:PiliPlus/utils/extension.dart';
import 'package:PiliPlus/utils/storage.dart';
import 'package:cached_network_image/cached_network_image.dart';
Expand Down Expand Up @@ -98,7 +97,7 @@ class AuthorPanel extends StatelessWidget {
),
child: Row(
children: [
Text(item is ItemOrigModel
Text(item.isForwarded == true
? Utils.dateFormat(item.modules.moduleAuthor.pubTs)
: item.modules.moduleAuthor.pubTime),
if (item.modules.moduleAuthor.pubTime != '' &&
Expand Down
63 changes: 32 additions & 31 deletions lib/pages/dynamics/widgets/forward_panel.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,37 +162,38 @@ Widget forWard(item, context, source, callback, {floor = 1}) {
// 文章
case 'DYNAMIC_TYPE_ARTICLE':
return switch (item) {
ItemOrigModel() => articlePanel(item, context, callback, floor: floor),
DynamicItemModel() => item.modules?.moduleDynamic?.major?.blocked !=
null
? Padding(
padding: const EdgeInsets.symmetric(horizontal: 12),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (item.modules?.moduleDynamic?.major?.blocked?['title'] !=
null)
Text(
'${item.modules?.moduleDynamic?.major?.blocked!['title']}',
style: TextStyle(
color: Theme.of(context).colorScheme.secondary,
),
),
if (item.modules?.moduleDynamic?.major
?.blocked?['hint_message'] !=
null)
Text(
'${item.modules?.moduleDynamic?.major?.blocked!['hint_message']}',
style: TextStyle(
fontSize: 12,
color: Theme.of(context).colorScheme.outline,
),
)
],
),
)
: const SizedBox.shrink(),
DynamicItemModel() => item.isForwarded == true
? articlePanel(item, context, callback, floor: floor)
: item.modules?.moduleDynamic?.major?.blocked != null
? Padding(
padding: const EdgeInsets.symmetric(horizontal: 12),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (item.modules?.moduleDynamic?.major
?.blocked?['title'] !=
null)
Text(
'${item.modules?.moduleDynamic?.major?.blocked!['title']}',
style: TextStyle(
color: Theme.of(context).colorScheme.secondary,
),
),
if (item.modules?.moduleDynamic?.major
?.blocked?['hint_message'] !=
null)
Text(
'${item.modules?.moduleDynamic?.major?.blocked!['hint_message']}',
style: TextStyle(
fontSize: 12,
color: Theme.of(context).colorScheme.outline,
),
)
],
),
)
: const SizedBox.shrink(),
_ => const SizedBox.shrink(),
};
// return Container(
Expand Down
3 changes: 1 addition & 2 deletions lib/pages/dynamics/widgets/video_panel.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// 视频or合集
import 'package:PiliPlus/models/dynamics/result.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:PiliPlus/common/constants.dart';
Expand Down Expand Up @@ -159,7 +158,7 @@ Widget videoSeasonWidget(item, context, type, {floor = 1}) {
if (richNodes != null) Text.rich(richNodes),
const SizedBox(height: 6),
],
if (item is ItemOrigModel)
if (item.isForwarded == true)
buildCover()
else
Padding(
Expand Down
4 changes: 3 additions & 1 deletion lib/utils/utils.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@ class Utils {
feedBack();
String dynamicId = item.idStr!;
// 1 已点赞 2 不喜欢 0 未操作
item.modules?.moduleStat ??= ModuleStatModel();
item.modules?.moduleStat.like ??= Like();
Like like = item.modules.moduleStat.like;
int count = like.count == '点赞' ? 0 : int.parse(like.count ?? '0');
bool status = like.status!;
bool status = like.status ?? false;
int up = status ? 2 : 1;
var res = await DynamicsHttp.likeDynamic(dynamicId: dynamicId, up: up);
if (res['status']) {
Expand Down

0 comments on commit 5dd3ff3

Please sign in to comment.