fix bugs

lib/blocs/auth/auth_bloc.dart

@@ -14,10 +14,10 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   })  : _authService = authService,
         _storageService = storageService,
         super(AuthInitial()) {
-    on<AuthLoginRequested>(_onLoginRequested);
-    on<AuthTokenExpiredEvent>(_onTokenExpired);
-    on<AuthLogoutRequestedEvent>(_onLogoutRequested);
-    on<AuthFetchUserInfo>(_onFetchUserInfo);
+    on<AuthLoginRequested>(_onLoginRequested);/// 登录
+    on<AuthTokenExpiredEvent>(_onTokenExpired);/// token过期
+    on<AuthLogoutRequestedEvent>(_onLogoutRequested);/// 退出登录
+    on<AuthFetchUserInfo>(_onFetchUserInfo);/// 获取用户信息
   }
 
   Future<void> _onLoginRequested(
@@ -80,4 +80,5 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       }
     }
   }
+
 }
\ No newline at end of file

lib/views/home/index/index_view.dart

@@ -157,7 +157,7 @@ class _HomeViewState extends State<HomeView> with AutoRouteAwareStateMixin<HomeV
               voltageAlarmLocation: location,
               voltageValue: DealUtils.formatVoltage(alert.voltage),
               alertContent: alert.alertContent.isNotEmpty ?
-              '(${alert.alertContent})' : '',
+              '${alert.alertContent}·' : '',
               voltageWaitTime: alert.waitingDurationDesc,
               voltageAlarmLevel: alert.alertLevelText,
               alertCategory: alert.alertCategory,

lib/views/home/index/widget/voltage_operate_block.dart

