Browse Source

refactor: 替换print为Logger并清理注释代码

- 将调试用的print语句替换为Logger记录
- 移除settings_controller中已注释的代码
- 调整profile_view中头像背景色的位置
newdev_shunjiawei
lxm 1 year ago
parent
commit
9782873095
  1. 50
      lib/modules/login/controllers/login_controller.dart
  2. 4
      lib/modules/profile/views/profile_view.dart
  3. 2
      lib/modules/settings/controllers/settings_controller.dart

50
lib/modules/login/controllers/login_controller.dart

@ -603,13 +603,13 @@ class LoginController extends GetxController {
// 为了演示,我们只是模拟发送 // 为了演示,我们只是模拟发送
if (isEmialContactController() || isPhoneContactController()) { if (isEmialContactController() || isPhoneContactController()) {
_startCountdown(); _startCountdown();
print(contactController.text); Logger().d(contactController.text);
var response = await Api.getCode({ var response = await Api.getCode({
"addr": selectedCountryCode + contactController.text, "addr": selectedCountryCode + contactController.text,
"vtype": loginType, "vtype": loginType,
}); });
if (response != null) { if (response != null) {
print("请求后台数据验证码params=${response}"); Logger().d("请求后台数据验证码params=$response");
//短信已发送 //短信已发送
//EasyLoading.showInfo('codeSend'.tr); //EasyLoading.showInfo('codeSend'.tr);
} }
@ -634,7 +634,7 @@ class LoginController extends GetxController {
// 更新验证码输入 // 更新验证码输入
void updateVerificationCode(int index, String value) { void updateVerificationCode(int index, String value) {
print("updateVerificationCode=${index}${value}"); Logger().d("updateVerificationCode=$index$value");
if (index >= 0 && index < 4) { if (index >= 0 && index < 4) {
var newList = [..._verificationCode]; var newList = [..._verificationCode];
newList[index] = value; newList[index] = value;
@ -667,7 +667,7 @@ class LoginController extends GetxController {
bool isVerificationCodeComplete() { bool isVerificationCodeComplete() {
// 检查每个元素是否为单个字母或数字字符 // 检查每个元素是否为单个字母或数字字符
final text = verificationCodeController.text; final text = verificationCodeController.text;
print("数据获取Facebook${text.length}"); Logger().d("数据获取Facebook${text.length}");
return text.length == 4 && RegExp(r'^[0-9]+$').hasMatch(text); return text.length == 4 && RegExp(r'^[0-9]+$').hasMatch(text);
} }
@ -778,14 +778,14 @@ class LoginController extends GetxController {
} }
case 4: //Facebook登录 case 4: //Facebook登录
{ {
print("数据获取Facebook"); Logger().d("数据获取Facebook");
final facebook = Facebook(); final facebook = Facebook();
bool authResult = await facebook.signInWithFacebook(); bool authResult = await facebook.signInWithFacebook();
if (authResult) { if (authResult) {
print("数据获取_Facebook.token${facebook.token}"); Logger().d("数据获取_Facebook.token${facebook.token}");
print("数据获取_Facebook.pictureurl${facebook.pictureurl}"); Logger().d("数据获取_Facebook.pictureurl${facebook.pictureurl}");
print("数据获取_Facebook.pictureurl${facebook.email}"); Logger().d("数据获取_Facebook.pictureurl${facebook.email}");
// SettingsController().userName = Facebook().name; // SettingsController().userName = Facebook().name;
// SettingsController().avatar = Facebook().pictureurl; // SettingsController().avatar = Facebook().pictureurl;
// SettingsController().userId = Facebook().id; // SettingsController().userId = Facebook().id;
@ -808,15 +808,15 @@ class LoginController extends GetxController {
} }
case 3: //Google登录 case 3: //Google登录
{ {
print("数据获取_Google()"); Logger().d("数据获取_Google()");
final google = Google(); final google = Google();
bool authResult = await google.signInWithGoogle(); bool authResult = await google.signInWithGoogle();
print("数据获取_Google().token${authResult}"); Logger().d("数据获取_Google().token${authResult}");
if (authResult) { if (authResult) {
print("数据获取_Google.token${google.token}"); Logger().d("数据获取_Google.token${google.token}");
print("数据获取_Google.pictureurl${google.pictureurl}"); Logger().d("数据获取_Google.pictureurl${google.pictureurl}");
print("数据获取_Google.email${google.email}"); Logger().d("数据获取_Google.email${google.email}");
print("数据获取_Google.email${google.displayName}"); Logger().d("数据获取_Google.email${google.displayName}");
// 验证成功,跳转到配对页面 // 验证成功,跳转到配对页面
// SettingsController().userName = Google().displayName!; // SettingsController().userName = Google().displayName!;
// //SettingsController().avatar = Google().email; // //SettingsController().avatar = Google().email;
@ -838,7 +838,7 @@ class LoginController extends GetxController {
} }
case 2: //微信登录 case 2: //微信登录
{ {
print("数据获取_FlWX()"); Logger().d("数据获取_FlWX()");
bool authResult = await FlWX().authBy( bool authResult = await FlWX().authBy(
NormalAuth( NormalAuth(
@ -851,7 +851,7 @@ class LoginController extends GetxController {
if (authResult) { if (authResult) {
// 确保 FlWX() 返回的是同一个实例,并且 token 已经被设置 // 确保 FlWX() 返回的是同一个实例,并且 token 已经被设置
// 这里假设 FlWX().token 在 authBy 成功后被设置 // 这里假设 FlWX().token 在 authBy 成功后被设置
print("数据获取_FlWX().token${FlWX().token}"); Logger().d("数据获取_FlWX().token${FlWX().token}");
// SettingsController().userName = FlWX().nickname; // SettingsController().userName = FlWX().nickname;
// SettingsController().avatar = FlWX().headimgurl; // SettingsController().avatar = FlWX().headimgurl;
// SettingsController().userId = FlWX().openid; // SettingsController().userId = FlWX().openid;
@ -924,19 +924,19 @@ class LoginController extends GetxController {
"avatar": params["avatar"], "avatar": params["avatar"],
}); });
if (response != null) { if (response != null) {
print("请求后台数据login回复数据=${response}"); Logger().d("请求后台数据login回复数据=$response");
// final instance = await GetStorage(); // final instance = await GetStorage();
await _storage.write('loginInfo', jsonEncode(response)); await _storage.write('loginInfo', jsonEncode(response));
// 2. 将响应数据转换为User对象 // 2. 将响应数据转换为User对象
try { try {
print('响应数据: ${response.toString()}'); // 调试输出原始数据 Logger().d('响应数据: ${response.toString()}'); // 调试输出原始数据
if (response['token'].toString() != '') { if (response['token'].toString() != '') {
// 新增:检查 user 字段是否存在且类型正确 // 新增:检查 user 字段是否存在且类型正确
// if (response.containsKey('data') && response['data'] is Map) { // if (response.containsKey('data') && response['data'] is Map) {
final user = User.fromJson(response); final user = User.fromJson(response);
print('用户初始化成功: ${response['token'].toString()}'); Logger().d('用户初始化成功: ${response['token'].toString()}');
await _storage.write("logintoken", response['token'].toString()); await _storage.write("logintoken", response['token'].toString());
// 存储到 SharedPreferences (仅存储用户数据) // 存储到 SharedPreferences (仅存储用户数据)
//final prefs = await GetStorage(); //final prefs = await GetStorage();
@ -953,8 +953,8 @@ class LoginController extends GetxController {
} }
} catch (e, stack) { } catch (e, stack) {
// 新增:打印堆栈跟踪 // 新增:打印堆栈跟踪
print('用户数据处理失败: $e'); Logger().d('用户数据处理失败: $e');
print('堆栈跟踪: $stack'); Logger().d('堆栈跟踪: $stack');
Get.snackbar('错误', '用户数据解析失败,请检查网络'); Get.snackbar('错误', '用户数据解析失败,请检查网络');
} }
@ -976,18 +976,18 @@ class LoginController extends GetxController {
Future<bool> getAppConfig() async { Future<bool> getAppConfig() async {
try { try {
print('getAppConfig:进来了'); Logger().d('getAppConfig:进来了');
//if (User.getname() != "") { //if (User.getname() != "") {
final response = await Api.getappconfig(); final response = await Api.getappconfig();
print('getAppConfig: $response'); Logger().d('getAppConfig: $response');
if (response == null) return false; if (response == null) return false;
print('getAppConfig:进来了'); Logger().d('getAppConfig:进来了');
// 根据API设计调整 // 根据API设计调整
final resp = UserGetAppConfigResp.fromJson(response); final resp = UserGetAppConfigResp.fromJson(response);
AppConfig.initialize(resp); AppConfig.initialize(resp);
return true; return true;
} catch (e) { } catch (e) {
print('getAppConfig 取失败: $e'); Logger().d('getAppConfig 取失败: $e');
return false; return false;
} }
} }

4
lib/modules/profile/views/profile_view.dart

@ -333,12 +333,12 @@ class EditProfileView extends GetView<ProfileController> {
: (controller.userInfo.value.avatar.isNotEmpty : (controller.userInfo.value.avatar.isNotEmpty
? NetworkImage(controller.userInfo.value.avatar) ? NetworkImage(controller.userInfo.value.avatar)
: null) as ImageProvider<Object>?, : null) as ImageProvider<Object>?,
backgroundColor: Colors.grey[200],
child: (controller.localAvatar.value.isEmpty && child: (controller.localAvatar.value.isEmpty &&
controller.userInfo.value.avatar.isEmpty) controller.userInfo.value.avatar.isEmpty)
? Icon(Icons.person, ? Icon(Icons.person,
size: 20.r, color: Colors.grey) // 默认图标 size: 20.r, color: Colors.grey) // 默认图标
: null, : null, // 添加背景色防止透明图片问题
backgroundColor: Colors.grey[200], // 添加背景色防止透明图片问题
)), )),
SizedBox(width: 8.w), SizedBox(width: 8.w),
Container( Container(

2
lib/modules/settings/controllers/settings_controller.dart

@ -122,8 +122,6 @@ class SettingsController extends GetxController {
//用户信息 //用户信息
static const String userKey = 'user_info'; static const String userKey = 'user_info';
//final _storage=GetStorage();
//final ImagePicker _picker = ImagePicker();
final Rx<User> userInfo = User.instance.obs; //使用单例实例 final Rx<User> userInfo = User.instance.obs; //使用单例实例
// 添加版本信息变量 // 添加版本信息变量

Loading…
Cancel
Save