删除埋点,im和客服
This commit is contained in:
@@ -67,7 +67,7 @@ class _AudioPlayerContentState extends State<AudioPlayerContent> {
|
||||
18.sizeBoxH,
|
||||
_progressRow(audioValue, progress, max),
|
||||
14.sizeBoxH,
|
||||
_controlRow(audioValue, progress),
|
||||
_controlRow(audioValue),
|
||||
18.sizeBoxH,
|
||||
],
|
||||
);
|
||||
@@ -142,7 +142,7 @@ class _AudioPlayerContentState extends State<AudioPlayerContent> {
|
||||
}
|
||||
|
||||
// 控制行:循环模式、上一集/播放暂停/下一集、播放列表
|
||||
Widget _controlRow(AudioPlayerValue audioValue, double progress) {
|
||||
Widget _controlRow(AudioPlayerValue audioValue) {
|
||||
final isLoop = playMod == AudioPlayMod.loop;
|
||||
final isPlaying = audioValue.isPlaying ?? false;
|
||||
return Row(
|
||||
@@ -179,7 +179,7 @@ class _AudioPlayerContentState extends State<AudioPlayerContent> {
|
||||
children: [
|
||||
InkWell(
|
||||
enableFeedback: false,
|
||||
onTap: () => manager.playForward(progress),
|
||||
onTap: () => manager.playForward(),
|
||||
child: Image.asset('forward.png'.acgImgPath, width: 24),
|
||||
),
|
||||
40.sizeBoxW,
|
||||
@@ -199,7 +199,7 @@ class _AudioPlayerContentState extends State<AudioPlayerContent> {
|
||||
40.sizeBoxW,
|
||||
InkWell(
|
||||
enableFeedback: false,
|
||||
onTap: () => manager.playNext(progress),
|
||||
onTap: () => manager.playNext(),
|
||||
child: Image.asset('next.png'.acgImgPath, width: 24),
|
||||
),
|
||||
],
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:analytics_sdk/enum/read_behavior_enum.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jydj/hj_model/media_content.dart';
|
||||
@@ -8,7 +7,6 @@ import 'package:jydj/tools_base/toast.dart';
|
||||
import 'package:jydj/tools_base/widget/scroll_positioned_list/src/item_positions_listener.dart';
|
||||
import 'package:jydj/tools_base/widget/scroll_positioned_list/src/scrollable_positioned_list.dart';
|
||||
|
||||
import '../../track_event_manager/track_manager.dart';
|
||||
import 'widget/acg_source_manager.dart';
|
||||
|
||||
class CartoonReadLogic extends GetxController {
|
||||
@@ -21,7 +19,6 @@ class CartoonReadLogic extends GetxController {
|
||||
bool showProgress = false; // 展示进度
|
||||
bool sortType = true; // 排序类型 true-正序 false-倒序
|
||||
bool autoPlay = false; // 是否自动播放
|
||||
bool playFinish = false; // 是否触底播放完成
|
||||
double readScale = 0; // 播放比例
|
||||
double bottomHeight = 155;
|
||||
int animationTime = 250; // 显示时间(ms)
|
||||
@@ -74,7 +71,7 @@ class CartoonReadLogic extends GetxController {
|
||||
showToast('这是最后一${manager.mediaInfo?.unit}了喔~');
|
||||
return;
|
||||
}
|
||||
_openEpisode(index, behavior: next ? ReadBehaviorEnum.PAGE_NEXT : ReadBehaviorEnum.PAGE_PREV);
|
||||
_openEpisode(index);
|
||||
}
|
||||
|
||||
// 目录点击切章
|
||||
@@ -105,7 +102,7 @@ class CartoonReadLogic extends GetxController {
|
||||
// 松手:jumpTo 的位置回调下一帧才到,延后一帧再放开
|
||||
void onSeekEnd(double value) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
// 拖动期间位置回调被屏蔽,松手补一次触底结算,别把「读完」埋点漏了;
|
||||
// 拖动期间位置回调被屏蔽,松手补一次触底结算(停自动播放);
|
||||
// 放在解锁之前,免得这一步引起的滚动又被 onScrollAction 收了菜单
|
||||
_checkReachBottom();
|
||||
_isSeeking = false;
|
||||
@@ -155,9 +152,9 @@ class CartoonReadLogic extends GetxController {
|
||||
}
|
||||
|
||||
// ========== 私有方法 ==========
|
||||
/// 切章统一入口:权限/缓存都在 manager 里,这里只管埋点顺序和刷新
|
||||
/// [behavior] 非空则先补一条翻页行为(用旧章数据),[isFirstLoad] 失败时才进错误页
|
||||
Future<void> _openEpisode(int index, {ReadBehaviorEnum? behavior, bool isFirstLoad = false}) async {
|
||||
/// 切章统一入口:权限/缓存都在 manager 里,这里只管状态重置和刷新
|
||||
/// [isFirstLoad] 失败时才进错误页
|
||||
Future<void> _openEpisode(int index, {bool isFirstLoad = false}) async {
|
||||
// 首次进入页面已有全屏 loading,不再叠遮罩
|
||||
final model = await manager.getComicsMediaContent(index: index, showLoading: !isFirstLoad);
|
||||
if (model == null) {
|
||||
@@ -165,29 +162,10 @@ class CartoonReadLogic extends GetxController {
|
||||
update();
|
||||
return;
|
||||
}
|
||||
// 上下翻页,先上传切换行为(旧章的进度和集号),再上传展示行为
|
||||
if (behavior != null) {
|
||||
TrackVideoManager.comicEvent(
|
||||
behavior,
|
||||
model: manager.mediaInfo,
|
||||
readProgress: (readScale * 100).floor(),
|
||||
pageNo: currentEpisode + 1,
|
||||
mediaContent: detailInfo,
|
||||
);
|
||||
}
|
||||
currentEpisode = index;
|
||||
detailInfo = model;
|
||||
readIndex = 0;
|
||||
readScale = 0;
|
||||
playFinish = false; // 重置播放完成状态
|
||||
// 漫画展示
|
||||
TrackVideoManager.comicEvent(
|
||||
ReadBehaviorEnum.VIEW,
|
||||
model: manager.mediaInfo,
|
||||
readProgress: 0,
|
||||
pageNo: currentEpisode + 1,
|
||||
mediaContent: model,
|
||||
);
|
||||
update();
|
||||
// 首次加载时列表还没 build,controller 未 attach,跳转会空断言崩
|
||||
if (itemScrollCtr.isAttached) itemScrollCtr.jumpTo(index: 0);
|
||||
@@ -205,24 +183,14 @@ class CartoonReadLogic extends GetxController {
|
||||
update(['slider']);
|
||||
}
|
||||
|
||||
// 触底:停自动播放(顺带弹回菜单)+ 上报读完
|
||||
// 触底:停自动播放(顺带弹回菜单)
|
||||
void _checkReachBottom() {
|
||||
final positions = itemListener.itemPositions.value;
|
||||
if (positions.isEmpty) return;
|
||||
final count = detailInfo?.urlSet?.length ?? 0;
|
||||
// 首图还在视野内就不算触底(整章不足一屏时不上报读完)
|
||||
// 首图还在视野内就不算触底(整章不足一屏时不处理)
|
||||
if (positions.first.index == 0 || positions.last.index != count - 1) return;
|
||||
onChangeAutoPlay(false);
|
||||
// 播放完毕只记录一次
|
||||
if (playFinish) return;
|
||||
playFinish = true;
|
||||
TrackVideoManager.comicEvent(
|
||||
ReadBehaviorEnum.COMPLETE,
|
||||
model: manager.mediaInfo,
|
||||
readProgress: 100,
|
||||
pageNo: manager.index + 1,
|
||||
mediaContent: detailInfo,
|
||||
);
|
||||
}
|
||||
|
||||
void _startTimer() {
|
||||
|
||||
@@ -21,6 +21,6 @@ class CartoonSubDetailPage extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return CartoonSubGridPage(tagData: tagData, type: type, scrollCtr: scroll, tabIndex: index).keepAlive;
|
||||
return CartoonSubGridPage(tagData: tagData, type: type, scrollCtr: scroll).keepAlive;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,8 +5,6 @@ import 'package:jydj/hj_utils/api_service/vid_service.dart';
|
||||
import 'package:jydj/hj_utils/const.dart';
|
||||
import 'package:jydj/tools_base/base_list_controller.dart';
|
||||
|
||||
import '../../track_event_manager/track_manager.dart';
|
||||
|
||||
class CartoonSubGridLogic extends ListBaseLogic {
|
||||
final MediaStyle type; //-1:动漫和漫画 0:图集 1:黄游 2:小说
|
||||
final ModuleData? tagData; //模块model
|
||||
@@ -30,14 +28,6 @@ class CartoonSubGridLogic extends ListBaseLogic {
|
||||
return 1;
|
||||
}
|
||||
|
||||
TrackEventPageType get pageType {
|
||||
if (type == MediaStyle.Cartoon) return TrackEventPageType.home;
|
||||
if (type == MediaStyle.Pic) return TrackEventPageType.commImg;
|
||||
if (type == MediaStyle.Game) return TrackEventPageType.commNovel;
|
||||
if (type == MediaStyle.Novel) return TrackEventPageType.commNovel;
|
||||
return TrackEventPageType.home;
|
||||
}
|
||||
|
||||
String get newsType {
|
||||
if (tagData?.moduleName == '热门推荐' && tagData?.type == -100) return 'PIC';
|
||||
if (tagData?.moduleName == '热门推荐' && tagData?.type == -101) return 'SEED_LINK';
|
||||
|
||||
@@ -7,7 +7,6 @@ import 'package:jydj/hj_utils/sliver_delegate.dart';
|
||||
import 'package:jydj/tools_base/banner/ads_grid_view.dart';
|
||||
import 'package:jydj/tools_base/loading/loading_center_widget.dart';
|
||||
import 'package:jydj/tools_base/refresh/pull_refresh.dart';
|
||||
import 'package:jydj/track_event_manager/track_manager.dart';
|
||||
|
||||
import '../home/home_cell_style/quick_entry_row.dart';
|
||||
import '../home/home_cell_style/video_simple_cell.dart';
|
||||
@@ -21,14 +20,12 @@ class CartoonSubGridPage extends StatelessWidget {
|
||||
final ModuleData? tagData; //模块model
|
||||
final MediaStyle type; //-1:动漫和漫画 0:图集 1:黄游 2:小说
|
||||
final ScrollController? scrollCtr;
|
||||
final int tabIndex; //所属 tab 下标,只用于广告曝光埋点
|
||||
|
||||
const CartoonSubGridPage({
|
||||
super.key,
|
||||
this.tagData,
|
||||
this.type = MediaStyle.Pic,
|
||||
this.scrollCtr,
|
||||
this.tabIndex = 0,
|
||||
});
|
||||
|
||||
// 多 type/模块 tab 经 keepAlive 并存,按 id+type 隔离各自的 logic
|
||||
@@ -58,7 +55,6 @@ class CartoonSubGridPage extends StatelessWidget {
|
||||
type == MediaStyle.Cartoon ? 4 : 7, //广告位标识
|
||||
padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
|
||||
autoStyle: true,
|
||||
exposureModel: AdExposureModel(pageType: logic.pageType, tabIndex: tabIndex),
|
||||
),
|
||||
),
|
||||
// 这两块只有动漫/漫画有
|
||||
@@ -139,7 +135,6 @@ class CartoonSubGridPage extends StatelessWidget {
|
||||
videoModel: list[index],
|
||||
isFromHY: true,
|
||||
textLines: 1,
|
||||
exposureModel: AdExposureModel(pageType: TrackEventPageType.acgHome),
|
||||
),
|
||||
_ => const SizedBox.shrink(),
|
||||
},
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import 'package:analytics_sdk/enum/read_behavior_enum.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jydj/hj_model/media_content.dart';
|
||||
@@ -8,7 +7,6 @@ import 'package:jydj/tools_base/toast.dart';
|
||||
import '../../hj_model/acg/comic_chapters_model.dart';
|
||||
import '../../hj_model/cartoon_media_info.dart';
|
||||
import '../../tools_base/loading/loading_helper.dart';
|
||||
import '../../track_event_manager/track_manager.dart';
|
||||
import 'widget/acg_source_manager.dart';
|
||||
|
||||
// 文字小说阅读 logic
|
||||
@@ -23,10 +21,7 @@ class TextNovelReadLogic extends GetxController {
|
||||
bool showMenu = true;
|
||||
bool isDark = true;
|
||||
bool isAscend = true; // 排序类型 true-正序 false-倒序
|
||||
bool playFinish = false; // 是否触底播放完成
|
||||
bool isSwitching = false; // 是否正在切换集,避免竞态
|
||||
int durationTime = 250;
|
||||
int progress = 0; // 0 ~ 100
|
||||
|
||||
final ScrollController scrollCtr = ScrollController();
|
||||
|
||||
@@ -37,7 +32,6 @@ class TextNovelReadLogic extends GetxController {
|
||||
super.onInit();
|
||||
mediaInfo = manager.mediaInfo;
|
||||
currentEpisode = manager.index;
|
||||
scrollCtr.addListener(_onScroll);
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -49,7 +43,6 @@ class TextNovelReadLogic extends GetxController {
|
||||
|
||||
@override
|
||||
void onClose() {
|
||||
scrollCtr.removeListener(_onScroll);
|
||||
scrollCtr.dispose();
|
||||
super.onClose();
|
||||
}
|
||||
@@ -68,9 +61,7 @@ class TextNovelReadLogic extends GetxController {
|
||||
|
||||
// true 下一集 / false 上一集
|
||||
void loadOtherEpisode(bool next, {bool showLoading = false}) async {
|
||||
isSwitching = true;
|
||||
final index = next ? currentEpisode + 1 : currentEpisode - 1;
|
||||
final pageNo = next ? index : currentEpisode + 1;
|
||||
if (index < 0) {
|
||||
showToast('这是第一${mediaInfo?.unit}了喔~');
|
||||
return;
|
||||
@@ -81,14 +72,6 @@ class TextNovelReadLogic extends GetxController {
|
||||
}
|
||||
final model = await manager.getComicsMediaContent(index: index);
|
||||
if (model == null) return;
|
||||
TrackVideoManager.novelEvent(
|
||||
next ? ReadBehaviorEnum.PAGE_NEXT : ReadBehaviorEnum.PAGE_PREV,
|
||||
model: manager.mediaInfo,
|
||||
readProgress: progress,
|
||||
pageNo: pageNo,
|
||||
chapterId: detailInfo?.id,
|
||||
chapterName: detailInfo?.name,
|
||||
);
|
||||
currentEpisode = index;
|
||||
_setData(model);
|
||||
update();
|
||||
@@ -138,19 +121,8 @@ class TextNovelReadLogic extends GetxController {
|
||||
void _setData(MediaContent? model) {
|
||||
if (model != null) {
|
||||
detailInfo = model;
|
||||
playFinish = false;
|
||||
progress = 0;
|
||||
manager.changeEpisodesIndex((model.episodeNumber ?? 1) - 1);
|
||||
update();
|
||||
// 小说展示
|
||||
TrackVideoManager.novelEvent(
|
||||
ReadBehaviorEnum.VIEW,
|
||||
model: manager.mediaInfo,
|
||||
readProgress: progress,
|
||||
pageNo: manager.index + 1,
|
||||
chapterId: model.id,
|
||||
chapterName: model.name,
|
||||
);
|
||||
} else {
|
||||
detailInfo = MediaContent();
|
||||
}
|
||||
@@ -160,26 +132,6 @@ class TextNovelReadLogic extends GetxController {
|
||||
void _toTop() {
|
||||
Future.delayed(const Duration(milliseconds: 100)).then((_) {
|
||||
scrollCtr.jumpTo(0);
|
||||
isSwitching = false;
|
||||
});
|
||||
}
|
||||
|
||||
void _onScroll() {
|
||||
if (!scrollCtr.hasClients) return;
|
||||
final position = scrollCtr.position;
|
||||
final max = position.maxScrollExtent;
|
||||
final current = position.pixels;
|
||||
progress = max > 0 ? ((current / max).clamp(0.0, 1.0) * 100).round() : 0;
|
||||
if (current >= max - 20 && !playFinish && !isSwitching) {
|
||||
playFinish = true;
|
||||
TrackVideoManager.novelEvent(
|
||||
ReadBehaviorEnum.COMPLETE,
|
||||
model: manager.mediaInfo,
|
||||
readProgress: progress,
|
||||
pageNo: manager.index + 1,
|
||||
chapterId: detailInfo?.id,
|
||||
chapterName: detailInfo?.name,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:analytics_sdk/enum/read_behavior_enum.dart';
|
||||
import 'package:audioplayers/audioplayers.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:get/get.dart';
|
||||
@@ -17,7 +16,6 @@ import '../../../alert/video/vip_acg_dialog.dart';
|
||||
import '../../../hj_model/acg/comic_chapters_model.dart';
|
||||
import '../../../hj_utils/api_service/acg_service.dart';
|
||||
import '../../../tools_base/global_store/store.dart';
|
||||
import '../../../track_event_manager/track_manager.dart';
|
||||
|
||||
/// 小说/漫画/有声资源管理器
|
||||
class ACGSourceManager extends ChangeNotifier {
|
||||
@@ -245,14 +243,6 @@ class AudioPlayerManager {
|
||||
|
||||
double playSpeed = 1;
|
||||
|
||||
ComicChapterInfo? _currentEpisode() {
|
||||
final manager = sourceManger;
|
||||
if (manager == null || manager.index < 0 || manager.index >= manager.allEpisodes.length) {
|
||||
return null;
|
||||
}
|
||||
return manager.allEpisodes[manager.index];
|
||||
}
|
||||
|
||||
void initPlayer() {
|
||||
if (_audioPlayer != null) return; // 防重入:已初始化则跳过,避免 5 个 stream 监听重复注册、旧 sub 泄漏
|
||||
_audioPlayer = AudioPlayer();
|
||||
@@ -290,15 +280,7 @@ class AudioPlayerManager {
|
||||
_audioCompleSub = _audioPlayer?.onPlayerComplete.listen((event) {
|
||||
if (playMod == AudioPlayMod.loopList && (value.isPlaying ?? false)) {
|
||||
audioValue.value = AudioPlayerValue.copyWith(value..isPlaying = false);
|
||||
TrackVideoManager.novelEvent(
|
||||
ReadBehaviorEnum.COMPLETE,
|
||||
model: sourceManger?.mediaInfo,
|
||||
readProgress: 100,
|
||||
pageNo: (sourceManger?.index ?? 0) + 1,
|
||||
chapterId: _currentEpisode()?.id,
|
||||
chapterName: _currentEpisode()?.name,
|
||||
);
|
||||
playNext(0);
|
||||
playNext();
|
||||
} else {
|
||||
audioValue.value = AudioPlayerValue.copyWith(value
|
||||
..isCompleted = true
|
||||
@@ -340,30 +322,12 @@ class AudioPlayerManager {
|
||||
..duration = null);
|
||||
showToast('音频加载失败');
|
||||
});
|
||||
if (sourceManger?.mediaInfo != null) {
|
||||
TrackVideoManager.novelEvent(
|
||||
ReadBehaviorEnum.VIEW,
|
||||
model: sourceManger?.mediaInfo,
|
||||
readProgress: 0,
|
||||
pageNo: (sourceManger?.index ?? 0) + 1,
|
||||
chapterId: _currentEpisode()?.id,
|
||||
chapterName: _currentEpisode()?.name,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// 上一集
|
||||
Future<void> playForward(double progress) async {
|
||||
Future<void> playForward() async {
|
||||
final epm = await sourceManger?.backToForward();
|
||||
if (epm != null) {
|
||||
TrackVideoManager.novelEvent(
|
||||
ReadBehaviorEnum.PAGE_PREV,
|
||||
model: sourceManger?.mediaInfo,
|
||||
readProgress: (progress * 100).round(),
|
||||
pageNo: (sourceManger?.index ?? 0) + 2,
|
||||
chapterId: epm.id,
|
||||
chapterName: epm.name,
|
||||
);
|
||||
play(epm.getRealAudioUrl);
|
||||
} else {
|
||||
pause();
|
||||
@@ -371,17 +335,9 @@ class AudioPlayerManager {
|
||||
}
|
||||
|
||||
/// 下一集
|
||||
Future<void> playNext(double progress) async {
|
||||
Future<void> playNext() async {
|
||||
final epm = await sourceManger?.jumpToNext();
|
||||
if (epm != null) {
|
||||
TrackVideoManager.novelEvent(
|
||||
ReadBehaviorEnum.PAGE_NEXT,
|
||||
model: sourceManger?.mediaInfo,
|
||||
readProgress: (progress * 100).round(),
|
||||
pageNo: sourceManger?.index ?? 0,
|
||||
chapterId: epm.id,
|
||||
chapterName: epm.name,
|
||||
);
|
||||
play(epm.getRealAudioUrl);
|
||||
} else {
|
||||
pause();
|
||||
|
||||
Reference in New Issue
Block a user