更新

2025-08-14 09:52:10 +08:00
parent 5e9111ca41
commit bc4a07c4fa
21 changed files with 394 additions and 86 deletions
--- a/lib/controller/device/blueteeth_bind_controller.dart
+++ b/lib/controller/device/blueteeth_bind_controller.dart
@@ -6,11 +6,13 @@ import 'package:easydevice/easydevice.dart';
 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/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';
 import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
 import 'package:vbvs_app/controller/person/person_controller.dart';
+import 'package:vbvs_app/enum/APPPackageType.dart';
 import 'package:vbvs_app/model/BleDeviceData.dart';
 import 'package:vbvs_app/model/api_response.dart';

@@ -347,8 +349,14 @@ class BlueteethBindController extends GetControllerEx<BlueteethBindModel> {
      String serviceApi = ServiceConstant.device_bind;
      String queryUrl = "$serviceAddress$serviceName$serviceApi";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+     if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
@@ -403,8 +411,14 @@ class BlueteethBindController extends GetControllerEx<BlueteethBindModel> {
      String serviceApi = ServiceConstant.device_bind;
      String queryUrl = "$serviceAddress$serviceName$serviceApi";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+  if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
--- a/lib/controller/device/body_device_controller.dart
+++ b/lib/controller/device/body_device_controller.dart
@@ -5,9 +5,11 @@ import 'package:ef/ef.dart';
 import 'package:flutterflow_ui/flutterflow_ui.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';
+import 'package:vbvs_app/enum/APPPackageType.dart';
 import 'package:vbvs_app/model/api_response.dart';

 part 'body_device_controller.g.dart'; // 由json_serializable自动生成的部分
@@ -55,8 +57,14 @@ class BodyDeviceController extends GetControllerEx<BodyDeviceModel> {
      String queryUrl =
          "${serviceAddress}${serviceName}${serviceApi}?bindNum=1";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+     if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
@@ -97,8 +105,14 @@ class BodyDeviceController extends GetControllerEx<BodyDeviceModel> {
      String queryUrl =
          "${serviceAddress}${serviceName}${serviceApi}?bindType=${model.type}${key != null ? '&key=$key' : ''}";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+     if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
@@ -139,8 +153,14 @@ class BodyDeviceController extends GetControllerEx<BodyDeviceModel> {
      String serviceApi = ServiceConstant.device_bind;
      String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+  if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
@@ -275,8 +295,14 @@ class BodyDeviceController extends GetControllerEx<BodyDeviceModel> {
      String serviceApi = ServiceConstant.device_show;
      String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+ if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
--- a/lib/controller/device/device_share_controller.dart
+++ b/lib/controller/device/device_share_controller.dart
@@ -5,9 +5,11 @@ import 'package:EasyDartModule/EasyDartModule.dart';
 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/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';
+import 'package:vbvs_app/enum/APPPackageType.dart';
 import 'package:vbvs_app/model/api_response.dart';

 part 'device_share_controller.g.dart'; // 由json_serializable自动生成的部分
@@ -100,8 +102,14 @@ class DeviceShareController extends GetControllerEx<DeviceShareModel> {
      String serviceApi = ServiceConstant.device_share;
      String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+    if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
@@ -158,8 +166,14 @@ class DeviceShareController extends GetControllerEx<DeviceShareModel> {
      String serviceApi = ServiceConstant.device_share;
      String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+      if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
--- a/lib/controller/device/device_share_list_controller.dart
+++ b/lib/controller/device/device_share_list_controller.dart
@@ -4,9 +4,11 @@ import 'package:EasyDartModule/EasyDartModule.dart';
 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/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';
+import 'package:vbvs_app/enum/APPPackageType.dart';
 import 'package:vbvs_app/model/api_response.dart';

 part 'device_share_list_controller.g.dart'; // 由json_serializable自动生成的部分
@@ -53,8 +55,14 @@ class DeviceShareListController extends GetControllerEx<DeviceShareListModel> {
      String queryUrl = "${serviceAddress}${serviceName}${serviceApi}"
          "${key != null ? '?key=$key&' : '?'}mac=$mac";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+  if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
@@ -97,8 +105,14 @@ class DeviceShareListController extends GetControllerEx<DeviceShareListModel> {
      String serviceApi = ServiceConstant.share_deleted;
      String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+     if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
--- a/lib/controller/login/login_controller.dart
+++ b/lib/controller/login/login_controller.dart
@@ -139,8 +139,14 @@ class LoginController extends GetControllerEx<LoginModel> {
      String serviceApi = ServiceConstant.send_code;
      String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+ if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }

      if (language != null && language.isNotEmpty) {
--- a/lib/controller/message/message_controller.dart
+++ b/lib/controller/message/message_controller.dart
@@ -5,9 +5,11 @@ import 'package:ef/ef.dart';
 import 'package:flutterflow_ui/flutterflow_ui.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';
+import 'package:vbvs_app/enum/APPPackageType.dart';
 import 'package:vbvs_app/model/api_response.dart';

 part 'message_controller.g.dart'; // 由json_serializable自动生成的部分
@@ -57,8 +59,14 @@ class MessageController extends GetControllerEx<MessageModel> {
      String queryUrl =
          "${serviceAddress}${serviceName}${serviceApi}?type=${messageType}";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+      if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
@@ -101,8 +109,14 @@ class MessageController extends GetControllerEx<MessageModel> {

      String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+   if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
@@ -171,8 +185,14 @@ class MessageController extends GetControllerEx<MessageModel> {
      }

      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+   if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
--- a/lib/controller/person/person_controller.dart
+++ b/lib/controller/person/person_controller.dart
@@ -4,9 +4,11 @@ import 'package:EasyDartModule/EasyDartModule.dart';
 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/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';
+import 'package:vbvs_app/enum/APPPackageType.dart';
 import 'package:vbvs_app/model/api_response.dart';

 part 'person_controller.g.dart'; // 由json_serializable自动生成的部分
@@ -58,8 +60,14 @@ class PersonController extends GetControllerEx<PersonModel> {
      String serviceApi = ServiceConstant.person_info;
      String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+      if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
@@ -127,8 +135,14 @@ class PersonController extends GetControllerEx<PersonModel> {
      String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";

      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+      if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
@@ -176,8 +190,14 @@ class PersonController extends GetControllerEx<PersonModel> {
      String serviceApi = ServiceConstant.disease_list;
      String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+      if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
--- a/lib/controller/user_info_controller.dart
+++ b/lib/controller/user_info_controller.dart
@@ -64,6 +64,7 @@ class UserInfoController extends GetControllerEx<UserInfoModel> {
  RxDouble textHalfWidth = 0.0.obs;
  List device_bind_status = [];
  int device_bind_flag = 0; //0。未初始化  1.已初始化
+  int initLocationpermission = 0; //未初始化

  Future<ApiResponse> uploadImg() async {
    EasyDartModule.logger.info("请求上传图片");
@@ -145,8 +146,14 @@ class UserInfoController extends GetControllerEx<UserInfoModel> {
      String serviceApi = ServiceConstant.user_info;
      String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
      String? language = "";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+      if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language != null && language.isNotEmpty) {
        if (queryUrl.contains("?")) {
--- a/lib/controller/weather/weather_controller.dart
+++ b/lib/controller/weather/weather_controller.dart
@@ -7,8 +7,12 @@ import 'package:geocoding/geocoding.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:path/path.dart';
+import 'package:vbvs_app/common/color/appConstants.dart';
 import 'package:vbvs_app/common/util/CommonVariables.dart';
+import 'package:vbvs_app/common/util/MyUtils.dart';
 import 'package:vbvs_app/controller/setting/language/language_controller.dart';
+import 'package:vbvs_app/controller/user_info_controller.dart';
+import 'package:vbvs_app/enum/APPPackageType.dart';
 import 'package:vbvs_app/pages/common/selectDialog.dart';
 import 'package:weather/weather.dart';

@@ -77,14 +81,25 @@ class WeatherModelController extends GetControllerEx<WeatherModel> {
  // 获取当前位置并存储到 model
  Future<void> _getCurrentLocation() async {
    try {
+      UserInfoController userInfoController = Get.find();
+      if (userInfoController.model.login == null ||
+          userInfoController.model.login != 1) {
+        return;
+      }
      Position position = await determinePosition();
      if (position == null) {
        throw Exception("获取位置失败");
      }

      String? language = "zh_CN";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+     if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      List<Placemark> placemarks = [];
      // placemarks = await placemarkFromCoordinates(position.latitude, position.longitude,
@@ -117,9 +132,9 @@ class WeatherModelController extends GetControllerEx<WeatherModel> {
    if (!serviceEnabled) {
      return Future.error('位置服务未启用');
    }
-
    try {
-      showPermissionInfoDialog(Get.context!, CommonVariables().permissionInfo);
+      showPermissionInfoDialog(
+          Get.context!, CommonVariables().locationpermissionInfo);
    } catch (e) {
      ef.log("$e");
    }
@@ -135,9 +150,9 @@ class WeatherModelController extends GetControllerEx<WeatherModel> {
      Navigator.of(Get.context!, rootNavigator: true).pop();
    }

-     if (permission == LocationPermission.denied) {
-        return Future.error('位置权限被拒绝');
-      }
+    if (permission == LocationPermission.denied) {
+      return Future.error('位置权限被拒绝');
+    }

    if (permission == LocationPermission.deniedForever) {
      return Future.error('位置权限被永久拒绝');
@@ -173,8 +188,14 @@ class WeatherModelController extends GetControllerEx<WeatherModel> {
    try {
      weatherFactory.language = Language.CHINESE_SIMPLIFIED;
      String? language = "zh_CN";
-      if (languageController.selectLanguage != null) {
-        language = languageController.selectLanguage.value!.language_code;
+    if (AppConstants().ent_type == APPPackageType.MHT.code) {
+        if (mhLanguageController.selectLanguage != null) {
+          language = mhLanguageController.selectLanguage.value!.language_code;
+        }
+      } else {
+        if (languageController.selectLanguage != null) {
+          language = languageController.selectLanguage.value!.language_code;
+        }
      }
      if (language == "zh_CN") {
        weatherFactory.language = Language.CHINESE_SIMPLIFIED;