mirrors/pilipala
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增模拟未登录推荐，独立推荐设置，新增accesskey风控警告，统一推荐逻辑

Browse Source
This commit is contained in:
orz12
2024-01-20 15:14:52 +08:00
parent 4673f6dc5b
commit 41ddeab41a
9 changed files with 210 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
lib/pages/rcmd/controller.dart
View File

@ -9,8 +9,8 @@ import 'package:pilipala/utils/storage.dart';
class RcmdController extends GetxController {
final ScrollController scrollController = ScrollController();
int _currentPage = 0;
RxList<RecVideoItemAppModel> appVideoList = <RecVideoItemAppModel>[].obs;
RxList<RecVideoItemModel> webVideoList = <RecVideoItemModel>[].obs;
// RxList<RecVideoItemAppModel> appVideoList = <RecVideoItemAppModel>[].obs;
// RxList<RecVideoItemModel> webVideoList = <RecVideoItemModel>[].obs;
bool isLoadingMore = true;
OverlayEntry? popupDialog;
Box recVideo = GStrorage.recVideo;
@ -18,6 +18,7 @@ class RcmdController extends GetxController {
RxInt crossAxisCount = 2.obs;
late bool enableSaveLastData;
late String defaultRcmdType = 'web';
late RxList<dynamic> videoList;
@override
void onInit() {
@ -37,85 +38,59 @@ class RcmdController extends GetxController {
setting.get(SettingBoxKey.enableSaveLastData, defaultValue: false);
defaultRcmdType =
setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web');
if (defaultRcmdType == 'web'){
videoList = <RecVideoItemModel>[].obs;
} else {
videoList = <RecVideoItemAppModel>[].obs;
}
}
// 获取推荐
Future queryRcmdFeed(type) async {
print(defaultRcmdType);
if (defaultRcmdType == 'app') {
return await queryRcmdFeedApp(type);
}
if (defaultRcmdType == 'web') {
return await queryRcmdFeedWeb(type);
}
}
// 获取app端推荐
Future queryRcmdFeedApp(type) async {
if (isLoadingMore == false) {
return;
}
if (type == 'onRefresh') {
_currentPage = 0;
}
var res = await VideoHttp.rcmdVideoListApp(
freshIdx: _currentPage,
);
late final Map<String,dynamic> res;
switch (defaultRcmdType) {
case 'app': case 'notLogin':
res = await VideoHttp.rcmdVideoListApp(
loginStatus: defaultRcmdType != 'notLogin',
freshIdx: _currentPage,
);
break;
default: //'web'
res = await VideoHttp.rcmdVideoList(
freshIdx: _currentPage,
ps: 20,
);
}
if (res['status']) {
if (type == 'init') {
if (appVideoList.isNotEmpty) {
appVideoList.addAll(res['data']);
if (videoList.isNotEmpty) {
videoList.addAll(res['data']);
} else {
appVideoList.value = res['data'];
videoList.value = res['data'];
}
} else if (type == 'onRefresh') {
if (enableSaveLastData) {
appVideoList.insertAll(0, res['data']);
videoList.insertAll(0, res['data']);
} else {
appVideoList.value = res['data'];
videoList.value = res['data'];
}
} else if (type == 'onLoad') {
appVideoList.addAll(res['data']);
videoList.addAll(res['data']);
}
recVideo.put('cacheList', res['data']);
_currentPage += 1;
}
isLoadingMore = false;
return res;
}
// 获取web端推荐
Future queryRcmdFeedWeb(type) async {
if (isLoadingMore == false) {
return;
}
if (type == 'onRefresh') {
_currentPage = 0;
}
var res = await VideoHttp.rcmdVideoList(
ps: 20,
freshIdx: _currentPage,
);
if (res['status']) {
if (type == 'init') {
if (webVideoList.isNotEmpty) {
webVideoList.addAll(res['data']);
} else {
webVideoList.value = res['data'];
}
} else if (type == 'onRefresh') {
if (enableSaveLastData) {
webVideoList.insertAll(0, res['data']);
} else {
webVideoList.value = res['data'];
}
} else if (type == 'onLoad') {
webVideoList.addAll(res['data']);
if (defaultRcmdType != 'web') {
recVideo.put('cacheList', res['data']);
}
_currentPage += 1;
} else {
Get.snackbar('提示', res['msg']);
}
isLoadingMore = false;
return res;
}
// 下拉刷新
@ -129,7 +104,7 @@ class RcmdController extends GetxController {
queryRcmdFeed('onLoad');
}
// 返回顶部并刷新
// 返回顶部
void animateToTop() async {
if (scrollController.offset >=
MediaQuery.of(Get.context!).size.height * 5) {

60
lib/pages/rcmd/view.dart
View File

@ -91,54 +91,18 @@ class _RcmdPageState extends State<RcmdPage>
SliverPadding(
padding:
const EdgeInsets.fromLTRB(0, StyleString.safeSpace, 0, 0),
sliver: FutureBuilder(
future: _futureBuilderFuture,
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.done) {
Map data = snapshot.data as Map;
if (data['status']) {
return Platform.isAndroid || Platform.isIOS
? Obx(
() => contentGrid(
_rcmdController,
_rcmdController.defaultRcmdType == 'web'
? _rcmdController.webVideoList
: _rcmdController.appVideoList),
)
: SliverLayoutBuilder(
builder: (context, boxConstraints) {
return Obx(
() => contentGrid(
_rcmdController,
_rcmdController.defaultRcmdType == 'web'
? _rcmdController.webVideoList
: _rcmdController.appVideoList),
);
});
} else {
return HttpError(
errMsg: data['msg'],
fn: () {
setState(() {
_futureBuilderFuture =
_rcmdController.queryRcmdFeed('init');
});
},
);
}
} else {
// 缓存数据
// if (_rcmdController.videoList.isNotEmpty) {
// return contentGrid(
// _rcmdController, _rcmdController.videoList);
// }
// // 骨架屏
// else {
return contentGrid(_rcmdController, []);
// }
}
},
),
sliver: Obx(() {
// 使用Obx来监听数据的变化
if (_rcmdController.isLoadingMore) {
// 如果正在加载，则显示骨架屏
return contentGrid(_rcmdController, []);
} else {
// 显示视频列表
return contentGrid(
_rcmdController,
_rcmdController.videoList);
}
}),
),
LoadingMore(ctr: _rcmdController)
],