diff --git a/lib/common/request/basic_config.dart b/lib/common/request/basic_config.dart index a06e191..4603952 100644 --- a/lib/common/request/basic_config.dart +++ b/lib/common/request/basic_config.dart @@ -1,18 +1,16 @@ import 'package:flutter/foundation.dart'; class BasicConfig { - static bool isTestDev = !isEnvProd(); - // static bool isTestDev = false; - - - // 暂时未启用 - static bool isEnvProd() { - if (kReleaseMode) { - debugPrint("dart.vm.product-现在是release环境."); - } else { - debugPrint("dart.vm.product-现在是debug环境."); - } - return kReleaseMode; - } + static bool isTestDev = !isEnvProd(); + //static bool isTestDev = false; + // 暂时未启用 + static bool isEnvProd() { + if (kReleaseMode) { + debugPrint("dart.vm.product-现在是release环境."); + } else { + debugPrint("dart.vm.product-现在是debug环境."); + } + return kReleaseMode; + } } diff --git a/lib/pages/login/forgetpwd/bloc/forget_pwd_home_bloc.dart b/lib/pages/login/forgetpwd/bloc/forget_pwd_home_bloc.dart index 0c71f63..0c678cc 100644 --- a/lib/pages/login/forgetpwd/bloc/forget_pwd_home_bloc.dart +++ b/lib/pages/login/forgetpwd/bloc/forget_pwd_home_bloc.dart @@ -1,14 +1,12 @@ -import 'package:common_utils/common_utils.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:wow_english/common/core/user_util.dart'; import 'package:wow_english/common/request/dao/user_dao.dart'; import 'package:wow_english/common/request/exception.dart'; import 'package:wow_english/utils/loading.dart'; import 'package:wow_english/utils/toast_util.dart'; -import 'package:wow_english/common/core/user_util.dart'; - part 'forget_pwd_home_event.dart'; part 'forget_pwd_home_state.dart'; @@ -72,7 +70,8 @@ class ForgetPwdHomeBloc extends Bloc { void _setPassWord( SetPassWordEvent event, Emitter emitter) async { - if (!RegexUtil.isMobileExact(phoneNumController.text)) { + final phoneNumber = phoneNumController.text; + if (phoneNumber.length != 11) { showToast('手机号不正确!'); return; } @@ -82,7 +81,7 @@ class ForgetPwdHomeBloc extends Bloc { void _sendSmsCode( SendSmsCodeEvent event, Emitter emitter) async { final phoneNumber = phoneNumController.text; - if (!RegexUtil.isMobileExact(phoneNumber)) { + if (phoneNumber.length != 11) { showToast('请检查手机号'); return; } diff --git a/lib/pages/login/loginpage/bloc/login_bloc.dart b/lib/pages/login/loginpage/bloc/login_bloc.dart index b7afc66..66a02c0 100644 --- a/lib/pages/login/loginpage/bloc/login_bloc.dart +++ b/lib/pages/login/loginpage/bloc/login_bloc.dart @@ -1,4 +1,3 @@ -import 'package:common_utils/common_utils.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; @@ -94,7 +93,7 @@ class LoginBloc extends Bloc { ///请求验证码 void _requestSmsCodeApi(RequestSmsCodeEvent event, Emitter emitter) async { final phoneNumber = phoneNumController.text; - if (!RegexUtil.isMobileExact(phoneNumber)) { + if (phoneNumber.length != 11) { showToast('请检查手机号'); return; } diff --git a/lib/pages/user/user_page.dart b/lib/pages/user/user_page.dart index dbec0fd..e70532b 100644 --- a/lib/pages/user/user_page.dart +++ b/lib/pages/user/user_page.dart @@ -1,9 +1,8 @@ -import 'dart:io'; -import 'dart:async'; -import 'package:flutter/services.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:url_launcher/url_launcher.dart'; import 'package:wow_english/common/core/app_config_helper.dart'; import 'package:wow_english/common/core/app_consts.dart'; import 'package:wow_english/common/core/assets_const.dart'; @@ -14,7 +13,6 @@ import 'package:wow_english/models/user_entity.dart'; import 'package:wow_english/pages/user/bloc/user_bloc.dart'; import 'package:wow_english/route/route.dart'; import 'package:wow_english/utils/image_util.dart'; -import 'package:url_launcher/url_launcher.dart'; class UserPage extends StatelessWidget { const UserPage({super.key}); @@ -220,7 +218,7 @@ class _UserView extends StatelessWidget { 12.verticalSpace, OutlinedButton( onPressed: () { - String phone = 'tel:+8618856084180'; + String phone = 'tel:+8618827093087'; _launchPhone(phone); }, style: normalButtonStyle, diff --git a/pubspec.yaml b/pubspec.yaml index 2a69920..0e85c62 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.5+5 +version: 1.0.6+6 environment: sdk: '>=3.2.0 <4.0.0'