更新默认本地语言

lib/controller/device/device_type_controller.dart

@@ -6,7 +6,6 @@ import 'package:ef/ef.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:vbvs_app/common/color/ServiceConstant.dart';
 import 'package:vbvs_app/common/color/app_uri_status.dart';
-import 'package:vbvs_app/controller/mh_controller/mh_language_controller.dart';
 import 'package:vbvs_app/controller/setting/language/language_controller.dart';
 import 'package:vbvs_app/model/api_response.dart';
 
@@ -40,7 +39,7 @@ class DeviceTypeController extends GetControllerEx<DeviceTypeModel> {
     attr = GetModel(DeviceTypeModel()).obs;
   }
   RxList deviceTypeList = [].obs;
-  MHLanguageController languageController = Get.find();
+  LanguageController languageController = Get.find();
 
   Future<ApiResponse> getDeviceType() async {
     ApiResponse apiResponse = ApiResponse(code: -1, msg: "请求失败".tr);

lib/controller/message/message_controller.dart

@@ -181,6 +181,10 @@ class MessageController extends GetControllerEx<MessageModel> {
           queryUrl += "?lang=$language";
         }
       }
+      if (type != null) {
+        queryUrl = "$queryUrl&type=$type";
+      }
+       queryUrl = "$queryUrl&mid=ALL";
       var response = await EasyDartModule.dio.post(queryUrl);
 
       if (response != null) {

lib/controller/mh_controller/mh_language_controller.dart

@@ -5,6 +5,8 @@ import 'package:ef/ef.dart';
 import 'package:flutter/services.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:path/path.dart' as path;
+import 'package:vbvs_app/common/color/appConstants.dart';
+import 'package:vbvs_app/enum/APPPackageType.dart';
 import 'package:vbvs_app/language/AppLanguage.dart';
 
 part 'mh_language_controller.g.dart'; // 由json_serializable自动生成的部分
@@ -47,10 +49,25 @@ class MHLanguageController extends GetControllerEx<MHLanguageModel> {
       final Map<String, dynamic> manifestMap = json.decode(manifestContent);
 
       // 筛选出 langs 目录下的 .json 文件
-      final langFiles = manifestMap.keys
-          .where((String key) =>
-              key.startsWith('assets/mhlangs/') && key.endsWith('.json'))
-          .toList();
+
+      int code = AppConstants().ent_type;
+      final langFiles;
+      if (APPPackageType.TH.code == code) {
+        langFiles = manifestMap.keys
+            .where((String key) =>
+                key.startsWith('assets/langs/') && key.endsWith('.json'))
+            .toList();
+      } else if (APPPackageType.MHT.code == code) {
+        langFiles = manifestMap.keys
+            .where((String key) =>
+                key.startsWith('assets/mhlangs/') && key.endsWith('.json'))
+            .toList();
+      } else {
+        langFiles = manifestMap.keys
+            .where((String key) =>
+                key.startsWith('assets/langs/') && key.endsWith('.json'))
+            .toList();
+      }
 
       // 2. 遍历所有语言文件
       for (final filePath in langFiles) {

lib/controller/user_info_controller.dart

@@ -6,6 +6,7 @@ import 'package:get_storage/get_storage.dart';
 import 'package:img_picker/img_picker.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:vbvs_app/common/color/ServiceConstant.dart';
+import 'package:vbvs_app/common/color/appConstants.dart';
 import 'package:vbvs_app/common/color/app_uri_status.dart';
 import 'package:vbvs_app/common/util/DailyLogUtils.dart';
 import 'package:vbvs_app/common/util/MyUtils.dart';
@@ -14,6 +15,7 @@ import 'package:vbvs_app/controller/home/home_controller.dart';
 import 'package:vbvs_app/controller/login/login_controller.dart';
 import 'package:vbvs_app/controller/message/message_controller.dart';
 import 'package:vbvs_app/controller/time/countdown_controller.dart';
+import 'package:vbvs_app/enum/APPPackageType.dart';
 import 'package:vbvs_app/model/api_response.dart';
 import 'package:vbvs_app/model/user_data.dart';
 import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart';
@@ -225,7 +227,11 @@ class UserInfoController extends GetControllerEx<UserInfoModel> {
   }
 
   ApiResponse logOut() {
-    MHTHomeController mhtHomeController = Get.find();
+    int code = AppConstants().ent_type;
+    if (APPPackageType.MHT.code == code) {
+      MHTHomeController mhtHomeController = Get.find();
+      mhtHomeController.personnelList.value = [];
+    }
     ApiResponse apiResponse = ApiResponse(code: 1, msg: "退出成功".tr);
     EasyDartModule.logger.info("退出登录");
     DailyLogUtils.writeLog("退出登录");
@@ -246,10 +252,10 @@ class UserInfoController extends GetControllerEx<UserInfoModel> {
     messageController.model.system_message_read = 0;
     CountdownController countdownController = Get.find();
     countdownController.countdown.value = 0;
-    mhtHomeController.personnelList.value = [];
     return apiResponse;
   }
-    ApiResponse deleteAccount() {
+
+  ApiResponse deleteAccount() {
     MHTHomeController mhtHomeController = Get.find();
     ApiResponse apiResponse = ApiResponse(code: 1, msg: "注销成功".tr);
     EasyDartModule.logger.info("注销账号");
@@ -273,7 +279,7 @@ class UserInfoController extends GetControllerEx<UserInfoModel> {
     CountdownController countdownController = Get.find();
     countdownController.countdown.value = 0;
     mhtHomeController.personnelList.value = [];
-  
+
     return apiResponse;
   }
 }