Merge branch 'feature-minePage'

This commit is contained in:
guozhigq
2024-10-20 22:49:19 +08:00
19 changed files with 848 additions and 736 deletions

View File

@ -7,7 +7,7 @@ import 'package:hive/hive.dart';
import 'package:pilipala/models/common/dynamic_badge_mode.dart';
import 'package:pilipala/pages/dynamics/index.dart';
import 'package:pilipala/pages/home/index.dart';
import 'package:pilipala/pages/media/index.dart';
import 'package:pilipala/pages/mine/index.dart';
import 'package:pilipala/pages/rank/index.dart';
import 'package:pilipala/utils/event_bus.dart';
import 'package:pilipala/utils/feed_back.dart';
@ -27,7 +27,7 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
late HomeController _homeController;
RankController? _rankController;
late DynamicsController _dynamicController;
late MediaController _mediaController;
late MineController _mineController;
int? _lastSelectTime; //上次点击时间
Box setting = GStrorage.setting;
@ -93,24 +93,22 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
_dynamicController.flag = false;
}
if (currentPage is MediaPage) {
_mediaController.queryFavFolder();
if (currentPage is MinePage) {
_mineController.queryFavFolder();
_mineController.queryUserInfo();
}
}
void controllerInit() {
_homeController = Get.put(HomeController());
_dynamicController = Get.put(DynamicsController());
_mediaController = Get.put(MediaController());
_mineController = Get.put(MineController());
if (_mainController.pagesIds.contains(1)) {
_rankController = Get.put(RankController());
}
if (_mainController.pagesIds.contains(2)) {
_dynamicController = Get.put(DynamicsController());
}
if (_mainController.pagesIds.contains(3)) {
_mediaController = Get.put(MediaController());
}
}
@override
@ -207,20 +205,21 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
destinations: <Widget>[
..._mainController.navigationBars.map((e) {
return NavigationDestination(
icon: Badge(
label: _mainController
.dynamicBadgeType.value ==
DynamicBadgeMode.number
? Text(e['count'].toString())
: null,
padding:
const EdgeInsets.fromLTRB(6, 0, 6, 0),
isLabelVisible: _mainController
.dynamicBadgeType.value !=
DynamicBadgeMode.hidden &&
e['count'] > 0,
child: e['icon'],
),
icon: _mainController
.dynamicBadgeType.value ==
DynamicBadgeMode.number
? Badge(
label: Text(e['count'].toString()),
padding: const EdgeInsets.fromLTRB(
6, 0, 6, 0),
isLabelVisible: _mainController
.dynamicBadgeType
.value !=
DynamicBadgeMode.hidden &&
e['count'] > 0,
child: e['icon'],
)
: e['icon'],
selectedIcon: e['selectIcon'],
label: e['label'],
);