Merge branch 'main' into feature-videoPlayer

This commit is contained in:
guozhigq
2023-06-05 17:24:41 +08:00
11 changed files with 502 additions and 7 deletions

View File

@ -54,6 +54,9 @@ class VideoDetailController extends GetxController {
videoItem['pic'] = args.pic;
}
}
if (Get.arguments.containsKey('pic')) {
videoItem['pic'] = Get.arguments['pic'];
}
heroTag = Get.arguments['heroTag'];
}
queryVideoUrl();

View File

@ -380,11 +380,18 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
duration: const Duration(milliseconds: 150),
child: SizedBox(
height: 36,
child: Obx(()=>
videoIntroController.followStatus.isNotEmpty ? ElevatedButton(
onPressed: () => videoIntroController.actionRelationMod(),
child: Text(videoIntroController.followStatus['attribute'] == 0 ? '关注' : '已关注'),
) : const SizedBox(),
child: Obx(
() => videoIntroController.followStatus.isNotEmpty
? ElevatedButton(
onPressed: () => videoIntroController
.actionRelationMod(),
child: Text(videoIntroController
.followStatus['attribute'] ==
0
? '关注'
: '已关注'),
)
: const SizedBox(),
),
),
),

View File

@ -45,7 +45,7 @@ class VideoReplyController extends GetxController {
if (res['data'].replies.isNotEmpty) {
currentPage = currentPage + 1;
noMore.value = '加载中';
if(res['data'].page.count == res['data'].page.acount){
if (res['data'].page.count == res['data'].page.acount) {
noMore.value = '没有更多了';
}
} else {