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

mod: userInfo data type

Browse Source
This commit is contained in:
guozhigq
2024-11-17 22:18:53 +08:00
parent 570a073963
commit 1252b609a9
22 changed files with 60 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/http/init.dart
View File

@ -9,6 +9,7 @@ import 'package:dio/dio.dart';
import 'package:dio/io.dart';
import 'package:dio_cookie_manager/dio_cookie_manager.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/id_utils.dart';
import '../utils/storage.dart';
import '../utils/utils.dart';
@ -43,7 +44,7 @@ class Request {
dio.interceptors.add(cookieManager);
final List<Cookie> cookie = await cookieManager.cookieJar
.loadForRequest(Uri.parse(HttpString.baseUrl));
final userInfo = userInfoCache.get('userInfoCache');
final UserInfoData? userInfo = userInfoCache.get('userInfoCache');
if (userInfo != null && userInfo.mid != null) {
final List<Cookie> cookie2 = await cookieManager.cookieJar
.loadForRequest(Uri.parse(HttpString.tUrl));

5
lib/http/member.dart
View File

@ -4,6 +4,7 @@ import 'package:hive/hive.dart';
import 'package:html/parser.dart';
import 'package:pilipala/models/member/article.dart';
import 'package:pilipala/models/member/like.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/global_data_cache.dart';
import '../common/constants.dart';
import '../models/dynamics/result.dart';
@ -472,9 +473,9 @@ class MemberHttp {
String accessKey = res.data['data']['access_token'];
Box localCache = GStorage.localCache;
Box userInfoCache = GStorage.userInfo;
var userInfo = userInfoCache.get('userInfoCache');
final UserInfoData? userInfo = userInfoCache.get('userInfoCache');
localCache.put(
LocalCacheKey.accessKey, {'mid': userInfo.mid, 'value': accessKey});
LocalCacheKey.accessKey, {'mid': userInfo!.mid, 'value': accessKey});
return {'status': true, 'data': [], 'msg': '操作成功'};
} else {
return {

7
lib/pages/bangumi/controller.dart
View File

@ -3,6 +3,7 @@ import 'package:get/get.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/http/bangumi.dart';
import 'package:pilipala/models/bangumi/list.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/storage.dart';
class BangumiController extends GetxController {
@ -15,14 +16,14 @@ class BangumiController extends GetxController {
Box userInfoCache = GStorage.userInfo;
RxBool userLogin = false.obs;
late int mid;
var userInfo;
UserInfoData? userInfo;
@override
void onInit() {
super.onInit();
userInfo = userInfoCache.get('userInfoCache');
if (userInfo != null) {
mid = userInfo.mid;
mid = userInfo!.mid!;
}
userLogin.value = userInfo != null;
}
@ -55,7 +56,7 @@ class BangumiController extends GetxController {
if (userInfo == null) {
return;
}
var result = await BangumiHttp.getRecentBangumi(mid: userInfo.mid);
var result = await BangumiHttp.getRecentBangumi(mid: userInfo!.mid!);
if (result['status']) {
bangumiFollowList.value = result['data'].list;
total.value = result['data'].total;

5
lib/pages/bangumi/introduction/controller.dart
View File

@ -8,6 +8,7 @@ import 'package:pilipala/http/search.dart';
import 'package:pilipala/http/video.dart';
import 'package:pilipala/models/bangumi/info.dart';
import 'package:pilipala/models/user/fav_folder.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/pages/video/detail/index.dart';
import 'package:pilipala/pages/video/detail/reply/index.dart';
import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
@ -57,7 +58,7 @@ class BangumiIntroController extends GetxController {
RxBool isFollowed = false.obs;
RxInt followStatus = 1.obs;
int _tempThemeValue = -1;
var userInfo;
UserInfoData? userInfo;
PersistentBottomSheetController? bottomSheetController;
List<Map<String, dynamic>> followStatusList = [
{'title': '标记为 「想看」', 'status': 1},
@ -259,7 +260,7 @@ class BangumiIntroController extends GetxController {
Future queryVideoInFolder() async {
var result = await VideoHttp.videoInFolder(
mid: userInfo.mid, rid: IdUtils.bv2av(bvid));
mid: userInfo!.mid!, rid: IdUtils.bv2av(bvid));
if (result['status']) {
favFolderData.value = result['data'];
}

2
lib/pages/bangumi/introduction/view.dart
View File

@ -148,7 +148,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
// 收藏
showFavBottomSheet() async {
if (bangumiIntroController.userInfo.mid == null) {
if (bangumiIntroController.userInfo?.mid == null) {
SmartDialog.showToast('账号未登录');
return;
}

5
lib/pages/bangumi/widgets/bangumi_panel.dart
View File

@ -5,6 +5,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/models/bangumi/info.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/pages/video/detail/index.dart';
import 'package:pilipala/utils/storage.dart';
import '../../../common/pages_bottom_sheet.dart';
@ -37,7 +38,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
late RxInt currentIndex = (-1).obs;
final ScrollController listViewScrollCtr = ScrollController();
Box userInfoCache = GStorage.userInfo;
dynamic userInfo;
UserInfoData? userInfo;
// 默认未开通
int vipStatus = 0;
late int cid;
@ -63,7 +64,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
/// 获取大会员状态
userInfo = userInfoCache.get('userInfoCache');
if (userInfo != null) {
vipStatus = userInfo.vipStatus;
vipStatus = userInfo!.vipStatus!;
}
}

5
lib/pages/dynamics/controller.dart
View File

@ -10,6 +10,7 @@ import 'package:pilipala/models/common/dynamics_type.dart';
import 'package:pilipala/models/dynamics/result.dart';
import 'package:pilipala/models/dynamics/up.dart';
import 'package:pilipala/models/live/item.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/feed_back.dart';
import 'package:pilipala/utils/id_utils.dart';
import 'package:pilipala/utils/route_push.dart';
@ -52,7 +53,7 @@ class DynamicsController extends GetxController {
RxInt initialValue = 0.obs;
Box userInfoCache = GStorage.userInfo;
RxBool userLogin = false.obs;
var userInfo;
UserInfoData? userInfo;
RxBool isLoadingDynamic = false.obs;
Box setting = GStorage.setting;
@ -246,7 +247,7 @@ class DynamicsController extends GetxController {
}
upData.value.upList!.insertAll(0, [
UpItem(face: '', uname: '全部动态', mid: -1),
UpItem(face: userInfo.face, uname: '我', mid: userInfo.mid),
UpItem(face: userInfo!.face, uname: '我', mid: userInfo!.mid),
]);
}
return res;

2
lib/pages/dynamics/widgets/action_panel.dart
View File

@ -90,7 +90,7 @@ class _ActionPanelState extends State<ActionPanel>
SmartDialog.showToast('请先登录');
return;
}
int mid = userInfo.mid;
int mid = userInfo.mid!;
showModalBottomSheet(
context: context,
enableDrag: true,

9
lib/pages/fan/controller.dart
View File

@ -3,6 +3,7 @@ import 'package:get/get.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/http/fan.dart';
import 'package:pilipala/models/fans/result.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/storage.dart';
class FansController extends GetxController {
@ -13,7 +14,7 @@ class FansController extends GetxController {
RxList<FansItemModel> fansList = <FansItemModel>[].obs;
late int mid;
late String name;
var userInfo;
UserInfoData? userInfo;
RxString loadingText = '加载中...'.obs;
RxBool isOwner = false.obs;
@ -23,9 +24,9 @@ class FansController extends GetxController {
userInfo = userInfoCache.get('userInfoCache');
mid = Get.parameters['mid'] != null
? int.parse(Get.parameters['mid']!)
: userInfo.mid;
isOwner.value = mid == userInfo.mid;
name = Get.parameters['name'] ?? userInfo.uname;
: userInfo!.mid!;
isOwner.value = mid == userInfo?.mid;
name = Get.parameters['name'] ?? userInfo?.uname ?? '';
}
Future queryFans(type) async {

11
lib/pages/follow/controller.dart
View File

@ -6,6 +6,7 @@ import 'package:pilipala/http/follow.dart';
import 'package:pilipala/http/member.dart';
import 'package:pilipala/models/follow/result.dart';
import 'package:pilipala/models/member/tags.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/storage.dart';
/// 查看自己的关注时，可以查看分类
@ -18,7 +19,7 @@ class FollowController extends GetxController with GetTickerProviderStateMixin {
RxList<FollowItemModel> followList = <FollowItemModel>[].obs;
late int mid;
late String name;
var userInfo;
UserInfoData? userInfo;
RxString loadingText = '加载中...'.obs;
RxBool isOwner = false.obs;
late List<MemberTagItemModel> followTags;
@ -30,9 +31,9 @@ class FollowController extends GetxController with GetTickerProviderStateMixin {
userInfo = userInfoCache.get('userInfoCache');
mid = Get.parameters['mid'] != null
? int.parse(Get.parameters['mid']!)
: userInfo.mid;
isOwner.value = mid == userInfo.mid;
name = Get.parameters['name'] ?? userInfo.uname;
: userInfo!.mid!;
isOwner.value = mid == userInfo?.mid;
name = Get.parameters['name'] ?? userInfo?.uname ?? '';
}
Future queryFollowings(type) async {
@ -68,7 +69,7 @@ class FollowController extends GetxController with GetTickerProviderStateMixin {
// 当查看当前用户的关注时，请求关注分组
Future followUpTags() async {
if (userInfo != null && mid == userInfo.mid) {
if (userInfo != null && mid == userInfo!.mid) {
var res = await MemberHttp.followUpTags();
if (res['status']) {
followTags = res['data'];

7
lib/pages/home/controller.dart
View File

@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/models/common/tab_type.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/storage.dart';
import '../../http/index.dart';
@ -18,7 +19,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
Box settingStorage = GStorage.setting;
RxBool userLogin = false.obs;
RxString userFace = ''.obs;
var userInfo;
UserInfoData? userInfo;
Box setting = GStorage.setting;
late final StreamController<bool> searchBarStream =
StreamController<bool>.broadcast();
@ -33,7 +34,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
super.onInit();
userInfo = userInfoCache.get('userInfoCache');
userLogin.value = userInfo != null;
userFace.value = userInfo != null ? userInfo.face : '';
userFace.value = userInfo != null ? userInfo!.face! : '';
hideSearchBar =
setting.get(SettingBoxKey.hideSearchBar, defaultValue: false);
if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) {
@ -62,7 +63,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
userInfo = await userInfoCache.get('userInfoCache');
userLogin.value = val ?? false;
if (val) return;
userFace.value = userInfo != null ? userInfo.face : '';
userFace.value = userInfo != null ? userInfo!.face! : '';
}
void setTabConfig() async {

3
lib/pages/home/widgets/app_bar.dart
View File

@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/common/widgets/network_img_layer.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/storage.dart';
Box userInfoCache = GStorage.userInfo;
@ -12,7 +13,7 @@ class HomeAppBar extends StatelessWidget {
@override
Widget build(BuildContext context) {
var userInfo = userInfoCache.get('userInfoCache');
final UserInfoData? userInfo = userInfoCache.get('userInfoCache');
return SliverAppBar(
// forceElevated: true,
scrolledUnderElevation: 0,

5
lib/pages/main/controller.dart
View File

@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/common/widgets/network_img_layer.dart';
import 'package:pilipala/http/common.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/storage.dart';
import 'package:pilipala/utils/utils.dart';
import '../../models/common/dynamic_badge_mode.dart';
@ -26,7 +27,7 @@ class MainController extends GetxController {
late PageController pageController;
int selectedIndex = 0;
Box userInfoCache = GStorage.userInfo;
dynamic userInfo;
UserInfoData? userInfo;
RxBool userLogin = false.obs;
late Rx<DynamicBadgeMode> dynamicBadgeType = DynamicBadgeMode.number.obs;
late bool enableGradientBg;
@ -85,7 +86,7 @@ class MainController extends GetxController {
}
if (mineItemIndex != -1 && userInfo != null) {
Widget avatar = NetworkImgLayer(
width: 28, height: 28, src: userInfo.face, type: 'avatar');
width: 28, height: 28, src: userInfo!.face, type: 'avatar');
navigationBars[mineItemIndex]['icon'] = avatar;
navigationBars[mineItemIndex]['selectIcon'] = avatar;
}

5
lib/pages/member/controller.dart
View File

@ -9,6 +9,7 @@ import 'package:pilipala/models/member/archive.dart';
import 'package:pilipala/models/member/coin.dart';
import 'package:pilipala/models/member/info.dart';
import 'package:pilipala/models/member/like.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/storage.dart';
import 'package:share_plus/share_plus.dart';
@ -22,7 +23,7 @@ class MemberController extends GetxController {
late int ownerMid;
// 投稿列表
RxList<VListItemModel>? archiveList = <VListItemModel>[].obs;
dynamic userInfo;
UserInfoData? userInfo;
RxInt attribute = (-1).obs;
RxString attributeText = '关注'.obs;
RxList<MemberCoinsDataModel> recentCoinsList = <MemberCoinsDataModel>[].obs;
@ -34,7 +35,7 @@ class MemberController extends GetxController {
super.onInit();
mid = int.tryParse(Get.parameters['mid']!) ?? -2;
userInfo = userInfoCache.get('userInfoCache');
ownerMid = userInfo != null ? userInfo.mid : -1;
ownerMid = userInfo != null ? userInfo!.mid! : -1;
isOwner.value = mid == ownerMid;
face.value = Get.arguments['face'] ?? '';
heroTag = Get.arguments['heroTag'] ?? '';

3
lib/pages/mine_edit/controller.dart
View File

@ -3,6 +3,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/http/user.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/storage.dart';
class MineEditController extends GetxController {
@ -13,7 +14,7 @@ class MineEditController extends GetxController {
final TextEditingController signCtr = TextEditingController();
final TextEditingController birthdayCtr = TextEditingController();
String? sex;
dynamic userInfo;
UserInfoData? userInfo;
@override
void onInit() {

4
lib/pages/setting/controller.dart
View File

@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/http/init.dart';
import 'package:pilipala/models/common/theme_type.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/feed_back.dart';
import 'package:pilipala/utils/login.dart';
import 'package:pilipala/utils/storage.dart';
@ -22,7 +22,7 @@ class SettingController extends GetxController {
RxDouble toastOpacity = (1.0).obs;
RxInt picQuality = 10.obs;
Rx<ThemeType> themeType = ThemeType.system.obs;
var userInfo;
UserInfoData? userInfo;
Rx<DynamicBadgeMode> dynamicBadgeType = DynamicBadgeMode.number.obs;
RxInt defaultHomePage = 0.obs;

3
lib/pages/setting/privacy_setting.dart
View File

@ -3,6 +3,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/http/member.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/storage.dart';
class PrivacySetting extends StatefulWidget {
@ -15,7 +16,7 @@ class PrivacySetting extends StatefulWidget {
class _PrivacySettingState extends State<PrivacySetting> {
bool userLogin = false;
Box userInfoCache = GStorage.userInfo;
var userInfo;
UserInfoData? userInfo;
@override
void initState() {

3
lib/pages/setting/recommend_setting.dart
View File

@ -3,6 +3,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/http/member.dart';
import 'package:pilipala/models/common/rcmd_type.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
import 'package:pilipala/utils/recommend_filter.dart';
import 'package:pilipala/utils/storage.dart';
@ -21,7 +22,7 @@ class _RecommendSettingState extends State<RecommendSetting> {
static Box localCache = GStorage.localCache;
late dynamic defaultRcmdType;
Box userInfoCache = GStorage.userInfo;
late dynamic userInfo;
UserInfoData? userInfo;
bool userLogin = false;
late dynamic accessKeyInfo;
// late int filterUnfollowedRatio;

5
lib/pages/video/detail/controller.dart
View File

@ -14,6 +14,7 @@ import 'package:pilipala/models/common/reply_type.dart';
import 'package:pilipala/models/common/search_type.dart';
import 'package:pilipala/models/sponsor_block/segment.dart';
import 'package:pilipala/models/sponsor_block/segment_type.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/models/video/later.dart';
import 'package:pilipala/models/video/play/quality.dart';
import 'package:pilipala/models/video/play/url.dart';
@ -94,7 +95,7 @@ class VideoDetailController extends GetxController
double? brightness;
// 默认记录历史记录
bool enableHeart = true;
var userInfo;
UserInfoData? userInfo;
late bool isFirstTime = true;
Floating? floating;
late PreferredSizeWidget headerControl;
@ -617,7 +618,7 @@ class VideoDetailController extends GetxController
var count = argMap['count'];
var res = await UserHttp.getMediaList(
type: 2,
bizId: userInfo.mid,
bizId: userInfo!.mid!,
ps: count,
);
if (res['status']) {

7
lib/pages/video/detail/introduction/controller.dart
View File

@ -9,6 +9,7 @@ import 'package:pilipala/http/constants.dart';
import 'package:pilipala/http/user.dart';
import 'package:pilipala/http/video.dart';
import 'package:pilipala/models/user/fav_folder.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/models/video/ai.dart';
import 'package:pilipala/models/video/tags.dart';
import 'package:pilipala/models/video_detail_res.dart';
@ -49,10 +50,8 @@ class VideoIntroController extends GetxController {
List delMediaIdsNew = [];
// 关注状态 默认未关注
RxMap followStatus = {}.obs;
int _tempThemeValue = -1;
RxInt lastPlayCid = 0.obs;
var userInfo;
UserInfoData? userInfo;
RxList<VideoTagItem> videoTags = <VideoTagItem>[].obs;
// 同时观看
@ -301,7 +300,7 @@ class VideoIntroController extends GetxController {
Future queryVideoInFolder() async {
var result = await VideoHttp.videoInFolder(
mid: userInfo.mid, rid: IdUtils.bv2av(bvid));
mid: userInfo!.mid!, rid: IdUtils.bv2av(bvid));
if (result['status']) {
favFolderData.value = result['data'];
}

5
lib/pages/whisper_detail/controller.dart
View File

@ -6,6 +6,7 @@ import 'package:get/get.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/http/msg.dart';
import 'package:pilipala/models/msg/session.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/pages/whisper/index.dart';
import '../../utils/feed_back.dart';
import '../../utils/storage.dart';
@ -80,7 +81,7 @@ class WhisperDetailController extends GetxController {
Future sendMsg() async {
feedBack();
String message = replyContentController.text;
final userInfo = userInfoCache.get('userInfoCache');
final UserInfoData? userInfo = userInfoCache.get('userInfoCache');
if (userInfo == null) {
SmartDialog.showToast('请先登录');
return;
@ -90,7 +91,7 @@ class WhisperDetailController extends GetxController {
return;
}
var result = await MsgHttp.sendMsg(
senderUid: userInfo.mid,
senderUid: userInfo.mid!,
receiverId: int.parse(mid),
content: {'content': message},
msgType: 1,

3
lib/pages/whisper_detail/view.dart
View File

@ -2,14 +2,12 @@ import 'dart:async';
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/common/widgets/network_img_layer.dart';
import 'package:pilipala/models/video/reply/emote.dart';
import 'package:pilipala/pages/emote/index.dart';
import 'package:pilipala/pages/video/detail/reply_new/toolbar_icon_button.dart';
import 'package:pilipala/pages/whisper_detail/controller.dart';
import 'package:pilipala/utils/feed_back.dart';
import '../../utils/storage.dart';
import 'widget/chat_item.dart';
class WhisperDetailPage extends StatefulWidget {
@ -30,7 +28,6 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
late double emoteHeight = 230.0;
double keyboardHeight = 0.0; // 键盘高度
RxString toolbarType = ''.obs;
Box userInfoCache = GStorage.userInfo;
@override
void initState() {