更新
This commit is contained in:
wyf
@@ -15,6 +15,7 @@ import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
|
||||
import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart';
|
||||
import 'package:vbvs_app/controller/device/device_calibration_controller.dart';
|
||||
import 'package:vbvs_app/pages/common/selectDialog.dart';
|
||||
import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart';
|
||||
|
||||
class CalibrationPage extends StatefulWidget {
|
||||
int? type; //1.绑定时 2.绑定后
|
||||
@@ -26,16 +27,21 @@ class CalibrationPage extends StatefulWidget {
|
||||
|
||||
class _CalibrationPageState extends State<CalibrationPage> {
|
||||
DeviceCalibrationController deviceCalibrationController = Get.find();
|
||||
BlueteethBindController blueteethBindController = Get.find();
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
deviceCalibrationController.process.value = 0;
|
||||
deviceCalibrationController.bed_calibration.value = 0;
|
||||
deviceCalibrationController.position_calibration.value = 0;
|
||||
blueteethBindController.cid!.value = "";
|
||||
deviceCalibrationController.complete = false;
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
blueteethBindController.cid!.value = "";
|
||||
deviceCalibrationController.complete = false;
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@@ -144,8 +150,8 @@ class _CalibrationPageState extends State<CalibrationPage> {
|
||||
padding: EdgeInsets.symmetric(
|
||||
vertical: 10.rpx), // 可自定义内边距
|
||||
onTap: () {
|
||||
deviceCalibrationController.process.value = 0;
|
||||
deviceCalibrationController.updateAll();
|
||||
// deviceCalibrationController.process.value = 0;
|
||||
// deviceCalibrationController.updateAll();
|
||||
},
|
||||
child: Row(
|
||||
mainAxisAlignment:
|
||||
@@ -213,8 +219,8 @@ class _CalibrationPageState extends State<CalibrationPage> {
|
||||
padding: EdgeInsets.symmetric(
|
||||
vertical: 10.rpx), // 可根据需要调整上下内边距
|
||||
onTap: () {
|
||||
deviceCalibrationController.process.value = 1;
|
||||
deviceCalibrationController.updateAll();
|
||||
// deviceCalibrationController.process.value = 1;
|
||||
// deviceCalibrationController.updateAll();
|
||||
},
|
||||
child: Row(
|
||||
mainAxisAlignment:
|
||||
@@ -483,56 +489,221 @@ class _CalibrationPageState extends State<CalibrationPage> {
|
||||
child: CustomCard(
|
||||
borderRadius:
|
||||
AppConstants().button_container_radius, // 圆角半径
|
||||
// onTap: () async {
|
||||
// BlueteethBindController blueteethBindController =
|
||||
// Get.find();
|
||||
// String serviceAddress = "http://192.168.1.80:8086";
|
||||
// String serviceApi = ServiceConstant.start_calibration;
|
||||
// String queryUrl = "${serviceAddress}${serviceApi}";
|
||||
// requestWithLog(
|
||||
// logTitle: "设备校准",
|
||||
// method: MyHttpMethod.post,
|
||||
// queryUrl: queryUrl,
|
||||
// data: {
|
||||
// "macA": blueteethBindController.currentDeviceMac,
|
||||
// if (blueteethBindController.cid!.value.isNotEmpty)
|
||||
// "id": blueteethBindController.cid!.value,
|
||||
// },
|
||||
// onSuccess: (res) {
|
||||
// String cid = res.rawResponse.data['cid'];
|
||||
// blueteethBindController.cid!.value = cid;
|
||||
// final ValueNotifier<double> progressNotifier =
|
||||
// ValueNotifier<double>(0.0);
|
||||
// final ValueNotifier<bool> failureNotifier =
|
||||
// ValueNotifier<bool>(false);
|
||||
// Timer? pollingTimer;
|
||||
// // 定义请求函数
|
||||
// void requestCalibrationProgress() {
|
||||
// String serviceAddress =
|
||||
// "http://192.168.1.80:8086";
|
||||
// String serviceApi =
|
||||
// ServiceConstant.calibration_process;
|
||||
// String queryUrl =
|
||||
// "${serviceAddress}${serviceApi}?id=$cid";
|
||||
// requestWithLog(
|
||||
// logTitle: "设备校准进度",
|
||||
// method: MyHttpMethod.get,
|
||||
// queryUrl: queryUrl,
|
||||
// onSuccess: (res) {
|
||||
// print(res);
|
||||
// deviceCalibrationController.tips.value =
|
||||
// res.data['statusText'];
|
||||
// if (res.data['per'] == 100) {
|
||||
// TopSlideNotification.show(context,
|
||||
// text: deviceCalibrationController
|
||||
// .tips.value);
|
||||
// }
|
||||
// double process =
|
||||
// (res.data['per'] ?? 0).toDouble();
|
||||
// progressNotifier.value = process;
|
||||
// if (process >= 100) {
|
||||
// if (deviceCalibrationController
|
||||
// .process.value ==
|
||||
// 0) {
|
||||
// deviceCalibrationController
|
||||
// .bed_calibration.value = 1;
|
||||
// deviceCalibrationController.updateAll();
|
||||
// }
|
||||
// if (deviceCalibrationController
|
||||
// .process.value ==
|
||||
// 1) {
|
||||
// deviceCalibrationController
|
||||
// .position_calibration.value = 1;
|
||||
// deviceCalibrationController.updateAll();
|
||||
// }
|
||||
// deviceCalibrationController
|
||||
// .process.value = 1;
|
||||
// deviceCalibrationController.updateAll();
|
||||
// pollingTimer?.cancel();
|
||||
// }
|
||||
// },
|
||||
// onFailure: (res) {
|
||||
// pollingTimer?.cancel();
|
||||
// failureNotifier.value = true;
|
||||
// TopSlideNotification.show(
|
||||
// context,
|
||||
// text: res.msg ?? "服务器.失败".tr,
|
||||
// textColor:
|
||||
// themeController.currentColor.sc9,
|
||||
// );
|
||||
// },
|
||||
// );
|
||||
// }
|
||||
|
||||
// // 启动轮询
|
||||
// pollingTimer =
|
||||
// Timer.periodic(Duration(seconds: 2), (timer) {
|
||||
// requestCalibrationProgress();
|
||||
// });
|
||||
|
||||
// // 初始调用一次
|
||||
// requestCalibrationProgress();
|
||||
|
||||
// // 显示进度弹窗
|
||||
// showProgressDialog(
|
||||
// context, progressNotifier, failureNotifier);
|
||||
// },
|
||||
// onFailure: (res) {
|
||||
// TopSlideNotification.show(
|
||||
// context,
|
||||
// text: res.msg ?? "服务器.失败".tr,
|
||||
// textColor: themeController.currentColor.sc9,
|
||||
// );
|
||||
// },
|
||||
// );
|
||||
// },
|
||||
|
||||
onTap: () async {
|
||||
if (deviceCalibrationController.complete) {
|
||||
showConfirmDialog(
|
||||
context, Container(), "校准已经完成，是否重新开始校准？",
|
||||
onConfirm: () {
|
||||
BlueteethBindController blueteethBindController =
|
||||
Get.find();
|
||||
deviceCalibrationController.process.value = 0;
|
||||
deviceCalibrationController
|
||||
.bed_calibration.value = 0;
|
||||
deviceCalibrationController
|
||||
.position_calibration.value = 0;
|
||||
blueteethBindController.cid!.value = "";
|
||||
deviceCalibrationController.complete = false;
|
||||
}, onCancel: () {});
|
||||
}
|
||||
|
||||
BlueteethBindController blueteethBindController =
|
||||
Get.find();
|
||||
String serviceAddress = "https://caibration.he-info.cn/";
|
||||
String calibrationApi =
|
||||
ServiceConstant.start_calibration;
|
||||
String progressApi =
|
||||
ServiceConstant.calibration_process;
|
||||
|
||||
String queryUrl = "$serviceAddress$calibrationApi";
|
||||
|
||||
final ValueNotifier<double> progressNotifier =
|
||||
ValueNotifier<double>(0.0);
|
||||
final ValueNotifier<bool> failureNotifier =
|
||||
ValueNotifier<bool>(false);
|
||||
Timer? pollingTimer;
|
||||
|
||||
Map<String, dynamic> data = {
|
||||
"macA": blueteethBindController.currentDeviceMac,
|
||||
};
|
||||
|
||||
// 是否是二次点击（有cid表示进行第二阶段）
|
||||
bool isSecondStep =
|
||||
blueteethBindController.cid?.value.isNotEmpty ??
|
||||
false;
|
||||
|
||||
if (isSecondStep) {
|
||||
data["id"] = blueteethBindController.cid!.value;
|
||||
}
|
||||
|
||||
// 发起校准请求
|
||||
requestWithLog(
|
||||
logTitle: "设备校准",
|
||||
method: MyHttpMethod.post,
|
||||
queryUrl: ServiceConstant.start_calibration,
|
||||
data: {
|
||||
"deviceId":
|
||||
blueteethBindController.currentDeviceMac
|
||||
},
|
||||
queryUrl: queryUrl,
|
||||
data: data,
|
||||
onSuccess: (res) {
|
||||
final ValueNotifier<double> progressNotifier =
|
||||
ValueNotifier<double>(0.0);
|
||||
final ValueNotifier<bool> failureNotifier =
|
||||
ValueNotifier<bool>(false);
|
||||
Timer? pollingTimer;
|
||||
if (!isSecondStep) {
|
||||
// 保存第一次获取的 cid
|
||||
String cid = res.rawResponse.data['cid'];
|
||||
blueteethBindController.cid!.value = cid;
|
||||
}
|
||||
|
||||
// 定义请求函数
|
||||
void requestCalibrationProgress() {
|
||||
String cid = blueteethBindController.cid!.value;
|
||||
String progressUrl =
|
||||
"$serviceAddress$progressApi?id=$cid";
|
||||
requestWithLog(
|
||||
logTitle: "设备校准进度",
|
||||
method: MyHttpMethod.post,
|
||||
queryUrl: ServiceConstant.calibration_process,
|
||||
data: {
|
||||
"deviceId":
|
||||
blueteethBindController.currentDeviceMac
|
||||
},
|
||||
method: MyHttpMethod.get,
|
||||
queryUrl: progressUrl,
|
||||
onSuccess: (res) {
|
||||
double process =
|
||||
(res.data['process'] ?? 0).toDouble();
|
||||
progressNotifier.value = process;
|
||||
final data = res.data;
|
||||
double per = (data['per'] ?? 0).toDouble();
|
||||
int currStep = data['currStep'] ?? -1;
|
||||
bool status = data['status'] ?? false;
|
||||
String tips = data['statusText'] ?? '';
|
||||
|
||||
if (process >= 100) {
|
||||
if (deviceCalibrationController
|
||||
.process.value ==
|
||||
0) {
|
||||
deviceCalibrationController
|
||||
.bed_calibration.value = 1;
|
||||
deviceCalibrationController.updateAll();
|
||||
}
|
||||
if (deviceCalibrationController
|
||||
.process.value ==
|
||||
1) {
|
||||
deviceCalibrationController
|
||||
.position_calibration.value = 1;
|
||||
deviceCalibrationController.updateAll();
|
||||
}
|
||||
deviceCalibrationController.tips.value =
|
||||
tips;
|
||||
// progressNotifier.value =
|
||||
// (res.data['per'] ?? 0) / 100.0;
|
||||
progressNotifier.value = per;
|
||||
|
||||
if (!isSecondStep && per >= 100) {
|
||||
// 第一步完成：仅 per >= 100
|
||||
pollingTimer?.cancel();
|
||||
TopSlideNotification.show(context,
|
||||
text: tips);
|
||||
deviceCalibrationController
|
||||
.process.value = 1;
|
||||
deviceCalibrationController
|
||||
.bed_calibration.value = 1;
|
||||
|
||||
deviceCalibrationController.updateAll();
|
||||
}
|
||||
|
||||
if (isSecondStep &&
|
||||
per >= 100 &&
|
||||
currStep == 5 &&
|
||||
status == true) {
|
||||
// 第二步完成：per >= 100 && currStep == 5 && status == true
|
||||
pollingTimer?.cancel();
|
||||
TopSlideNotification.show(context,
|
||||
text: "设备校准完成".tr);
|
||||
// 可在这里执行校准完成后的业务逻辑更新
|
||||
deviceCalibrationController
|
||||
.bed_calibration.value = 1;
|
||||
deviceCalibrationController
|
||||
.position_calibration.value = 1;
|
||||
deviceCalibrationController
|
||||
.process.value = 1;
|
||||
deviceCalibrationController.complete =
|
||||
true;
|
||||
deviceCalibrationController.updateAll();
|
||||
}
|
||||
},
|
||||
onFailure: (res) {
|
||||
@@ -548,15 +719,15 @@ class _CalibrationPageState extends State<CalibrationPage> {
|
||||
);
|
||||
}
|
||||
|
||||
// 启动轮询
|
||||
pollingTimer =
|
||||
Timer.periodic(Duration(seconds: 2), (timer) {
|
||||
requestCalibrationProgress();
|
||||
});
|
||||
|
||||
// 初始调用一次
|
||||
requestCalibrationProgress();
|
||||
|
||||
// 开始轮询
|
||||
pollingTimer =
|
||||
Timer.periodic(Duration(seconds: 2), (_) {
|
||||
requestCalibrationProgress();
|
||||
});
|
||||
|
||||
// 显示进度弹窗
|
||||
showProgressDialog(
|
||||
context, progressNotifier, failureNotifier);
|
||||
@@ -570,6 +741,7 @@ class _CalibrationPageState extends State<CalibrationPage> {
|
||||
},
|
||||
);
|
||||
},
|
||||
|
||||
colors: [
|
||||
themeController.currentColor.sc1,
|
||||
themeController.currentColor.sc2,
|
||||
|
||||
Reference in New Issue
Block a user