Merge remote-tracking branch 'Gitea/master' into iOS

lib/components/UserInfo.dart

@@ -1,6 +1,6 @@
 import 'package:hyzp_ybqx/components/commonFun.dart';
 import 'package:hyzp_ybqx/pages/Works/DWDT/dwInfo_data.dart';
-
+import 'package:hyzp_ybqx/services/Storage.dart';
 import 'EncryptUtil.dart';
 import 'commonFun.dart';
 
@@ -25,8 +25,10 @@ class UserInfo {
     setQxInfo(mapUserInfo["qx_code"], mapUserInfo["qx_name"]);
   }
 
-  setQxInfo(String _qx_code, String _qx_name) {
+  setQxInfo(String _qx_code, String _qx_name) async {
     qx_code = int.parse(_qx_code.trim());
+    await Storage.setInt('qx_code', qx_code); // 为启动前台服务，保存 qx_code 到用户配置中
+
     qx_name = _qx_name;
     //区县用户登录接口增加返回字段“sfsy”，0表示正式账号，1表示试用账号
     qx_trial_tag = mapUserInfo['sfsy'];

lib/components/commonFun.dart

@@ -119,43 +119,44 @@ const int g_sip = 1; // 新增sip参数，0表示市级平台，1表示区县平
 List listReviewed = [];
 bool g_bVoiceRemind = false; // 用户设置是否开启语音提醒
 int g_remindGap = 60; // 提醒间隔默认为60S，0表示取消定时提醒
-Timer g_remindTimer; //定时提醒变量
 
-// 设置定时提醒
-setRemindTimer({bool enable = true}) {
-  // 先取消旧的定时任务
-  if (null != g_remindTimer) {
-    g_remindTimer.cancel(); //取消计时器
-  }
-
-  // 设置新的定时任务
-  if (enable && g_remindGap > 0) {
-    ///循环执行定时任务，间隔 g_remindGap 秒
-    g_remindTimer = Timer.periodic(Duration(seconds: g_remindGap), (timer) {
-      ///定时任务
-      doRemind();
-    });
-  }
-}
-
-// 执行语音提醒
-Future doRemind() async {
-  // 获取待审核黑烟车记录
-  if (g_bVoiceRemind) {
-    listReviewed.clear();
-    print("listReviewed = $listReviewed");
-    await getReviewedList(); //注意：访问区县后台接口，需要统一添加区县代码参数
-    print("listReviewed = $listReviewed");
-    // if (g_bVoiceRemind) {
-    // import 'dart:io';
-    // import 'package:audioplayers/audio_cache.dart';
-    // print("播放：语音提醒.mp3");
-    if (listReviewed.length > 0) {
-      // AudioCache().play(File('audio/语音提醒.mp3').path); //语音提醒
-      myPlayVoiceRemind();
-    }
-  }
-}
+// Timer g_remindTimer; //定时提醒变量
+//
+// // 设置定时提醒
+// setRemindTimer({bool enable = true}) {
+//   // 先取消旧的定时任务
+//   if (null != g_remindTimer) {
+//     g_remindTimer.cancel(); //取消计时器
+//   }
+//
+//   // 设置新的定时任务
+//   if (enable && g_remindGap > 0) {
+//     ///循环执行定时任务，间隔 g_remindGap 秒
+//     g_remindTimer = Timer.periodic(Duration(seconds: g_remindGap), (timer) {
+//       ///定时任务
+//       doRemind();
+//     });
+//   }
+// }
+//
+// // 执行语音提醒
+// Future doRemind() async {
+//   // 获取待审核黑烟车记录
+//   if (g_bVoiceRemind) {
+//     listReviewed.clear();
+//     print("listReviewed = $listReviewed");
+//     await getReviewedList(); //注意：访问区县后台接口，需要统一添加区县代码参数
+//     print("listReviewed = $listReviewed");
+//     // if (g_bVoiceRemind) {
+//     // import 'dart:io';
+//     // import 'package:audioplayers/audio_cache.dart';
+//     // print("播放：语音提醒.mp3");
+//     if (listReviewed.length > 0) {
+//       // AudioCache().play(File('audio/语音提醒.mp3').path); //语音提醒
+//       myPlayVoiceRemind();
+//     }
+//   }
+// }
 
 ///用于定时提醒的变量和函数