删除埋点,im和客服
This commit is contained in:
@@ -183,7 +183,7 @@ class _HomeFloatBannerState extends State<HomeFloatBanner> {
|
||||
return InkWell(
|
||||
enableFeedback: false,
|
||||
// 内链可配到会员/金币页,来源统一记首页浮窗
|
||||
onTap: () => pushToPageByLink(_banner.url, id: _banner.id, sourcePage: PaySourcePage.homeFloatWindow),
|
||||
onTap: () => pushToPageByLink(_banner.url, sourcePage: PaySourcePage.homeFloatWindow),
|
||||
child: SizedBox(
|
||||
width: widget.width,
|
||||
height: widget.height,
|
||||
|
||||
@@ -134,7 +134,6 @@ class _SwiperFloatingWidgetState extends State<SwiperFloatingWidget> {
|
||||
// 内链可配到会员/金币页,来源统一记首页浮窗
|
||||
pushToPageByLink(
|
||||
ad.url,
|
||||
id: ad.id ?? (ad.position ?? 0).toString(),
|
||||
sourcePage: PaySourcePage.homeFloatWindow,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ class QuickEntryRow extends StatelessWidget {
|
||||
margin: const EdgeInsets.only(right: 16),
|
||||
child: InkWell(
|
||||
enableFeedback: false,
|
||||
onTap: () => pushToPageByLink(model.linkUrl, id: model.id),
|
||||
onTap: () => pushToPageByLink(model.linkUrl),
|
||||
child: Column(
|
||||
children: [
|
||||
Expanded(
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:jydj/assets_tool/images.dart';
|
||||
import 'package:jydj/hj_utils/api_service/common_service.dart';
|
||||
import 'package:jydj/hj_utils/screen.dart';
|
||||
import 'package:jydj/routers/jump_router.dart';
|
||||
|
||||
@@ -50,7 +51,8 @@ class TiktokSimpleCell extends StatelessWidget {
|
||||
|
||||
void _onTap() {
|
||||
if (videoModel?.isRandomAd() == true) {
|
||||
pushToPageByLink(videoModel?.randomAdsInfo?.href, id: videoModel?.randomAdsInfo?.id);
|
||||
pushToPageByLink(videoModel?.randomAdsInfo?.href);
|
||||
CommonService.adsClick(videoModel?.randomAdsInfo?.id);
|
||||
return;
|
||||
}
|
||||
pushToVideoPage(videoModel: videoModel);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:jydj/hj_utils/api_service/common_service.dart';
|
||||
import 'package:jydj/hj_utils/screen.dart';
|
||||
|
||||
import '../../../hj_model/video_model.dart';
|
||||
@@ -76,7 +77,8 @@ class VideoHorCell extends StatelessWidget {
|
||||
|
||||
void _onTap() {
|
||||
if (videoModel?.isRandomAd() == true) {
|
||||
pushToPageByLink(videoModel?.randomAdsInfo?.href, id: videoModel?.randomAdsInfo?.id);
|
||||
pushToPageByLink(videoModel?.randomAdsInfo?.href);
|
||||
CommonService.adsClick(videoModel?.randomAdsInfo?.id);
|
||||
return;
|
||||
}
|
||||
pushToVideoPage(videoModel: videoModel);
|
||||
|
||||
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:jydj/assets_tool/images.dart';
|
||||
import 'package:jydj/config/config.dart';
|
||||
import 'package:jydj/extension/extensions.dart';
|
||||
import 'package:jydj/hj_utils/api_service/common_service.dart';
|
||||
import 'package:jydj/hj_utils/screen.dart';
|
||||
import 'package:jydj/routers/jump_router.dart';
|
||||
import 'package:jydj/tools_base/banner/ads_item.dart';
|
||||
@@ -14,7 +15,6 @@ import '../../../hj_utils/free_play_manager.dart';
|
||||
import '../../../tools_base/banner/ads_banner.dart';
|
||||
import '../../../tools_base/widget/net_image_widget.dart';
|
||||
import 'level_mark_chip.dart';
|
||||
import '../../../track_event_manager/track_manager.dart';
|
||||
|
||||
/// 竖版视频 item:封面(角标/售卖标/暗网遮罩) + 标题 +(可选)标签/评论数。
|
||||
/// 命中广告数据时整体换成 [VideoSimpleAdsCell]
|
||||
@@ -26,7 +26,6 @@ class VideoSimpleCell extends StatelessWidget {
|
||||
final bool isFromHY; // 黄油风格
|
||||
final bool isShowBottom; // true 显示底部标签和评论数
|
||||
final bool isFromSearch;
|
||||
final AdExposureModel? exposureModel;
|
||||
final double titleFontSize; // 标题字号,小卡场景传小值
|
||||
final double coverFontSize; // 封面底部播放量/时长字号,小卡场景传小值避免溢出
|
||||
final String? coverRightText; // 封面右下角文案,默认时长;短剧传「共N集」
|
||||
@@ -42,7 +41,6 @@ class VideoSimpleCell extends StatelessWidget {
|
||||
this.isFromHY = false,
|
||||
this.isShowBottom = false,
|
||||
this.isFromSearch = false,
|
||||
this.exposureModel,
|
||||
this.titleFontSize = 12,
|
||||
this.coverFontSize = 10,
|
||||
this.coverRightText,
|
||||
@@ -65,7 +63,6 @@ class VideoSimpleCell extends StatelessWidget {
|
||||
? VideoSimpleAdsCell(
|
||||
videoModel: videoModel,
|
||||
textLines: textLines,
|
||||
exposureModel: exposureModel,
|
||||
isShowBottom: isShowBottom,
|
||||
)
|
||||
: _buildContent(),
|
||||
@@ -74,7 +71,8 @@ class VideoSimpleCell extends StatelessWidget {
|
||||
|
||||
void _onTap() {
|
||||
if (videoModel?.isRandomAd() == true) {
|
||||
pushToPageByLink(videoModel?.randomAdsInfo?.href, id: videoModel?.randomAdsInfo?.id);
|
||||
pushToPageByLink(videoModel?.randomAdsInfo?.href);
|
||||
CommonService.adsClick(videoModel?.randomAdsInfo?.id);
|
||||
return;
|
||||
}
|
||||
if (_needVipUnlock) {
|
||||
@@ -279,14 +277,12 @@ class VideoSimpleCell extends StatelessWidget {
|
||||
class VideoSimpleAdsCell extends StatefulWidget {
|
||||
final VideoModel? videoModel;
|
||||
final int textLines;
|
||||
final AdExposureModel? exposureModel;
|
||||
final bool isShowBottom;
|
||||
|
||||
const VideoSimpleAdsCell({
|
||||
super.key,
|
||||
this.videoModel,
|
||||
this.textLines = 2,
|
||||
this.exposureModel,
|
||||
this.isShowBottom = false,
|
||||
});
|
||||
|
||||
@@ -303,18 +299,11 @@ class _VideoSimpleAdsCellState extends State<VideoSimpleAdsCell> {
|
||||
|
||||
AdsInfoModel? get adsModel => videoModel?.randomAdsInfo;
|
||||
|
||||
// 广告点击:跳落地页并带曝光埋点参数
|
||||
// 广告点击:跳落地页并上报点击
|
||||
void _onAdTap() {
|
||||
final ad = adsInfoArr![adIndex];
|
||||
pushToPageByLink(
|
||||
ad.href,
|
||||
id: ad.id,
|
||||
arguments: {
|
||||
'pageType': widget.exposureModel?.pageType,
|
||||
'adInfo': ad,
|
||||
'payload': {'ad_type': widget.exposureModel?.adType?.value ?? ''},
|
||||
},
|
||||
);
|
||||
pushToPageByLink(ad.href);
|
||||
CommonService.adsClick(ad.id);
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -345,7 +334,6 @@ class _VideoSimpleAdsCellState extends State<VideoSimpleAdsCell> {
|
||||
child: AdsBanner(
|
||||
adsInfoArr,
|
||||
autoPlayMs: 3000,
|
||||
exposureModel: widget.exposureModel,
|
||||
borderRadius: 4,
|
||||
onIndexChanged: (index) {
|
||||
adIndex = index;
|
||||
@@ -414,7 +402,6 @@ class _VideoSimpleAdsCellState extends State<VideoSimpleAdsCell> {
|
||||
children: [
|
||||
AdsItem(
|
||||
adInfo: adModel!,
|
||||
exposureModel: widget.exposureModel,
|
||||
borderRadius: 4,
|
||||
showType: AdShowType.img,
|
||||
),
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jydj/assets_tool/app_colors.dart';
|
||||
import 'package:jydj/assets_tool/images.dart';
|
||||
import 'package:jydj/hj_page/home/provider/home_update_marker_provider.dart';
|
||||
import 'package:jydj/hj_utils/const.dart';
|
||||
import 'package:jydj/hj_utils/holiday_theme.dart';
|
||||
import 'package:jydj/hj_utils/screen.dart';
|
||||
import 'package:jydj/tools_base/indicator/custom_tab_indicator.dart';
|
||||
import 'package:jydj/tools_base/loading/loading_center_widget.dart';
|
||||
@@ -33,47 +31,30 @@ class HomeMainPage extends StatelessWidget {
|
||||
init: HomeMainLogic(),
|
||||
tag: "HomeMainLogic",
|
||||
builder: (logic) {
|
||||
final isHoliday = holidayTheme.openHoliday;
|
||||
return Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
//节日皮肤:铺底色 + 顶部通栏背景图
|
||||
if (isHoliday) ...[
|
||||
Container(color: AppColors.primaryColor),
|
||||
Positioned(
|
||||
top: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: Image.asset(HolidayTheme.theme.mainBg, fit: BoxFit.fitWidth),
|
||||
),
|
||||
return Scaffold(
|
||||
key: logic.scaffoldKey,
|
||||
endDrawer: HSHomeDrawer(homeLogic: logic),
|
||||
//浮窗放 body 里,endDrawer 才能盖住,避免挡住抽屉里的模块点击
|
||||
body: Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
_body(logic),
|
||||
const Positioned(right: 12, bottom: 40, child: HomeFloatWidget()),
|
||||
],
|
||||
Scaffold(
|
||||
key: logic.scaffoldKey,
|
||||
backgroundColor: isHoliday ? Colors.transparent : null,
|
||||
endDrawer: HSHomeDrawer(homeLogic: logic),
|
||||
//浮窗放 body 里,endDrawer 才能盖住,避免挡住抽屉里的模块点击
|
||||
body: Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
_body(logic, isHoliday),
|
||||
const Positioned(right: 12, bottom: 40, child: HomeFloatWidget()),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _body(HomeMainLogic logic, bool isHoliday) {
|
||||
Widget _body(HomeMainLogic logic) {
|
||||
if (logic.isLoading) return const LoadingCenterWidget();
|
||||
return Column(
|
||||
children: [
|
||||
//顶部搜索栏(状态栏 + 导航栏高度)
|
||||
Container(
|
||||
color: isHoliday ? Colors.transparent : Colors.black,
|
||||
color: Colors.black,
|
||||
padding: EdgeInsets.only(top: screen.paddingTop),
|
||||
height: kToolbarHeight + screen.paddingTop,
|
||||
child: CommonSearchBarView(logic: logic),
|
||||
@@ -147,12 +128,11 @@ class _HomeTabViewState extends State<HomeTabView> with SingleTickerProviderStat
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final isHoliday = holidayTheme.openHoliday;
|
||||
return Column(
|
||||
children: [
|
||||
Container(
|
||||
height: 48.h,
|
||||
color: isHoliday ? Colors.transparent : Colors.black,
|
||||
color: Colors.black,
|
||||
child: _tabBar(),
|
||||
),
|
||||
Expanded(
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jydj/hj_model/drama_media_info.dart';
|
||||
import 'package:jydj/hj_utils/api_service/acg_service.dart';
|
||||
import 'package:jydj/tools_base/debug_log.dart';
|
||||
import 'package:pull_to_refresh/pull_to_refresh.dart';
|
||||
|
||||
import '../../../hj_model/home/module_detail_model.dart';
|
||||
import '../../../hj_model/home/plate_model.dart';
|
||||
import '../../../hj_utils/api_service/vid_service.dart';
|
||||
import 'home_tab_base_logic.dart';
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jydj/tools_base/loading/loading_center_widget.dart';
|
||||
import 'package:jydj/track_event_manager/track_manager.dart';
|
||||
|
||||
import '../../../hj_model/home/plate_model.dart';
|
||||
import '../../../hj_model/home/module_detail_model.dart';
|
||||
@@ -51,10 +50,6 @@ class _HomeTabSectionPageState extends State<HomeTabSectionPage> with UniqueTagM
|
||||
4,
|
||||
autoStyle: true,
|
||||
padding: EdgeInsets.fromLTRB(12, 0, 12, 12),
|
||||
exposureModel: AdExposureModel(
|
||||
pageType: widget.isDarkStyle ? TrackEventPageType.darkweb : TrackEventPageType.home,
|
||||
tabIndex: widget.tabIndex,
|
||||
),
|
||||
),
|
||||
),
|
||||
SliverToBoxAdapter(child: QuickEntryRow(widget.tabModel)),
|
||||
@@ -95,10 +90,6 @@ class _HomeTabSectionPageState extends State<HomeTabSectionPage> with UniqueTagM
|
||||
-1,
|
||||
ads: section.adsInfoArr ?? [],
|
||||
padding: EdgeInsets.fromLTRB(12, 0, 12, 16),
|
||||
exposureModel: AdExposureModel(
|
||||
pageType: widget.isDarkStyle ? TrackEventPageType.darkweb : TrackEventPageType.home,
|
||||
tabIndex: widget.tabIndex * 100 + index,
|
||||
),
|
||||
);
|
||||
} else if (logic.lastIsGuessLike && index == logic.allSection.length - 1) {
|
||||
return SizedBox(); // 最后一个猜你喜欢列表单独处理
|
||||
|
||||
@@ -12,7 +12,6 @@ import '../../../hj_model/video_model.dart';
|
||||
import '../../../hj_utils/sliver_delegate.dart';
|
||||
import '../../../tools_base/banner/ads_grid_view.dart';
|
||||
import '../../../tools_base/refresh/pull_refresh.dart';
|
||||
import '../../../track_event_manager/track_manager.dart';
|
||||
import '../../cartoon/acg_widget_item.dart';
|
||||
import '../home_cell_style/quick_entry_row.dart';
|
||||
import '../home_cell_style/video_simple_cell.dart';
|
||||
@@ -61,10 +60,6 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
4,
|
||||
autoStyle: true,
|
||||
padding: EdgeInsets.fromLTRB(12, 0, 12, 12),
|
||||
exposureModel: AdExposureModel(
|
||||
pageType: widget.isDarkStyle ? TrackEventPageType.darkweb : TrackEventPageType.home,
|
||||
tabIndex: widget.tabIndex,
|
||||
),
|
||||
),
|
||||
),
|
||||
SliverToBoxAdapter(child: QuickEntryRow(widget.tabModel)),
|
||||
@@ -96,9 +91,11 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
},
|
||||
child: Obx(
|
||||
() {
|
||||
//非暗网风格也要读一次:Obx 读不到可观察变量会抛 improper use of a GetX
|
||||
final isInTop = logic.isSortMenuInTop.value;
|
||||
Color? bgColor;
|
||||
if (widget.isDarkStyle) {
|
||||
if (logic.isSortMenuInTop.value) {
|
||||
if (isInTop) {
|
||||
bgColor = Colors.transparent;
|
||||
} else {
|
||||
bgColor = Colors.black;
|
||||
@@ -108,7 +105,6 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
isLatest: logic.isNewestStyle,
|
||||
labelPadding: const EdgeInsets.symmetric(horizontal: 10),
|
||||
tabs: logic.isNewestStyle ? logic.lastestSortTitles : logic.sortTitles,
|
||||
isPinned: !logic.isSortMenuInTop.value,
|
||||
bgColor: bgColor,
|
||||
onSort: logic.sortMenuEvent,
|
||||
rightWidget: logic.isNewestStyle ? null : _buildSortStyleMenu(logic),
|
||||
@@ -222,10 +218,6 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
child: VideoSimpleCell(
|
||||
videoModel: videoModel,
|
||||
textLines: logic.isGridStyle.value ? 2 : 1,
|
||||
exposureModel: AdExposureModel(
|
||||
pageType: widget.isDarkStyle ? TrackEventPageType.darkweb : TrackEventPageType.home,
|
||||
tabIndex: widget.tabIndex * 100 + index,
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
@@ -260,10 +252,6 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
VideoModel videoModel = subList[index];
|
||||
return VideoSimpleCell(
|
||||
videoModel: videoModel,
|
||||
exposureModel: AdExposureModel(
|
||||
pageType: widget.isDarkStyle ? TrackEventPageType.darkweb : TrackEventPageType.home,
|
||||
tabIndex: widget.tabIndex * 100 + i * gapValue + index,
|
||||
),
|
||||
);
|
||||
},
|
||||
childCount: subList.length,
|
||||
@@ -300,10 +288,6 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
VideoModel videoModel = subList[index];
|
||||
return VideoSimpleCell(
|
||||
videoModel: videoModel,
|
||||
exposureModel: AdExposureModel(
|
||||
pageType: widget.isDarkStyle ? TrackEventPageType.darkweb : TrackEventPageType.home,
|
||||
tabIndex: widget.tabIndex * 100 + allIndex * gapValue + index,
|
||||
),
|
||||
);
|
||||
},
|
||||
childCount: subList.length,
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:jydj/assets_tool/app_colors.dart';
|
||||
import 'package:jydj/hj_page/home/provider/home_update_marker_provider.dart';
|
||||
import 'package:jydj/hj_utils/holiday_theme.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
/// 首页模块的排序切换栏(热门推荐 / 最新上架 / ...)
|
||||
@@ -10,7 +9,6 @@ class HomeSortHeader extends StatefulWidget {
|
||||
final ValueChanged<int> onSort;
|
||||
final List<String>? tabs;
|
||||
final EdgeInsets? labelPadding;
|
||||
final bool isPinned; //已吸顶:节日主题下只有吸顶才铺底色,未吸顶保持透明露出节日背景图
|
||||
final Widget? rightWidget;
|
||||
final Color? bgColor;
|
||||
final bool isLatest;
|
||||
@@ -20,7 +18,6 @@ class HomeSortHeader extends StatefulWidget {
|
||||
required this.onSort,
|
||||
this.tabs,
|
||||
this.labelPadding,
|
||||
this.isPinned = false,
|
||||
this.rightWidget,
|
||||
this.bgColor,
|
||||
this.isLatest = false,
|
||||
@@ -45,12 +42,9 @@ class _HomeSortHeaderState extends State<HomeSortHeader> with SingleTickerProvid
|
||||
if (widget.isLatest) {
|
||||
return _buildNewsetsStyle();
|
||||
}else {
|
||||
final showBg = !holidayTheme.openHoliday || widget.isPinned;
|
||||
return Container(
|
||||
height: 38,
|
||||
color: showBg ? (widget.bgColor ?? Theme
|
||||
.of(context)
|
||||
.scaffoldBackgroundColor) : Colors.transparent,
|
||||
color: widget.bgColor ?? Theme.of(context).scaffoldBackgroundColor,
|
||||
child: widget.rightWidget == null
|
||||
? _tabBar()
|
||||
: Row(children: [Expanded(child: _tabBar()), widget.rightWidget!]),
|
||||
@@ -79,10 +73,9 @@ class _HomeSortHeaderState extends State<HomeSortHeader> with SingleTickerProvid
|
||||
|
||||
/// 「最新」页专用:字号更小、选中态红色胶囊、首个 tab 带更新红点
|
||||
Widget _buildNewsetsStyle() {
|
||||
final showBg = !holidayTheme.openHoliday || widget.isPinned;
|
||||
return Container(
|
||||
height: 38,
|
||||
color: showBg ? (widget.bgColor ?? Theme.of(context).scaffoldBackgroundColor) : Colors.transparent,
|
||||
color: widget.bgColor ?? Theme.of(context).scaffoldBackgroundColor,
|
||||
child: TabBar(
|
||||
controller: tabCtr,
|
||||
isScrollable: true,
|
||||
|
||||
@@ -4,7 +4,6 @@ import 'package:get/get.dart';
|
||||
import 'package:jydj/hj_utils/const.dart';
|
||||
import 'package:jydj/tools_base/banner/ads_grid_view.dart';
|
||||
|
||||
import '../../../track_event_manager/track_manager.dart';
|
||||
import '../../find/rank_module/rank_main_page.dart';
|
||||
import '../../find/rank_module/rank_sub_page.dart';
|
||||
import 'search_main_logic.dart';
|
||||
@@ -58,7 +57,6 @@ class SearchMainPage extends StatelessWidget {
|
||||
32,
|
||||
autoStyle: true,
|
||||
padding: EdgeInsets.symmetric(vertical: 12.h, horizontal: 12.w),
|
||||
exposureModel: AdExposureModel(pageType: TrackEventPageType.search),
|
||||
),
|
||||
),
|
||||
//搜索历史:随增删局部刷新,不带动整页(id 要和 logic 里 update 的一致)
|
||||
|
||||
@@ -9,8 +9,6 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
|
||||
import '../../../../hj_model/acg/cartoon_more_list.dart';
|
||||
import '../../../../hj_model/cartoon_media_info.dart';
|
||||
import '../../../../tools_base/refresh/pull_refresh.dart';
|
||||
import '../../../../tools_base/widget/multitap_recognizer.dart';
|
||||
import '../../../../track_event_manager/track_manager.dart';
|
||||
import '../../../cartoon/acg_widget_item.dart';
|
||||
|
||||
class SearchACGResultPage extends StatefulWidget {
|
||||
@@ -51,12 +49,6 @@ class _SearchACGResultPageState extends State<SearchACGResultPage> {
|
||||
}
|
||||
videoList?.addAll(retResp?.list ?? []);
|
||||
retResp?.hasNext == false ? refreshController?.loadNoData() : refreshController?.loadComplete();
|
||||
searchClickManager.searchKeyword(
|
||||
keyword: widget.keywords,
|
||||
count: retResp?.list?.length ?? 0,
|
||||
searchId: '',
|
||||
traceId: '',
|
||||
);
|
||||
} catch (e) {
|
||||
refreshController?.loadComplete();
|
||||
debugLog(e);
|
||||
@@ -93,17 +85,7 @@ class _SearchACGResultPageState extends State<SearchACGResultPage> {
|
||||
),
|
||||
itemCount: videoList?.length ?? 0,
|
||||
itemBuilder: (context, index) {
|
||||
return MultiTap(
|
||||
onTap: () {
|
||||
searchClickManager.searchClicks(
|
||||
keyword: widget.keywords,
|
||||
clickType: TrackEventSearchType.acg,
|
||||
id: videoList![index].id,
|
||||
index: index,
|
||||
traceId: '',
|
||||
);
|
||||
},
|
||||
child: AcgItemWidget(info: videoList![index]));
|
||||
return AcgItemWidget(info: videoList![index]);
|
||||
},
|
||||
),
|
||||
);
|
||||
|
||||
@@ -2,9 +2,7 @@ import 'dart:math';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jydj/hj_model/drama_media_info.dart';
|
||||
import 'package:jydj/hj_model/video_model.dart';
|
||||
import 'package:jydj/hj_page/drama/drama_detail_page.dart';
|
||||
import 'package:jydj/hj_page/drama/drama_tag_detail_page.dart';
|
||||
import 'package:jydj/hj_utils/api_service/drama_service.dart';
|
||||
import 'package:jydj/hj_utils/api_service/search_service.dart';
|
||||
@@ -16,8 +14,6 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
|
||||
|
||||
import '../../../../hj_model/home/video_list_model.dart';
|
||||
import '../../../../tools_base/refresh/pull_refresh.dart';
|
||||
import '../../../../tools_base/widget/multitap_recognizer.dart';
|
||||
import '../../../../track_event_manager/track_manager.dart';
|
||||
import '../../../cartoon/photo_gallery_item.dart';
|
||||
import '../../../community/widget/community_post_widget.dart';
|
||||
import '../../home_cell_style/drama_cover_card.dart';
|
||||
@@ -83,12 +79,6 @@ class _SearchVideoResultPageState extends State<SearchVideoResultPage> {
|
||||
videoList ??= [];
|
||||
videoList?.addAll(retResp?.list.map((e) => e.toVideoModel(null)) ?? []);
|
||||
retResp?.hasNext != true ? refreshController?.loadNoData() : refreshController?.loadComplete();
|
||||
searchClickManager.searchKeyword(
|
||||
keyword: widget.keywords,
|
||||
count: retResp?.list.length ?? 0,
|
||||
searchId: '',
|
||||
traceId: '',
|
||||
);
|
||||
} else {
|
||||
VideoListResp? retResp = await SearchService.searchMedia(widget.keywords,
|
||||
pageNumber: page, pageSize: size, realm: widget.type.searchRealm, sortType: sortValue);
|
||||
@@ -103,12 +93,6 @@ class _SearchVideoResultPageState extends State<SearchVideoResultPage> {
|
||||
tagID = retResp?.tagID;
|
||||
}
|
||||
retResp?.hasNext == false ? refreshController?.loadNoData() : refreshController?.loadComplete();
|
||||
searchClickManager.searchKeyword(
|
||||
keyword: widget.keywords,
|
||||
count: retResp?.videos?.length ?? 0,
|
||||
searchId: '',
|
||||
traceId: '',
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
refreshController?.loadComplete();
|
||||
@@ -186,18 +170,6 @@ class _SearchVideoResultPageState extends State<SearchVideoResultPage> {
|
||||
}
|
||||
}
|
||||
|
||||
/// 进短剧二级页;搜索列表不一定带 dramaInfo,最少用 id/标题/封面兜底
|
||||
void _openDrama(VideoModel model) {
|
||||
final drama = model.dramaInfo ??
|
||||
(DramaMediaInfo()
|
||||
..id = model.id
|
||||
..title = model.title
|
||||
..verticalCover = model.cover
|
||||
..horizontalCover = model.cover
|
||||
..totalEpisode = model.totalEpisode);
|
||||
Get.to(() => DramaDetailPage(drama: drama));
|
||||
}
|
||||
|
||||
Widget _buildTypeList() {
|
||||
if (widget.type == MediaStyle.Drama) {
|
||||
return GridView.builder(
|
||||
@@ -211,18 +183,7 @@ class _SearchVideoResultPageState extends State<SearchVideoResultPage> {
|
||||
itemCount: videoList?.length ?? 0,
|
||||
itemBuilder: (context, index) {
|
||||
final model = videoList![index];
|
||||
return MultiTap(
|
||||
onTap: () {
|
||||
searchClickManager.searchClicks(
|
||||
keyword: widget.keywords,
|
||||
clickType: TrackEventSearchType.video,
|
||||
id: '${model.id}',
|
||||
index: index,
|
||||
traceId: '',
|
||||
);
|
||||
},
|
||||
child: DramaCoverCard(mediaInfo: model.dramaInfo!),
|
||||
);
|
||||
return DramaCoverCard(mediaInfo: model.dramaInfo!);
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -238,22 +199,12 @@ class _SearchVideoResultPageState extends State<SearchVideoResultPage> {
|
||||
),
|
||||
itemCount: videoList?.length ?? 0,
|
||||
itemBuilder: (context, index) {
|
||||
return MultiTap(
|
||||
onTap: () {
|
||||
searchClickManager.searchClicks(
|
||||
keyword: widget.keywords,
|
||||
clickType: TrackEventSearchType.video,
|
||||
id: "${videoList![index].id}",
|
||||
index: index,
|
||||
traceId: '',
|
||||
);
|
||||
},
|
||||
child: VideoSimpleCell(
|
||||
videoModel: videoList![index],
|
||||
textLines: isShort ? 1 : 2,
|
||||
isFromSearch: true,
|
||||
isShort: isShort,
|
||||
));
|
||||
return VideoSimpleCell(
|
||||
videoModel: videoList![index],
|
||||
textLines: isShort ? 1 : 2,
|
||||
isFromSearch: true,
|
||||
isShort: isShort,
|
||||
);
|
||||
},
|
||||
);
|
||||
} else if (widget.type == MediaStyle.Pic) {
|
||||
@@ -267,17 +218,7 @@ class _SearchVideoResultPageState extends State<SearchVideoResultPage> {
|
||||
),
|
||||
itemCount: videoList?.length ?? 0,
|
||||
itemBuilder: (context, index) {
|
||||
return MultiTap(
|
||||
onTap: () {
|
||||
searchClickManager.searchClicks(
|
||||
keyword: widget.keywords,
|
||||
clickType: TrackEventSearchType.image,
|
||||
id: "${videoList![index].id}",
|
||||
index: index,
|
||||
traceId: '',
|
||||
);
|
||||
},
|
||||
child: PhotoGalleryItem(videoModel: videoList![index], textline: 1));
|
||||
return PhotoGalleryItem(videoModel: videoList![index], textline: 1);
|
||||
},
|
||||
);
|
||||
} else {
|
||||
@@ -285,20 +226,10 @@ class _SearchVideoResultPageState extends State<SearchVideoResultPage> {
|
||||
padding: EdgeInsets.zero,
|
||||
itemCount: videoList?.length ?? 0,
|
||||
itemBuilder: (context, index) {
|
||||
return MultiTap(
|
||||
onTap: () {
|
||||
searchClickManager.searchClicks(
|
||||
keyword: widget.keywords,
|
||||
clickType: TrackEventSearchType.post,
|
||||
id: "${videoList![index].id}",
|
||||
index: index,
|
||||
traceId: '',
|
||||
);
|
||||
},
|
||||
child: CommunityPostWidget(
|
||||
videoModel: videoList![index],
|
||||
videoModels: videoList,
|
||||
));
|
||||
return CommunityPostWidget(
|
||||
videoModel: videoList![index],
|
||||
videoModels: videoList,
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -330,10 +261,7 @@ class _SearchVideoResultPageState extends State<SearchVideoResultPage> {
|
||||
),
|
||||
itemBuilder: (context, index) {
|
||||
final videoModel = tagVidList![index];
|
||||
return MultiTap(
|
||||
onTap: (){},
|
||||
child: DramaCoverCard(mediaInfo: videoModel.dramaInfo!),
|
||||
);
|
||||
return DramaCoverCard(mediaInfo: videoModel.dramaInfo!);
|
||||
},
|
||||
),
|
||||
if (tagID?.isNotEmpty == true) ...[
|
||||
@@ -391,22 +319,11 @@ class _SearchVideoResultPageState extends State<SearchVideoResultPage> {
|
||||
),
|
||||
itemBuilder: (context, index) {
|
||||
VideoModel videoModel = tagVidList![index];
|
||||
return MultiTap(
|
||||
onTap: () {
|
||||
searchClickManager.searchClicks(
|
||||
keyword: widget.keywords,
|
||||
clickType: TrackEventSearchType.video,
|
||||
id: "${videoModel.id}",
|
||||
index: index,
|
||||
traceId: '',
|
||||
);
|
||||
},
|
||||
child: VideoSimpleCell(
|
||||
videoModel: videoModel,
|
||||
textLines: isShort ? 1 : 2,
|
||||
isFromSearch: true,
|
||||
isShort: isShort,
|
||||
),
|
||||
return VideoSimpleCell(
|
||||
videoModel: videoModel,
|
||||
textLines: isShort ? 1 : 2,
|
||||
isFromSearch: true,
|
||||
isShort: isShort,
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
@@ -4,7 +4,6 @@ import 'package:jydj/assets_tool/images.dart';
|
||||
import 'package:jydj/config/config.dart';
|
||||
import 'package:jydj/hj_utils/screen.dart';
|
||||
|
||||
import '../../../../hj_utils/holiday_theme.dart';
|
||||
import '../../../../tools_base/widget/marquee_widget.dart';
|
||||
import '../../../../tools_base/widget/net_image_widget.dart';
|
||||
import '../../../mine/welfare/sign_daily_page.dart';
|
||||
@@ -113,7 +112,6 @@ class _CommonSearchBarViewState extends State<CommonSearchBarView> {
|
||||
|
||||
/// 签到入口
|
||||
Widget _buildSignIcon() {
|
||||
final useHolidayIcon = holidayTheme.openHoliday && HolidayTheme.theme.signIcon.isNotEmpty;
|
||||
return InkWell(
|
||||
enableFeedback: false,
|
||||
onTap: () => Get.to(SignDailyPage()),
|
||||
|
||||
@@ -11,7 +11,6 @@ import 'package:jydj/hj_model/splash/domain_source_model.dart';
|
||||
import 'package:jydj/hj_utils/screen.dart';
|
||||
|
||||
import '../../../hj_utils/api_service/vid_service.dart';
|
||||
import '../../../hj_utils/holiday_theme.dart';
|
||||
import '../../../routers/jump_router.dart';
|
||||
|
||||
class HomeTxtMarQuee extends StatefulWidget {
|
||||
@@ -108,12 +107,7 @@ class HomeTxtMarQueeState extends State<HomeTxtMarQuee> with SingleTickerProvide
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Image.asset(
|
||||
(holidayTheme.openHoliday && HolidayTheme.theme.broadcastIcon.isNotEmpty)
|
||||
? HolidayTheme.theme.broadcastIcon
|
||||
: "icon_broadcast.png".commonImgPath,
|
||||
width: widget.iconSize ?? 20,
|
||||
),
|
||||
Image.asset("icon_broadcast.png".commonImgPath, width: widget.iconSize ?? 20),
|
||||
6.sizeBoxW,
|
||||
Expanded(
|
||||
child: InfiniteMarquee(
|
||||
@@ -124,7 +118,7 @@ class HomeTxtMarQueeState extends State<HomeTxtMarQuee> with SingleTickerProvide
|
||||
return InkWell(
|
||||
enableFeedback: false,
|
||||
onTap: () {
|
||||
pushToPageByLink(model.url, id: model.id);
|
||||
pushToPageByLink(model.url);
|
||||
},
|
||||
child: Text(
|
||||
model.content ?? '',
|
||||
|
||||
@@ -3,7 +3,6 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jydj/assets_tool/app_colors.dart';
|
||||
import 'package:jydj/assets_tool/images.dart';
|
||||
import 'package:jydj/hj_utils/holiday_theme.dart';
|
||||
import 'package:jydj/hj_utils/screen.dart'; // sizeBoxH/sizeBoxW 扩展
|
||||
import 'package:jydj/tools_base/widget/sheet_handle_bar.dart';
|
||||
|
||||
@@ -17,7 +16,7 @@ enum PublishEntry {
|
||||
|
||||
const PublishEntry(this.width, this.height);
|
||||
|
||||
String realPath() => HolidayTheme.theme.addPublish;
|
||||
String realPath() => 'publish.png'.homePath;
|
||||
}
|
||||
|
||||
class PublishButton extends StatelessWidget {
|
||||
|
||||
Reference in New Issue
Block a user