diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 48b02b0..5d844db 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } android { - namespace = "com.juxinghe.touchme.dating_touchme_app" + namespace = "com.juxinghe.touchme" compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion @@ -21,7 +21,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId = "com.juxinghe.touchme.dating_touchme_app" + applicationId = "com.juxinghe.touchme" // You can update the following values to match your application needs. // For more information, see: https://flutter.dev/to/review-gradle-config. minSdk = flutter.minSdkVersion diff --git a/android/app/src/main/kotlin/com/juxinghe/touchme/dating_touchme_app/MainActivity.kt b/android/app/src/main/kotlin/com/juxinghe/touchme/dating_touchme_app/MainActivity.kt deleted file mode 100644 index c7ae8ac..0000000 --- a/android/app/src/main/kotlin/com/juxinghe/touchme/dating_touchme_app/MainActivity.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.juxinghe.touchme.dating_touchme_app - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity : FlutterActivity() diff --git a/lib/model/mine/login_data.dart b/lib/model/mine/login_data.dart new file mode 100644 index 0000000..31a07cc --- /dev/null +++ b/lib/model/mine/login_data.dart @@ -0,0 +1,28 @@ +// 登录响应实体类 +class LoginData { + final String token; + final String userId; + + LoginData({required this.token, required this.userId}); + + // 从JSON映射创建实例 + factory LoginData.fromJson(Map json) { + return LoginData( + token: json['token'] ?? '', + userId: json['userId'] ?? '', + ); + } + + // 转换为JSON映射 + Map toJson() { + return { + 'token': token, + 'userId': userId, + }; + } + + @override + String toString() { + return 'LoginData(token: $token, userId: $userId)'; + } +} \ No newline at end of file diff --git a/lib/network/user_api.dart b/lib/network/user_api.dart index e028377..dd0af19 100644 --- a/lib/network/user_api.dart +++ b/lib/network/user_api.dart @@ -1,3 +1,4 @@ +import 'package:dating_touchme_app/model/mine/login_data.dart'; import 'package:dating_touchme_app/network/response_model.dart'; import 'package:dating_touchme_app/network/api_urls.dart'; import 'package:retrofit/retrofit.dart'; @@ -10,7 +11,7 @@ abstract class UserApi { factory UserApi(Dio dio) = _UserApi; @POST(ApiUrls.login) - Future>> login( + Future>> login( @Body() Map data, ); diff --git a/lib/network/user_api.g.dart b/lib/network/user_api.g.dart index 264f216..4b7c40f 100644 --- a/lib/network/user_api.g.dart +++ b/lib/network/user_api.g.dart @@ -20,7 +20,7 @@ class _UserApi implements UserApi { final ParseErrorLogger? errorLogger; @override - Future>> login( + Future>> login( Map data, ) async { final _extra = {}; @@ -28,7 +28,7 @@ class _UserApi implements UserApi { final _headers = {}; final _data = {}; _data.addAll(data); - final _options = _setStreamType>>( + final _options = _setStreamType>>( Options(method: 'POST', headers: _headers, extra: _extra) .compose( _dio.options, @@ -39,11 +39,11 @@ class _UserApi implements UserApi { .copyWith(baseUrl: _combineBaseUrls(_dio.options.baseUrl, baseUrl)), ); final _result = await _dio.fetch>(_options); - late BaseResponse _value; + late BaseResponse _value; try { - _value = BaseResponse.fromJson( + _value = BaseResponse.fromJson( _result.data!, - (json) => json as dynamic, + (json) => LoginData.fromJson(json as Map), ); } on Object catch (e, s) { errorLogger?.logError(e, s, _options); @@ -63,7 +63,7 @@ class _UserApi implements UserApi { Options(method: 'GET', headers: _headers, extra: _extra) .compose( _dio.options, - 'user/info', + 'dating-agency-uec/user/get/base-info', queryParameters: queryParameters, data: _data, ) diff --git a/lib/pages/mine/login_controller.dart b/lib/pages/mine/login_controller.dart index 6888878..641c0e5 100644 --- a/lib/pages/mine/login_controller.dart +++ b/lib/pages/mine/login_controller.dart @@ -51,7 +51,8 @@ class LoginController extends GetxController { // 处理响应 if (response.data.isSuccess) { - print('验证码发送成功'); + // 生产环境移除打印,可考虑使用正式的日志框架 + // print('验证码发送成功'); // 开始倒计时 startCountdown(); } else { @@ -109,16 +110,12 @@ class LoginController extends GetxController { if (response.data.isSuccess) { // 保存token和用户信息 if (response.data.data != null) { - final userData = response.data.data as Map; - if (userData.containsKey('token')) { - await storage.write('token', userData['token']); - } - // 保存用户信息 - await storage.write('userInfo', userData); + final loginData = response.data.data!; + // await storage.write('token', loginData.token); + // await storage.write('userId', loginData.userId); + // // 保存用户信息 + // await storage.write('userInfo', loginData.toJson()); } - - // 登录成功,跳转到首页 - Get.offAllNamed('/main'); } else { SmartDialog.showToast(response.data.message); }