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

mod: 登录逻辑优化

Browse Source
This commit is contained in:
guozhigq
2023-08-31 22:41:19 +08:00
parent 01df8622e0
commit 9b1bb8c566
10 changed files with 71 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/common/widgets/network_img_layer.dart
View File

@ -70,9 +70,17 @@ class NetworkImgLayer extends StatelessWidget {
Widget placeholder(context) {
return Container(
color: Theme.of(context).colorScheme.onInverseSurface.withOpacity(0.4),
width: width ?? double.infinity,
height: height ?? double.infinity,
clipBehavior: Clip.hardEdge,
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.onInverseSurface.withOpacity(0.4),
borderRadius: BorderRadius.circular(type == 'avatar'
? 50
: type == 'emote'
? 0
: StyleString.imgRadius.x),
),
child: Center(
child: Image.asset(
type == 'avatar'

15
lib/pages/dynamics/view.dart
View File

@ -11,7 +11,6 @@ import 'package:pilipala/common/widgets/http_error.dart';
import 'package:pilipala/common/widgets/no_data.dart';
import 'package:pilipala/models/dynamics/result.dart';
import 'package:pilipala/pages/main/index.dart';
import 'package:pilipala/utils/event_bus.dart';
import 'package:pilipala/utils/feed_back.dart';
import 'package:pilipala/utils/storage.dart';
@ -32,7 +31,6 @@ class _DynamicsPageState extends State<DynamicsPage>
late Future _futureBuilderFuture;
late Future _futureBuilderFutureUp;
Box userInfoCache = GStrorage.userInfo;
EventBus eventBus = EventBus();
late ScrollController scrollController;
@override
@ -66,12 +64,13 @@ class _DynamicsPageState extends State<DynamicsPage>
},
);
eventBus.on(EventName.loginEvent, (args) {
_dynamicsController.userLogin.value = args['status'];
setState(() {
_futureBuilderFuture = _dynamicsController.queryFollowDynamic();
_futureBuilderFutureUp = _dynamicsController.queryFollowUp();
});
_dynamicsController.userLogin.listen((status) {
if (mounted) {
setState(() {
_futureBuilderFuture = _dynamicsController.queryFollowDynamic();
_futureBuilderFutureUp = _dynamicsController.queryFollowUp();
});
}
});
}

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

@ -48,9 +48,10 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
}
// 更新登录状态
void updateLoginStatus(val) {
userInfo = userInfoCache.get('userInfoCache');
void updateLoginStatus(val) async {
userInfo = await userInfoCache.get('userInfoCache');
userLogin.value = val ?? false;
if (val) return;
userFace.value = userInfo != null ? userInfo.face : '';
}
}

12
lib/pages/home/view.dart
View File

@ -134,11 +134,13 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
() => ctr!.userLogin.value
? Stack(
children: [
NetworkImgLayer(
type: 'avatar',
width: 34,
height: 34,
src: ctr!.userFace.value,
Obx(
() => NetworkImgLayer(
type: 'avatar',
width: 34,
height: 34,
src: ctr!.userFace.value,
),
),
Positioned.fill(
child: Material(

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

@ -35,6 +35,7 @@ class MediaController extends GetxController {
},
];
var userInfo;
int? mid;
@override
void onInit() {
@ -44,13 +45,13 @@ class MediaController extends GetxController {
}
Future<dynamic> queryFavFolder() async {
if (!userLogin.value || GStrorage.userInfo.get('userInfoCache') == null) {
if (!userLogin.value) {
return {'status': false, 'data': [], 'msg': '未登录'};
}
var res = await await UserHttp.userfavFolder(
pn: 1,
ps: 5,
mid: GStrorage.userInfo.get('userInfoCache').mid,
mid: mid ?? GStrorage.userInfo.get('userInfoCache').mid,
);
favFolderData.value = res['data'];
return res;

6
lib/pages/media/view.dart
View File

@ -3,7 +3,6 @@ import 'package:get/get.dart';
import 'package:pilipala/common/widgets/network_img_layer.dart';
import 'package:pilipala/models/user/fav_folder.dart';
import 'package:pilipala/pages/media/index.dart';
import 'package:pilipala/utils/event_bus.dart';
import 'package:pilipala/utils/utils.dart';
class MediaPage extends StatefulWidget {
@ -17,7 +16,6 @@ class _MediaPageState extends State<MediaPage>
with AutomaticKeepAliveClientMixin {
late MediaController mediaController;
late Future _futureBuilderFuture;
EventBus eventBus = EventBus();
@override
bool get wantKeepAlive => true;
@ -27,8 +25,8 @@ class _MediaPageState extends State<MediaPage>
super.initState();
mediaController = Get.put(MediaController());
_futureBuilderFuture = mediaController.queryFavFolder();
eventBus.on(EventName.loginEvent, (args) {
mediaController.userLogin.value = args['status'];
mediaController.userLogin.listen((status) {
setState(() {
_futureBuilderFuture = mediaController.queryFavFolder();
});

36
lib/pages/mine/view.dart
View File

@ -7,7 +7,6 @@ import 'package:pilipala/common/constants.dart';
import 'package:pilipala/common/widgets/network_img_layer.dart';
import 'package:pilipala/models/common/theme_type.dart';
import 'package:pilipala/models/user/info.dart';
import 'package:pilipala/utils/event_bus.dart';
import 'controller.dart';
class MinePage extends StatefulWidget {
@ -20,14 +19,13 @@ class MinePage extends StatefulWidget {
class _MinePageState extends State<MinePage> {
final MineController mineController = Get.put(MineController());
late Future _futureBuilderFuture;
EventBus eventBus = EventBus();
@override
void initState() {
super.initState();
_futureBuilderFuture = mineController.queryUserInfo();
eventBus.on(EventName.loginEvent, (args) {
mineController.userLogin.value = args['status'];
mineController.userLogin.listen((status) {
if (mounted) {
setState(() {
_futureBuilderFuture = mineController.queryUserInfo();
@ -214,36 +212,6 @@ class _MinePageState extends State<MinePage> {
);
},
),
// LayoutBuilder(
// builder: (context, BoxConstraints box) {
// return Container(
// width: box.maxWidth,
// height: 1,
// color: Theme.of(context).colorScheme.onInverseSurface,
// child: Stack(
// children: [
// Positioned(
// top: 0,
// left: 0,
// bottom: 0,
// child: Container(
// width: box.maxWidth *
// (_mineController
// .userInfo.value.levelInfo!.currentExp! /
// _mineController
// .userInfo.value.levelInfo!.nextExp!),
// height: 1,
// decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(4),
// color: Theme.of(context).colorScheme.primary,
// ),
// ),
// ),
// ],
// ),
// );
// },
// ),
],
const SizedBox(height: 30),
Padding(

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

@ -4,16 +4,13 @@ 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/pages/home/index.dart';
import 'package:pilipala/pages/mine/controller.dart';
import 'package:pilipala/utils/event_bus.dart';
import 'package:pilipala/utils/feed_back.dart';
import 'package:pilipala/utils/login.dart';
import 'package:pilipala/utils/storage.dart';
class SettingController extends GetxController {
Box userInfoCache = GStrorage.userInfo;
Box setting = GStrorage.setting;
// Box userInfoCache = GStrorage.userInfo;
Box localCache = GStrorage.localCache;
RxBool userLogin = false.obs;
@ -59,17 +56,7 @@ class SettingController extends GetxController {
localCache
.put(LocalCacheKey.accessKey, {'mid': -1, 'value': ''});
// 更改我的页面登录状态
await Get.find<MineController>().resetUserInfo();
// 更改主页登录状态
HomeController homeCtr = Get.find<HomeController>();
homeCtr.updateLoginStatus(false);
// 事件通知
EventBus eventBus = EventBus();
eventBus.emit(EventName.loginEvent, {'status': false});
await LoginUtils.refreshLoginStatus(false);
SmartDialog.dismiss().then((value) => Get.back());
},
child: const Text('确认'),

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

@ -8,8 +8,10 @@ import 'package:hive/hive.dart';
import 'package:pilipala/http/init.dart';
import 'package:pilipala/http/user.dart';
import 'package:pilipala/pages/home/index.dart';
import 'package:pilipala/pages/media/index.dart';
import 'package:pilipala/utils/cookie.dart';
import 'package:pilipala/utils/event_bus.dart';
import 'package:pilipala/utils/login.dart';
import 'package:pilipala/utils/storage.dart';
import 'package:webview_flutter/webview_flutter.dart';
@ -94,11 +96,12 @@ class WebviewController extends GetxController {
Box userInfoCache = GStrorage.userInfo;
await userInfoCache.put('userInfoCache', result['data']);
// 通知更新
eventBus.emit(EventName.loginEvent, {'status': true});
HomeController homeCtr = Get.find<HomeController>();
homeCtr.updateLoginStatus(true);
homeCtr.userFace.value = result['data'].face;
MediaController mediaCtr = Get.find<MediaController>();
mediaCtr.mid = result['data'].mid;
await LoginUtils.refreshLoginStatus(true);
} catch (err) {
SmartDialog.show(builder: (context) {
return AlertDialog(

30
lib/utils/login.dart Normal file
View File

@ -0,0 +1,30 @@
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.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';
class LoginUtils {
static Future refreshLoginStatus(bool status) async {
try {
// 更改我的页面登录状态
await Get.find<MineController>().resetUserInfo();
// 更改主页登录状态
HomeController homeCtr = Get.find<HomeController>();
homeCtr.updateLoginStatus(status);
MineController mineCtr = Get.find<MineController>();
mineCtr.userLogin.value = status;
DynamicsController dynamicsCtr = Get.find<DynamicsController>();
dynamicsCtr.userLogin.value = status;
MediaController mediaCtr = Get.find<MediaController>();
mediaCtr.userLogin.value = status;
} catch (err) {
SmartDialog.showToast('refreshLoginStatus error: ${err.toString()}');
}
}
}