切换角色等

lib/bloc/login_main_cubit.dart

@@ -105,11 +105,25 @@ class LoginMainCubit extends Cubit<LoginMainState> {
 
       final sessionCode = data['sessionCode'];
       final userCode = data['userCode'];
-      final classCode = role['classCode'];
-      final userType = role['userType'];
-      final stuId = role['stuId'];
+      var classCode = role['classCode'];
+      var userType = role['userType'];
+      var stuId = role['stuId'];
 
       var sharedPreferences = getIt.get<SharedPreferences>();
+      var preUserCode = sharedPreferences.getString('pre_userCode') ?? '';
+      if (userCode != preUserCode) {
+        // 新用户登录
+        sharedPreferences.setString('pre_userCode', userCode);
+        sharedPreferences.setString('pre_classCode', classCode);
+        sharedPreferences.setInt('pre_userType', userType);
+        sharedPreferences.setString('pre_stuId', stuId ?? '');
+      } else {
+        // 前一个登录用户重新登录
+        classCode = sharedPreferences.getString('pre_classCode');
+        userType = sharedPreferences.getInt('pre_userType');
+        stuId = sharedPreferences.getString('pre_stuId');
+      }
+
       sharedPreferences.setString('auth_sessionCode', sessionCode);
       sharedPreferences.setString('auth_userCode', userCode);
       sharedPreferences.setString('auth_classCode', classCode);

lib/bloc/login_phone_cubit.dart

@@ -152,11 +152,25 @@ class LoginPhoneCubit extends Cubit<LoginPhoneState> {
 
     final sessionCode = data['sessionCode'];
     final userCode = data['userCode'];
-    final classCode = role['classCode'];
-    final userType = role['userType'];
-    final stuId = role['stuId'];
+    var classCode = role['classCode'];
+    var userType = role['userType'];
+    var stuId = role['stuId'];
 
     var sharedPreferences = getIt.get<SharedPreferences>();
+    var preUserCode = sharedPreferences.getString('pre_userCode') ?? '';
+    if (userCode != preUserCode) {
+      // 新用户登录
+      sharedPreferences.setString('pre_userCode', userCode);
+      sharedPreferences.setString('pre_classCode', classCode);
+      sharedPreferences.setInt('pre_userType', userType);
+      sharedPreferences.setString('pre_stuId', stuId ?? '');
+    } else {
+      // 前一个登录用户重新登录
+      classCode = sharedPreferences.getString('pre_classCode');
+      userType = sharedPreferences.getInt('pre_userType');
+      stuId = sharedPreferences.getString('pre_stuId');
+    }
+
     sharedPreferences.setString('auth_sessionCode', sessionCode);
     sharedPreferences.setString('auth_userCode', userCode);
     sharedPreferences.setString('auth_classCode', classCode);

lib/bloc/login_qr_cubit.dart

@@ -133,11 +133,25 @@ class LoginQrCubit extends Cubit<LoginQrState> {
 
     final sessionCode = data['sessionCode'];
     final userCode = data['userCode'];
-    final classCode = role['classCode'];
-    final userType = role['userType'];
-    final stuId = role['stuId'];
+    var classCode = role['classCode'];
+    var userType = role['userType'];
+    var stuId = role['stuId'];
 
     var sharedPreferences = getIt.get<SharedPreferences>();
+    var preUserCode = sharedPreferences.getString('pre_userCode') ?? '';
+    if (userCode != preUserCode) {
+      // 新用户登录
+      sharedPreferences.setString('pre_userCode', userCode);
+      sharedPreferences.setString('pre_classCode', classCode);
+      sharedPreferences.setInt('pre_userType', userType);
+      sharedPreferences.setString('pre_stuId', stuId ?? '');
+    } else {
+      // 前一个登录用户重新登录
+      classCode = sharedPreferences.getString('pre_classCode');
+      userType = sharedPreferences.getInt('pre_userType');
+      stuId = sharedPreferences.getString('pre_stuId');
+    }
+
     sharedPreferences.setString('auth_sessionCode', sessionCode);
     sharedPreferences.setString('auth_userCode', userCode);
     sharedPreferences.setString('auth_classCode', classCode);

lib/bloc/web_cubit.dart

@@ -346,6 +346,8 @@ class WebCubit extends Cubit<WebState> {
   }
 
   void _loadHtml() {
+    var sharedPreferences = getIt.get<SharedPreferences>();
+    var debug = sharedPreferences.getInt('debug') ?? 0;
     // 构造函数中已拦截判断未登录的情况进行了处理，所以这里不再处理未登录的情况
     final String serverUrl = '${Constant.localServerUrl}/index.html'
         '#/h5/login/pages/applogin?'
@@ -353,7 +355,8 @@ class WebCubit extends Cubit<WebState> {
         'userCode=${state.userCode}&'
         'classCode=${state.classCode}&'
         'userType=${state.userType}&'
-        'stuId=${state.stuId}';
+        'stuId=${state.stuId}&'
+        'debug=$debug';
     // final String serverUrl = '${Constant.localServerUrl}/test/test2.html';
     _controller.loadRequest(Uri.parse(serverUrl));
   }

lib/data/repositories/message/role_info_handler.dart

@@ -20,6 +20,11 @@ class RoleInfoHandler extends MessageHandler {
     sharedPreferences.setInt('auth_userType', userType);
     sharedPreferences.setString('auth_stuId', stuId);
 
+    sharedPreferences.setString('pre_userCode', userId);
+    sharedPreferences.setString('pre_classCode', classCode);
+    sharedPreferences.setInt('pre_userType', userType);
+    sharedPreferences.setString('pre_stuId', stuId);
+
     return true;
   }
 }

lib/ui/pages/web_page.dart

@@ -61,7 +61,7 @@ class WebPage extends StatelessWidget {
                           child: Column(
                             mainAxisAlignment: MainAxisAlignment.center,
                             children: [
-                              CircularProgressIndicator(),
+                              CircularProgressIndicator(color: Color(0xFF7691fa)),
                               SizedBox(height: 16),
                               Text('加载中...'),
                             ],
@@ -75,7 +75,7 @@ class WebPage extends StatelessWidget {
                         child: Column(
                           mainAxisAlignment: MainAxisAlignment.center,
                           children: [
-                            CircularProgressIndicator(),
+                            CircularProgressIndicator(color: Color(0xFF7691fa)),
                             SizedBox(height: 16),
                             Text('资源更新中...', style: TextStyle(color: Colors.white)),
                           ],