Merge remote-tracking branch 'origin/master'

This commit is contained in:
czz
2025-07-14 18:04:52 +08:00
6 changed files with 115 additions and 95 deletions

Binary file not shown.

View File

@@ -41,7 +41,7 @@ class PeopleInfoController extends GetControllerEx<PeopleInfoModel> {
@override @override
Future<void> onInit() async { Future<void> onInit() async {
super.onInit(); super.onInit();
await getPeoples(Get.arguments['mac']); // 控制器创建时立即执行 // await getPeoples(Get.arguments['mac']); // 控制器创建时立即执行
} }
getPeoples(String mac) async { getPeoples(String mac) async {

View File

@@ -133,6 +133,10 @@ class UserInfoController extends GetControllerEx<UserInfoModel> {
apiResponse.msg = "昵称为空".tr; apiResponse.msg = "昵称为空".tr;
return apiResponse; return apiResponse;
} }
if (user.tmpNickName!.length >= 9) {
apiResponse.msg = "最长字符为8个字".tr;
return apiResponse;
}
String serviceAddress = ServiceConstant.service_address; String serviceAddress = ServiceConstant.service_address;
String serviceName = ServiceConstant.server_service; String serviceName = ServiceConstant.server_service;
String serviceApi = ServiceConstant.user_info; String serviceApi = ServiceConstant.user_info;

View File

@@ -189,6 +189,7 @@ class MHTBlueToothController extends GetControllerEx<MHTBlueToothModel> {
return res; return res;
} else { } else {
model.deviceDataStatus = []; model.deviceDataStatus = [];
return ApiResponse(code:1, msg: "".tr);
} }
} catch (e) { } catch (e) {
print("获取设备状态异常: $e"); print("获取设备状态异常: $e");

View File

@@ -112,6 +112,7 @@ class _MHTBlueteethDevicePageState extends State<MHTBlueteethDevicePage> {
} }
void _startScanning() async { void _startScanning() async {
try {
if (!mounted || isScanning || !mhtBlueToothController.shouldScan.value) if (!mounted || isScanning || !mhtBlueToothController.shouldScan.value)
return; return;
@@ -204,6 +205,13 @@ class _MHTBlueteethDevicePageState extends State<MHTBlueteethDevicePage> {
}); });
} }
} }
} catch (e) {
ef.log("$e");
} finally {
setState(() {
isScanning = false;
});
}
} }
void _startPeriodicScan() { void _startPeriodicScan() {

View File

@@ -13,6 +13,7 @@ import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
import 'package:vbvs_app/controller/home/home_controller.dart'; import 'package:vbvs_app/controller/home/home_controller.dart';
import 'package:vbvs_app/controller/main_bottom/global_controller.dart'; import 'package:vbvs_app/controller/main_bottom/global_controller.dart';
import 'package:vbvs_app/controller/mh_controller/people_info_controller.dart'; import 'package:vbvs_app/controller/mh_controller/people_info_controller.dart';
import 'package:vbvs_app/controller/person/person_controller.dart';
import 'package:vbvs_app/pages/common/selectDialog.dart'; import 'package:vbvs_app/pages/common/selectDialog.dart';
import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart'; import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart';
@@ -33,6 +34,7 @@ class PeopleInfoPage extends GetView<PeopleInfoController> {
PeopleInfoController controller = Get.put(PeopleInfoController()); PeopleInfoController controller = Get.put(PeopleInfoController());
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
getPersonData();
return LayoutBuilder( return LayoutBuilder(
builder: (context, boxConstraints) => GestureDetector( builder: (context, boxConstraints) => GestureDetector(
onTap: () { onTap: () {
@@ -831,4 +833,9 @@ class PeopleInfoPage extends GetView<PeopleInfoController> {
return "-"; return "-";
} }
} }
Future<void> getPersonData() async {
PeopleInfoController peopleInfoController = Get.find();
await peopleInfoController.getPeoples(Get.arguments['mac']); // 控制器创建时立即执行
}
} }