diff --git a/lib/controller/mh_controller/device_list_controller.dart b/lib/controller/mh_controller/device_list_controller.dart index 3d7e91e..09579f4 100644 --- a/lib/controller/mh_controller/device_list_controller.dart +++ b/lib/controller/mh_controller/device_list_controller.dart @@ -39,8 +39,8 @@ class DeviceListController extends GetControllerEx { getDeviceList() async { try { String search = (model.keyword != null && model.keyword!.isNotEmpty) - ? "?key=${model.keyword}" - : ""; + ? "?key=${model.keyword}&ncs=1" + : "?ncs=1"; ApiResponse apiResponse = ApiResponse(code: -1, msg: "设备.设备列表请求失败".tr); String serviceAddress = ServiceConstant.service_address; String serviceName = ServiceConstant.server_service; diff --git a/lib/pages/mh_page/bluetooth.dart b/lib/pages/mh_page/bluetooth.dart index ee7ced2..e5032b4 100644 --- a/lib/pages/mh_page/bluetooth.dart +++ b/lib/pages/mh_page/bluetooth.dart @@ -172,9 +172,12 @@ class BluetoothPage extends GetView { showUnbindConfirmDialog( context: context, title: "是否进行解绑?", - onConfirm: () { - deviceListController + onConfirm: () async { + await deviceListController .unbindDevice(data); + await deviceListController + .getDeviceList(); + Get.toNamed("/homePage"); // 执行解绑逻辑 }, onCancel: () { @@ -186,10 +189,14 @@ class BluetoothPage extends GetView { showDeleteDeviceConfirmDialog( context: context, title: "是否进行删除?", - onConfirm: () { - deviceListController.unbindDevice( + onConfirm: () async { + await deviceListController + .unbindDevice( data, ); + await deviceListController + .getDeviceList(); + Get.toNamed("/homePage"); }, onCancel: () { // 点击取消后的逻辑 diff --git a/lib/routers/mh_routers.dart b/lib/routers/mh_routers.dart index 14310bb..2c9c22f 100644 --- a/lib/routers/mh_routers.dart +++ b/lib/routers/mh_routers.dart @@ -24,6 +24,7 @@ import 'package:vbvs_app/pages/mh_page/device_people_info.dart'; import 'package:vbvs_app/pages/mh_page/device_share_page.dart'; import 'package:vbvs_app/pages/mh_page/edit_bed.dart'; import 'package:vbvs_app/pages/mh_page/help/article.dart'; +import 'package:vbvs_app/pages/mh_page/homepage/new_Home_page.dart'; import 'package:vbvs_app/pages/mh_page/user/page/edit_userinfo_page.dart'; import 'package:vbvs_app/pages/mh_page/experience_store_page.dart'; import 'package:vbvs_app/pages/mh_page/issue_list_page.dart'; @@ -49,6 +50,7 @@ ThemeController themeController = Get.find(); var mhroutes = { "/mianPageBottomChange": (contxt) => MainPageBBottomChange(), + "/homePage": (context) => NewHomePage(), "/homeDeviceType": (contxt) => HomeDeviceType(), "/editUserInfoPage": (contxt) => EditUserPage(), "/peopleInfoPage": (contxt, {arguments}) => PeopleInfoPage(