From 9ded5b34fcc6c3f2dc5bf093e88e5cb8d6ea588d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDaisyWu=E2=80=9D?= <“18682150237@163.com”> Date: Wed, 11 Sep 2024 19:48:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A2=9E=E5=80=BC?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=B7=B3=E8=BD=ACGoogle=20Home=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../valueAddedServicesList_logic.dart | 18 ++++++++++++++++++ .../valueAddedServicesList_page.dart | 10 ++++++++-- .../valueAddedServicesList_state.dart | 7 ++++++- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart index 7e4c4298..538f5680 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart'; +import 'package:star_lock/mine/mineSet/mineSet/userSettingInfoEntity.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_state.dart'; import 'package:star_lock/tools/storage.dart'; @@ -23,6 +24,23 @@ class ValueAddedServicesListLogic extends BaseGetXController { } } + //用户信息 + Future userSettingsInfoRequest() async { + final UserSettingInfoEntity entity = + await ApiRepository.to.userSettingsInfo(); + if (entity.errorCode!.codeIsSuccessful) { + //是否打开Amazon Alexa + entity.data!.isAmazonAlexa! == 1 + ? state.isAmazonAlexa.value = true + : state.isAmazonAlexa.value = false; + + //是否打开Google Home + entity.data!.isGoogleHome! == 1 + ? state.isGoogleHome.value = true + : state.isGoogleHome.value = false; + } + } + @override Future onReady() async { super.onReady(); diff --git a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart index 5c80cddb..2c1fa082 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart @@ -116,7 +116,9 @@ class _ValueAddedServicesPageListState fontWeight: FontWeight.w600), ), 'Amazon Alexa', () { - Get.toNamed(Routers.amazonAlexaPage); + Get.toNamed(Routers.amazonAlexaPage, arguments: { + 'isAmazonAlexa': state.isAmazonAlexa.value + }); }), if (!F.isProductionEnv) _valueAddedServicesItem( @@ -129,7 +131,11 @@ class _ValueAddedServicesPageListState ), 'Google Home', () { // EasyLoading.showToast('功能暂未开放', duration: 2000.milliseconds); - Get.toNamed(Routers.googleHomePage); + Get.toNamed(Routers.googleHomePage, arguments: { + 'isGoogleHome': state.isGoogleHome.value + })?.then((Object? value) { + logic.userSettingsInfoRequest(); + }); }), if (!F.isProductionEnv) _valueAddedServicesItem( diff --git a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_state.dart b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_state.dart index fffad321..b15e1407 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_state.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_state.dart @@ -1 +1,6 @@ -class ValueAddedServicesListState {} +import 'package:get/get.dart'; + +class ValueAddedServicesListState { + RxBool isAmazonAlexa = false.obs; //亚马逊Alexa + RxBool isGoogleHome = false.obs; //谷歌Home +}