王子贤 4 months ago
parent
commit
eb7e7f3a9d
7 changed files with 33 additions and 16 deletions
  1. 2
      lib/controller/mine/edit_info_controller.dart
  2. 3
      lib/controller/mine/mine_controller.dart
  3. 4
      lib/main.dart
  4. 19
      lib/pages/home/user_information_page.dart
  5. 9
      lib/pages/mine/edit_info_page.dart
  6. 11
      lib/pages/mine/mine_page.dart
  7. 1
      lib/pages/setting/setting_page.dart

2
lib/controller/mine/edit_info_controller.dart

@ -95,7 +95,7 @@ class EditInfoController extends GetxController {
@override @override
void onInit() { void onInit() {
super.onInit(); super.onInit();
userData.value = GlobalData().userData;
final ImagePickerPlatform imagePickerImplementation = final ImagePickerPlatform imagePickerImplementation =
ImagePickerPlatform.instance; ImagePickerPlatform.instance;
if (imagePickerImplementation is ImagePickerAndroid) { if (imagePickerImplementation is ImagePickerAndroid) {

3
lib/controller/mine/mine_controller.dart

@ -32,10 +32,13 @@ class MineController extends GetxController {
].obs; ].obs;
final userData = GlobalData().userData.obs; final userData = GlobalData().userData.obs;
final userId = GlobalData().userId.obs;
@override @override
void onInit() { void onInit() {
super.onInit(); super.onInit();
userData.value = GlobalData().userData;
userId.value = GlobalData().userId;
} }

4
lib/main.dart

@ -1,6 +1,7 @@
import 'dart:io'; import 'dart:io';
import 'package:dating_touchme_app/config/env_config.dart'; import 'package:dating_touchme_app/config/env_config.dart';
import 'package:dating_touchme_app/controller/global.dart';
import 'package:dating_touchme_app/im/im_manager.dart'; import 'package:dating_touchme_app/im/im_manager.dart';
import 'package:dating_touchme_app/network/network_service.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/main/main_page.dart';
@ -85,9 +86,10 @@ class MyApp extends StatelessWidget {
// token是否为空 // token是否为空
final storage = GetStorage(); final storage = GetStorage();
final token = storage.read<String>('token'); final token = storage.read<String>('token');
// token不为空token为空 // token不为空token为空
if (token != null && token.isNotEmpty) { if (token != null && token.isNotEmpty) {
GlobalData().userId = storage.read<String>('userId');
return MainPage(); return MainPage();
} else { } else {
return LoginPage(); return LoginPage();

19
lib/pages/home/user_information_page.dart

@ -1,3 +1,4 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:dating_touchme_app/controller/global.dart'; import 'package:dating_touchme_app/controller/global.dart';
import 'package:dating_touchme_app/generated/assets.dart'; import 'package:dating_touchme_app/generated/assets.dart';
import 'package:dating_touchme_app/model/home/marriage_data.dart'; import 'package:dating_touchme_app/model/home/marriage_data.dart';
@ -51,18 +52,24 @@ class _UserInformationPageState extends State<UserInformationPage> {
final userData = GlobalData().userData.obs; final userData = GlobalData().userData.obs;
@override
void initState() {
super.initState();
userData.value = GlobalData().userData;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
body: Stack( body: Stack(
children: [ children: [
widget.userData.photoList.isNotEmpty ? Image.network(
widget.userData.photoList[nowSelect].photoUrl,
widget.userData.photoList.isNotEmpty ? CachedNetworkImage(
imageUrl: "${widget.userData.photoList[nowSelect].photoUrl}?x-oss-process=image/format,webp",
width: 375.w, width: 375.w,
height: 384.w, height: 384.w,
fit: BoxFit.cover, fit: BoxFit.cover,
) : Image.network(
widget.userData.avatar,
) : CachedNetworkImage(
imageUrl: "${widget.userData.avatar}?x-oss-process=image/format,webp",
width: 375.w, width: 375.w,
height: 384.w, height: 384.w,
fit: BoxFit.cover, fit: BoxFit.cover,
@ -431,8 +438,8 @@ class _UserInformationPageState extends State<UserInformationPage> {
border: nowSelect == entry.key ? Border.all(width: 2.w, color: Colors.white) : null border: nowSelect == entry.key ? Border.all(width: 2.w, color: Colors.white) : null
), ),
child: Center( child: Center(
child: Image.network(
entry.value.photoUrl,
child: CachedNetworkImage(
imageUrl: "${entry.value.photoUrl}?x-oss-process=image/format,webp/resize,w_76",
width: 38.w, width: 38.w,
height: 38.w, height: 38.w,
fit: BoxFit.cover, fit: BoxFit.cover,

9
lib/pages/mine/edit_info_page.dart

@ -1,5 +1,6 @@
import 'dart:io'; import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:dating_touchme_app/components/page_appbar.dart'; import 'package:dating_touchme_app/components/page_appbar.dart';
import 'package:dating_touchme_app/controller/mine/edit_info_controller.dart'; import 'package:dating_touchme_app/controller/mine/edit_info_controller.dart';
import 'package:dating_touchme_app/extension/ex_widget.dart'; import 'package:dating_touchme_app/extension/ex_widget.dart';
@ -180,8 +181,8 @@ class _EditInfoPageState extends State<EditInfoPage> {
File(controller.avatarLocalPath.value), File(controller.avatarLocalPath.value),
width: 85.w, width: 85.w,
height: 85.w, height: 85.w,
) : (controller.userData.value?.profilePhoto?.isNotEmpty ?? false) ? Image.network(
"${controller.userData.value?.profilePhoto ?? ""}",
) : (controller.userData.value?.profilePhoto?.isNotEmpty ?? false) ? CachedNetworkImage(
imageUrl: "${controller.userData.value?.profilePhoto ?? ""}?x-oss-process=image/format,webp/resize,w_170",
width: 85.w, width: 85.w,
height: 85.w, height: 85.w,
fit: BoxFit.cover, fit: BoxFit.cover,
@ -238,8 +239,8 @@ class _EditInfoPageState extends State<EditInfoPage> {
children: [ children: [
ClipRRect( ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(9.w)), borderRadius: BorderRadius.all(Radius.circular(9.w)),
child: Image.network(
entry.value,
child: CachedNetworkImage(
imageUrl: "${entry.value}?x-oss-process=image/format,webp/resize,w_140",
width: 70.w, width: 70.w,
height: 70.w, height: 70.w,
fit: BoxFit.cover, fit: BoxFit.cover,

11
lib/pages/mine/mine_page.dart

@ -1,4 +1,5 @@
import 'package:cached_network_image/cached_network_image.dart'; import 'package:cached_network_image/cached_network_image.dart';
import 'package:dating_touchme_app/controller/global.dart';
import 'package:dating_touchme_app/controller/mine/mine_controller.dart'; import 'package:dating_touchme_app/controller/mine/mine_controller.dart';
import 'package:dating_touchme_app/extension/ex_widget.dart'; import 'package:dating_touchme_app/extension/ex_widget.dart';
import 'package:dating_touchme_app/pages/mine/edit_info_page.dart'; import 'package:dating_touchme_app/pages/mine/edit_info_page.dart';
@ -30,6 +31,7 @@ class _MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin{
Get.put(MineController()); Get.put(MineController());
} }
} }
@ -37,7 +39,10 @@ class _MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin{
Widget build(BuildContext context) { Widget build(BuildContext context) {
super.build(context); super.build(context);
return GetBuilder<MineController>( return GetBuilder<MineController>(
init: MineController(),
builder: (controller) { builder: (controller) {
controller.userData.value = GlobalData().userData;
controller.userId.value = GlobalData().userId;
return Container( return Container(
padding: EdgeInsets.symmetric(horizontal: 9.w), padding: EdgeInsets.symmetric(horizontal: 9.w),
constraints: BoxConstraints(minHeight: ScreenUtil().setHeight(800)), constraints: BoxConstraints(minHeight: ScreenUtil().setHeight(800)),
@ -70,8 +75,8 @@ class _MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin{
children: [ children: [
ClipRRect( ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(60.w)), borderRadius: BorderRadius.all(Radius.circular(60.w)),
child: (controller.userData.value?.profilePhoto?.isNotEmpty ?? false) ? Image.network(
"${controller.userData.value?.profilePhoto ?? ""}",
child: (controller.userData.value?.profilePhoto?.isNotEmpty ?? false) ? CachedNetworkImage(
imageUrl: "${controller.userData.value?.profilePhoto ?? ""}?x-oss-process=image/format,webp/resize,w_120",
width: 60.w, width: 60.w,
height: 60.w, height: 60.w,
fit: BoxFit.cover, fit: BoxFit.cover,
@ -105,7 +110,7 @@ class _MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin{
), ),
SizedBox(height: 11.w,), SizedBox(height: 11.w,),
Text( Text(
"ID:${controller.userData.value?.id ?? ""}",
"ID:${controller.userId.value ?? ""}",
style: TextStyle( style: TextStyle(
fontSize: 12.w, fontSize: 12.w,
color: const Color.fromRGBO(51, 51, 51, 1), color: const Color.fromRGBO(51, 51, 51, 1),

1
lib/pages/setting/setting_page.dart

@ -131,7 +131,6 @@ class SettingPage extends StatelessWidget {
theme: TDButtonTheme.danger, theme: TDButtonTheme.danger,
onTap: () { onTap: () {
controller.logout(); controller.logout();
Navigator.of(context).pop();
Get.offAll(() => LoginPage()); Get.offAll(() => LoginPage());
}, },
), ),

Loading…
Cancel
Save