From 8cef7b9a71935c8768b7e7c5b43194512230bb2b Mon Sep 17 00:00:00 2001
From: WinUser01 <WinUser01@163.com>
Date: Sat, 23 Apr 2022 20:31:49 +0800
Subject: [PATCH] =?UTF-8?q?hyzp=5Fybqx-Commit128=EF=BC=9A=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E7=A6=81=E7=94=A8=E5=90=8E=EF=BC=8C=E9=87=8D=E5=90=AF?=
 =?UTF-8?q?App=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=8F=90=E9=86=92=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/tabs/Tabs.dart            | 22 ++++++-------
 lib/pages/tabs/page7_setRemind.dart | 48 ++++++++++++++---------------
 2 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/lib/pages/tabs/Tabs.dart b/lib/pages/tabs/Tabs.dart
index 5ed9503..b416482 100644
--- a/lib/pages/tabs/Tabs.dart
+++ b/lib/pages/tabs/Tabs.dart
@@ -95,19 +95,15 @@ class _TabsState extends State<Tabs> {
     // setRemindTimer();
 
     WidgetsFlutterBinding.ensureInitialized();
-    FlutterBackgroundService.initialize(onStart).then((value) async {
-      if (g_bVoiceRemind) {
-        doRemind();
-      } else {
-        while(true) {
-          if (await FlutterBackgroundService().isServiceRunning()) {
-            FlutterBackgroundService().sendData({"action": "stopService"});
-            print("stopService");
-            break;
-          }
-        }
-      }
-    });
+    FlutterBackgroundService.initialize(onStart);
+    if (g_bVoiceRemind) {
+      doRemind();
+    } else {
+      Future.delayed(Duration(seconds: 1), () {
+        FlutterBackgroundService().sendData({"action": "stopService"});
+        print('stopService');
+      });
+    }
   }
 
   @override
diff --git a/lib/pages/tabs/page7_setRemind.dart b/lib/pages/tabs/page7_setRemind.dart
index da87774..7763da5 100644
--- a/lib/pages/tabs/page7_setRemind.dart
+++ b/lib/pages/tabs/page7_setRemind.dart
@@ -38,8 +38,7 @@ class _LoginPageState extends State<page7_setRemind> {
   ////////
   static onNullFun() {}
 
-  Widget _getListTile(
-    title, {
+  Widget _getListTile(title, {
     String leadPath = '',
     Color leadColor,
     Color textColor,
@@ -55,20 +54,20 @@ class _LoginPageState extends State<page7_setRemind> {
         ListTile(
           leading: bBadge
               ? Badge(
-                  position: BadgePosition.topEnd(top: -7, end: -12),
-                  badgeContent: null,
-                  child: Image.asset(
-                    leadPath,
-                    height: ScreenUtil().setHeight(78),
-                    fit: BoxFit.fitHeight,
-                    // color: leadColor,  // 无效
-                  ),
-                )
+            position: BadgePosition.topEnd(top: -7, end: -12),
+            badgeContent: null,
+            child: Image.asset(
+              leadPath,
+              height: ScreenUtil().setHeight(78),
+              fit: BoxFit.fitHeight,
+              // color: leadColor,  // 无效
+            ),
+          )
               : Image.asset(
-                  leadPath,
-                  height: ScreenUtil().setHeight(78),
-                  fit: BoxFit.fitHeight,
-                ),
+            leadPath,
+            height: ScreenUtil().setHeight(78),
+            fit: BoxFit.fitHeight,
+          ),
           title: Text(title, style: TextStyle(fontSize: size, color: textColor)),
           trailing: trailWidget,
           contentPadding: EdgeInsets.symmetric(horizontal: 20.0, vertical: 0),
@@ -122,7 +121,9 @@ class _LoginPageState extends State<page7_setRemind> {
             text: remindGap.toString(),
             // 保持光标在最后
             selection: TextSelection.fromPosition(TextPosition(
-                affinity: TextAffinity.downstream, offset: remindGap.toString().length)))),
+                affinity: TextAffinity.downstream, offset: remindGap
+                .toString()
+                .length)))),
         maxLines: 1,
         keyboardType: TextInputType.number,
         decoration: InputDecoration(
@@ -240,7 +241,9 @@ class _LoginPageState extends State<page7_setRemind> {
                   color: Colors.blueAccent,
                   onTop: () async {
                     if (g_bVoiceRemind != bVoiceRemind || g_remindGap != remindGap) {
-                      if (await FlutterBackgroundService().isServiceRunning()) {
+                      var isRuning = await FlutterBackgroundService().isServiceRunning();
+                      print("isRuning = $isRuning");
+                      if (isRuning) {
                         FlutterBackgroundService().sendData({"action": "stopService"});
                       }
 
@@ -253,13 +256,10 @@ class _LoginPageState extends State<page7_setRemind> {
                       await Storage.setInt('nRemindGap', g_remindGap);
 
                       if (bVoiceRemind) {
-                        while (true) {
-                          var isRunning = await FlutterBackgroundService().isServiceRunning();
-                          if (!isRunning) {
-                            await FlutterBackgroundService.initialize(onStart);
-                            myPlayVoiceRemind();
-                            break;
-                          }
+                        var isRunning = await FlutterBackgroundService().isServiceRunning();
+                        if (!isRunning) {
+                          await FlutterBackgroundService.initialize(onStart);
+                          doRemind();
                         }
                       } else {
                         myPlayClick();