Merge branch 'fix'

This commit is contained in:
guozhigq
2024-12-14 20:25:01 +08:00

View File

@ -124,16 +124,12 @@ class DynamicsController extends GetxController {
switch (item!.type) { switch (item!.type) {
/// 转发的动态 /// 转发的动态
case 'DYNAMIC_TYPE_FORWARD': case 'DYNAMIC_TYPE_FORWARD':
Get.toNamed('/dynamicDetail', goPush(item, floor);
arguments: {'item': item, 'floor': floor},
preventDuplicates: false);
break; break;
/// 图文动态查看 /// 图文动态查看
case 'DYNAMIC_TYPE_DRAW': case 'DYNAMIC_TYPE_DRAW':
Get.toNamed('/dynamicDetail', goPush(item, floor);
arguments: {'item': item, 'floor': floor},
preventDuplicates: false);
break; break;
case 'DYNAMIC_TYPE_AV': case 'DYNAMIC_TYPE_AV':
String bvid = item.modules.moduleDynamic.major.archive.bvid; String bvid = item.modules.moduleDynamic.major.archive.bvid;
@ -189,10 +185,7 @@ class DynamicsController extends GetxController {
/// 纯文字动态查看 /// 纯文字动态查看
case 'DYNAMIC_TYPE_WORD': case 'DYNAMIC_TYPE_WORD':
print('纯文本'); goPush(item, floor);
Get.toNamed('/dynamicDetail',
arguments: {'item': item, 'floor': floor},
preventDuplicates: false);
break; break;
case 'DYNAMIC_TYPE_LIVE_RCMD': case 'DYNAMIC_TYPE_LIVE_RCMD':
DynamicLiveModel liveRcmd = item.modules.moduleDynamic.major.liveRcmd; DynamicLiveModel liveRcmd = item.modules.moduleDynamic.major.liveRcmd;
@ -235,6 +228,17 @@ class DynamicsController extends GetxController {
} }
} }
void goPush(item, floor) {
if (Get.currentRoute == '/dynamicDetail') {
return;
}
Get.toNamed(
'/dynamicDetail',
arguments: {'item': item, 'floor': floor},
preventDuplicates: false,
);
}
Future queryFollowUp({type = 'init'}) async { Future queryFollowUp({type = 'init'}) async {
if (!userLogin.value) { if (!userLogin.value) {
return {'status': false, 'msg': '账号未登录', 'code': -101}; return {'status': false, 'msg': '账号未登录', 'code': -101};