diff --git a/lib/controller/mine/teenager_mode_open_controller.dart b/lib/controller/mine/teenager_mode_open_controller.dart index 9edebbb..54868ba 100644 --- a/lib/controller/mine/teenager_mode_open_controller.dart +++ b/lib/controller/mine/teenager_mode_open_controller.dart @@ -1,4 +1,6 @@ import 'package:dating_touchme_app/controller/global.dart'; +import 'package:dating_touchme_app/pages/main/main_page.dart'; +import 'package:dating_touchme_app/pages/setting/teenager_mode_page.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; @@ -33,7 +35,7 @@ class TeenagerModeOpenController extends GetxController { GlobalData().teenagerMode = true; await storage.write('teenagerMode', true); await storage.write('teenagerPassword', confirmPassword.value); - Get.back(); + Get.offAll(() => TeenagerModePage()); } } @@ -49,7 +51,7 @@ class TeenagerModeOpenController extends GetxController { GlobalData().teenagerMode = false; await storage.write('teenagerMode', false); await storage.write('teenagerPassword', ""); - Get.back(); + Get.offAll(() => MainPage()); } } } \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 8cb1fb8..34777f3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -7,6 +7,7 @@ import 'package:dating_touchme_app/im/im_manager.dart'; import 'package:dating_touchme_app/network/network_service.dart'; import 'package:dating_touchme_app/pages/main/main_page.dart'; import 'package:dating_touchme_app/pages/mine/login_page.dart'; +import 'package:dating_touchme_app/pages/setting/teenager_mode_page.dart'; import 'package:dating_touchme_app/rtc/rtc_manager.dart'; import 'package:dating_touchme_app/widget/live/draggable_overlay_widget.dart'; import 'package:flutter/material.dart'; @@ -138,11 +139,12 @@ class _MyAppState extends State { final storage = GetStorage(); final userId = storage.read('userId'); final teenagerMode = storage.read('teenagerMode') ?? false; - - // 如果token不为空,显示主页;如果token为空,显示登录页面 - if (userId != null && userId.isNotEmpty) { + GlobalData().teenagerMode = teenagerMode; + if(teenagerMode){ + return TeenagerModePage(); + } else if (userId != null && userId.isNotEmpty) { + // 如果token不为空,显示主页;如果token为空,显示登录页面 GlobalData().userId = userId; - GlobalData().teenagerMode = teenagerMode; return MainPage(); } else { return LoginPage();