@@ -100,7 +100,7 @@ class VoltageOperateBlock extends StatelessWidget {
             width: double.infinity,
             margin: EdgeInsets.only(left: 80.w, bottom: 20.h),
             child: Text(
-              '电压$voltageValue $alertContent·$voltageWaitTime',
+              '$alertContent$voltageWaitTime',
               style: TextStyle(
                 fontSize: 24.sp,
                 color: const Color.fromRGBO(100, 116, 139, 1.0),

lib/views/login/cubit/login_cubit.dart

@@ -49,11 +49,7 @@ class LoginCubit extends Cubit<LoginState> {
     emit(state.copyWith(rememberPassword: value));
   }
 
-  void login({
-    required String username,
-    required String password,
-    bool rememberPassword = false,
-  }) {
+  void login(String username, String password, bool rememberPassword) {
     if (rememberPassword) {
       storageService.saveRememberCredentials(
         username: username,
@@ -83,7 +79,7 @@ class LoginCubit extends Cubit<LoginState> {
   }
 
   void forgotPwd() {
-    // TODO: 跳转到忘记密码页面
+
   }
 
   @override

lib/views/login/login_view.dart

@@ -73,16 +73,12 @@ class LoginView extends StatelessWidget {
 
                     return Column(
                       children: [
-                        SizedBox(height: 150.h),
-                        Container(
-                          margin: EdgeInsets.only(bottom: 80.h),
-                          child: Column(
-                            children: [
+                        SizedBox(height: 208.h),
                         Container(
                           width: 160.w,
                           height: 160.w,
                           decoration: BoxDecoration(
-                                  borderRadius: BorderRadius.circular(40.w),
+                            borderRadius: BorderRadius.circular(32.r),
                             gradient: const LinearGradient(
                               begin: Alignment.topCenter,
                               end: Alignment.bottomCenter,
@@ -93,14 +89,14 @@ class LoginView extends StatelessWidget {
                             ),
                           ),
                           child: ClipRRect(
-                                  borderRadius: BorderRadius.circular(40.w),
+                            borderRadius: BorderRadius.circular(32.r),
                             child: Image.asset(
                               'lib/assets/login/logo@2x.png',
                               fit: BoxFit.cover,
                             ),
                           ),
                         ),
-                              SizedBox(height: 40.h),
+                        SizedBox(height: 30.h),
                         const Text(
                           '智能酒店管理系统',
                           style: TextStyle(
@@ -109,7 +105,6 @@ class LoginView extends StatelessWidget {
                             fontWeight: FontWeight.bold,
                           ),
                         ),
-                              SizedBox(height: 10.h),
                         const Text(
                           'Intelligent Hotel Management System',
                           style: TextStyle(
@@ -117,9 +112,7 @@ class LoginView extends StatelessWidget {
                             fontSize: 14,
                           ),
                         ),
-                            ],
-                          ),
-                        ),
+                        SizedBox(height: 60.h),
                         Form(
                           key: _frmGlobalKey,
                           child: Column(
@@ -128,7 +121,6 @@ class LoginView extends StatelessWidget {
                               UsernameField(
                                 controller: _txtUserNameController,
                               ),
-                              SizedBox(height: 20.h),
                               PasswordField(
                                 controller: _txtPwdController,
                               ),
@@ -159,15 +151,10 @@ class LoginView extends StatelessWidget {
                                   return BtnLogin(
                                     isLoading: authState is AuthLoading,
                                     onPressed: () {
-                                      if (_frmGlobalKey.currentState!
-                                          .validate()) {
+                                      if (_frmGlobalKey.currentState!.validate()) {
                                         cubit.login(
-                                          username:
-                                              _txtUserNameController.text
-                                                  .trim(),
-                                          password:
+                                          _txtUserNameController.text.trim(),
                                           _txtPwdController.text.trim(),
-                                          rememberPassword:
                                           state.rememberPassword,
                                         );
                                       }

lib/views/login/widget/btn_login.dart

@@ -15,10 +15,10 @@ class BtnLogin extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
-      height: 104.h,
+      height: 83.h,
       decoration: BoxDecoration(
         color: const Color.fromRGBO(73, 149, 234, 1),
-        borderRadius: BorderRadius.circular(40.w),
+        borderRadius: BorderRadius.circular(50.r),
       ),
       child: ElevatedButton(
         onPressed: isLoading ? null : onPressed,

lib/views/login/widget/password_field.dart

@@ -28,7 +28,7 @@ class _PasswordFieldState extends State<PasswordField> {
     return TextFormField(
       controller: widget.controller,
       obscureText: _obscureText,
-      style: TextStyle(color: const Color(0xFF333333), fontSize: 28.sp),
+      style: TextStyle(color: const Color(0xFF333333), fontSize: 32.sp),
       validator: (val) {
         if (val == null || val.isEmpty) {
           return "密码不能为空";
@@ -38,7 +38,7 @@ class _PasswordFieldState extends State<PasswordField> {
       decoration: InputDecoration(
         filled: true,
         hintText: "password",
-        hintStyle: TextStyle(color: const Color(0xFF999999), fontSize: 28.sp),
+        hintStyle: TextStyle(color: const Color(0xFF999999), fontSize: 32.sp),
         prefixIcon: Icon(Icons.lock, color: const Color(0xFF999999), size: 40.w),
         prefixIconConstraints: BoxConstraints(minWidth: 80.w, minHeight: 80.w),
         suffixIcon: IconButton(
@@ -52,8 +52,8 @@ class _PasswordFieldState extends State<PasswordField> {
         suffixIconConstraints: BoxConstraints(minWidth: 80.w, minHeight: 80.w),
         contentPadding: EdgeInsets.symmetric(vertical: 20.h, horizontal: 24.w),
         helperText: " ",
-        helperStyle: TextStyle(height: 1, fontSize: 24.sp),
-        errorStyle: TextStyle(color: Colors.red, fontSize: 24.sp, height: 1),
+        helperStyle: TextStyle(height: 1, fontSize: 28.sp),
+        errorStyle: TextStyle(color: Colors.red, fontSize: 28.sp, height: 1),
         errorMaxLines: 1,
         fillColor: Colors.white,
         border: OutlineInputBorder(

lib/views/login/widget/remember_password_row.dart

@@ -47,6 +47,7 @@ class RememberPasswordRow extends StatelessWidget {
                 style: TextStyle(
                   color: const Color(0xFF0A0D14),
                   fontSize: 24.sp,
+                  fontWeight: FontWeight.w600,
                 ),
               ),
             ],

lib/views/login/widget/username_field.dart

@@ -13,7 +13,7 @@ class UsernameField extends StatelessWidget {
   Widget build(BuildContext context) {
     return TextFormField(
       controller: controller,
-      style: TextStyle(color: const Color(0xFF333333), fontSize: 28.sp),
+      style: TextStyle(color: const Color(0xFF333333), fontSize: 32.sp),
       validator: (val) {
         if (val == null || val.isEmpty) {
           return "用户名不能为空哦";
@@ -23,13 +23,13 @@ class UsernameField extends StatelessWidget {
       decoration: InputDecoration(
         filled: true,
         hintText: "admin",
-        hintStyle: TextStyle(color: const Color(0xFF999999), fontSize: 28.sp),
+        hintStyle: TextStyle(color: const Color(0xFF999999), fontSize: 32.sp),
         prefixIcon: Icon(Icons.person, color: const Color(0xFF999999), size: 40.w),
         prefixIconConstraints: BoxConstraints(minWidth: 80.w, minHeight: 80.w),
         contentPadding: EdgeInsets.symmetric(vertical: 20.h, horizontal: 24.w),
         helperText: " ",
-        helperStyle: TextStyle(height: 1, fontSize: 24.sp),
-        errorStyle: TextStyle(color: Colors.red, fontSize: 24.sp, height: 1),
+        helperStyle: TextStyle(height: 1, fontSize: 28.sp),
+        errorStyle: TextStyle(color: Colors.red, fontSize: 28.sp, height: 1),
         errorMaxLines: 1,
         fillColor: Colors.white,
         border: OutlineInputBorder(