diff --git a/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart b/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart index a497cb23..083c08cb 100644 --- a/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart +++ b/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart @@ -51,13 +51,13 @@ class _LockAddressGaoDePageState extends State{ AMapFlutterLocation.setApiKey("11d49b3f4fc09c04a02bbb7500925ba2", "883a3355d2d77c2fdc2667030dc97ffe"); - EasyLoading.show(); - Future.delayed(const Duration(seconds: 10), () { //asynchronous delay - print("10s之后 菊花没有隐藏的话,强制隐藏菊花"); - if(EasyLoading.isShow){ - EasyLoading.dismiss(); - } - }); + // EasyLoading.show(); + // Future.delayed(const Duration(seconds: 10), () { //asynchronous delay + // print("10s之后 菊花没有隐藏的话,强制隐藏菊花"); + // if(EasyLoading.isShow){ + // EasyLoading.dismiss(); + // } + // }); requestLocation(); } @@ -86,7 +86,7 @@ class _LockAddressGaoDePageState extends State{ Future requestLocation() async { location.onLocationChanged().listen((event) { print("listenLocationChanged$event"); - EasyLoading.dismiss(); + // EasyLoading.dismiss(); if (event.isNotEmpty) { setState(() { addressInfo = event; diff --git a/star_lock/lib/mine/mine/starLockMine_page.dart b/star_lock/lib/mine/mine/starLockMine_page.dart index 8c501ec1..f0064a48 100644 --- a/star_lock/lib/mine/mine/starLockMine_page.dart +++ b/star_lock/lib/mine/mine/starLockMine_page.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/common/safetyVerification/entity/Data.dart'; +import 'package:star_lock/tools/toast.dart'; import '../../appRouters.dart'; import '../../app_settings/app_colors.dart'; @@ -135,7 +136,8 @@ class _StarLockMinePageState extends State with BaseWidget { // }), mineItem('images/mine/icon_mine_main_message.png', TranslationLoader.lanKeys!.message!.tr, () { - Navigator.pushNamed(context, Routers.messageListPage); + // Navigator.pushNamed(context, Routers.messageListPage); + Toast.show(msg: "功能暂未开放"); }), //删除“客服”行 // mineItem('images/mine/icon_mine_main_supportStaff.png', diff --git a/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart b/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart index 67f94794..3ff711cb 100644 --- a/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart +++ b/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart @@ -9,6 +9,7 @@ import '../../../app_settings/app_colors.dart'; import '../../../tools/commonItem.dart'; import '../../../tools/submitBtn.dart'; import '../../../tools/titleAppBar.dart'; +import '../../../tools/toast.dart'; import '../../../translations/trans_lib.dart'; class MineSetPage extends StatefulWidget { @@ -99,7 +100,8 @@ class _MineSetPageState extends State { isHaveLine: true, isHaveDirection: true, action: () { - Navigator.pushNamed(context, Routers.authorityManagementPage); + // Navigator.pushNamed(context, Routers.authorityManagementPage); + Toast.show(msg: "功能暂未开放"); }), CommonItem( leftTitel: TranslationLoader.lanKeys!.lockGroup!.tr, @@ -182,13 +184,17 @@ class _MineSetPageState extends State { rightTitle: "", isHaveLine: true, isHaveDirection: true, - action: () {}), + action: () { + Toast.show(msg: "功能暂未开放"); + }), CommonItem( leftTitel: "Google Home", rightTitle: "", isHaveLine: true, isHaveDirection: true, - action: () {}), + action: () { + Toast.show(msg: "功能暂未开放"); + }), // CommonItem(leftTitel:TranslationLoader.lanKeys!.valueAddedServices!.tr, rightTitle:"", isHaveDirection: true, action: (){ // // }), diff --git a/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart b/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart index b8933d26..108a78f0 100644 --- a/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart +++ b/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart @@ -5,6 +5,7 @@ import 'package:get/get.dart'; import '../../../appRouters.dart'; import '../../../app_settings/app_colors.dart'; import '../../../tools/titleAppBar.dart'; +import '../../../tools/toast.dart'; import '../../../translations/trans_lib.dart'; class ValueAddedServicesListPage extends StatefulWidget { @@ -30,50 +31,58 @@ class _ValueAddedServicesPageListState _valueAddedServicesItem( Image.asset('images/mine/icon_mine_valueAddedServices_note.png'), TranslationLoader.lanKeys!.note!.tr, () { - Navigator.pushNamed( - context, Routers.valueAddedServicesNoteAndEmailDetailPage, - arguments: 1); + Toast.show(msg: "功能暂未开放"); + // Navigator.pushNamed( + // context, Routers.valueAddedServicesNoteAndEmailDetailPage, + // arguments: 1); }), _valueAddedServicesItem( Image.asset('images/mine/icon_mine_valueAddedServices_email.png'), TranslationLoader.lanKeys!.mail!.tr, () { - Navigator.pushNamed( - context, Routers.valueAddedServicesNoteAndEmailDetailPage, - arguments: 2); + Toast.show(msg: "功能暂未开放"); + // Navigator.pushNamed( + // context, Routers.valueAddedServicesNoteAndEmailDetailPage, + // arguments: 2); }), _valueAddedServicesItem( Image.asset( 'images/mine/icon_mine_valueAddedServices_realName.png'), TranslationLoader.lanKeys!.realNameAuthentication!.tr, () { - Navigator.pushNamed( - context, Routers.valueAddedServicesRealNamePage); + Toast.show(msg: "功能暂未开放"); + // Navigator.pushNamed( + // context, Routers.valueAddedServicesRealNamePage); }), _valueAddedServicesItem( Image.asset('images/mine/icon_mine_valueAddedServices_vip.png'), TranslationLoader.lanKeys!.advancedFunction!.tr, () { - Navigator.pushNamed( - context, Routers.valueAddedServicesHighFunctionPage); + Toast.show(msg: "功能暂未开放"); + // Navigator.pushNamed( + // context, Routers.valueAddedServicesHighFunctionPage); }), _valueAddedServicesItem( Image.asset('images/mine/icon_mine_valueAddedServices_push.png'), TranslationLoader.lanKeys!.pushMessage!.tr, () { + Toast.show(msg: "功能暂未开放"); // Navigator.pushNamed(context, Routers.gatewayDetailPage); }), _valueAddedServicesItem( Image.asset( 'images/mine/icon_mine_valueAddedServices_checkIn.png'), TranslationLoader.lanKeys!.checkingIn!.tr, () { + Toast.show(msg: "功能暂未开放"); // Navigator.pushNamed(context, Routers.gatewayDetailPage); }), _valueAddedServicesItem( Image.asset( 'images/mine/icon_mine_valueAddedServices_storage.png'), TranslationLoader.lanKeys!.recordsRetention!.tr, () { + Toast.show(msg: "功能暂未开放"); // Navigator.pushNamed(context, Routers.gatewayDetailPage); }), _valueAddedServicesItem( Image.asset('images/mine/icon_mine_valueAddedServices_vip.png'), '可视对讲', () { + Toast.show(msg: "功能暂未开放"); // Navigator.pushNamed(context, Routers.gatewayDetailPage); }), _valueAddedServicesItem( @@ -85,6 +94,7 @@ class _ValueAddedServicesPageListState fontWeight: FontWeight.w600), ), "Amazon Alexa", () { + Toast.show(msg: "功能暂未开放"); // Navigator.pushNamed(context, Routers.gatewayDetailPage); }), _valueAddedServicesItem( @@ -96,6 +106,7 @@ class _ValueAddedServicesPageListState fontWeight: FontWeight.w600), ), "Google Home", () { + Toast.show(msg: "功能暂未开放"); // Navigator.pushNamed(context, Routers.gatewayDetailPage); }), ], diff --git a/star_lock/lib/network/api.dart b/star_lock/lib/network/api.dart index 8fba8fb5..162f36c1 100644 --- a/star_lock/lib/network/api.dart +++ b/star_lock/lib/network/api.dart @@ -1,5 +1,5 @@ abstract class Api { - final String baseUrl = "https://pre.lock.star-lock.cn:8093/api"; //曾工本地 + final String baseUrl = "https://pre.lock.star-lock.cn:8093/api"; //预发布环境 // final String baseUrl = "http://test.lock.star-lock.cn/api"; // 葛工 // final String baseUrl = "https://lock.star-lock.cn/api"; // 测试环境 // final String baseUrl = "http://wenlin.lock.star-lock.cn/api"; //曾工