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

# Conflicts:
#	lib/pages/tabs/page4_myMsics_new.dart

lib/components/UserInfo.dart

@@ -99,10 +99,10 @@ class UserInfo {
         copyright_info = '© ' + qx_name_long + '城乡融合发展局 四川省踏石科技\n版权所有，' + service_tel.substring(1);
         copyright_info_PinYin = 'YIBIN SANJIANG NEW AREA BLACK SMOKE CAR CAPTURE SYSTEM';
         // 中心地址：
-        // mapPoi = {text: 四川轻化工大学宜宾校区, pt: {latitude: 28.811272454489966, longitude: 104.67718748580859}, uid: f79d3a036020ce5fa3d23041}
-        center_latitude = 28.811272454489966; // 区县中心纬度
-        center_longitude = 104.69745647939359; // 区县中心经度
-        g_zoomLevel = g_zoomLevel_default = 12; //地图默认缩放倍数
+        // 点击底图空白处响应：coordinate = {latitude: 28.822633806922394, longitude: 104.75964294854222}
+        center_latitude = 28.822633806922394; // 区县中心纬度
+        center_longitude = 104.75964294854222; // 区县中心经度
+        g_zoomLevel = g_zoomLevel_default = 13; //地图默认缩放倍数
         break;
       case 511523: // 江安县
         service_tel = '';

lib/components/commonFun.dart

@@ -1,9 +1,13 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:developer' as developer;
 import 'dart:io';
 import 'dart:math';
 
 import 'package:ai_save_account/ai_save_account.dart';
+import 'package:audioplayers/audio_cache.dart';
+import 'package:audioplayers/audioplayers.dart';
+
 import 'package:camera/camera.dart';
 import 'package:convert/convert.dart';
 import 'package:crypto/crypto.dart' as crypto;
@@ -12,11 +16,49 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
-//import '../my_wechat_assets_picker_fix/my_asset_picker_1.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hyzp_ybqx/provider/player_region.dart';
 
 import 'UserInfo.dart';
+import 'dioFun.dart';
+
+////////////////////////////////////////////
+AudioPlayer playerClick;
+AudioPlayer playerClacks;
+AudioPlayer playerVoiceRemind;
+
+myPlayClick() async {
+  if (null == playerClick) {
+    print("myPlayClick first by load mp3 file");
+    playerClick = await AudioCache().play('audio/click.mp3');
+  } else {
+    print("myPlayClick resume() from cache");
+    playerClick.seek(Duration(milliseconds: 0));
+    playerClick.resume();
+  }
+}
+
+myPlayClacks() async {
+  if (null == playerClick) {
+    print("myPlayClick first by load mp3 file");
+    playerClick = await AudioCache().play('audio/clacks.mp3');
+  } else {
+    print("myPlayClick resume() from cache");
+    playerClick.seek(Duration(milliseconds: 0));
+    playerClick.resume();
+  }
+}
+
+myPlayVoiceRemind() async {
+  if (null == playerVoiceRemind) {
+    print("myPlayVoiceRemind first by load mp3 file");
+    playerVoiceRemind = await AudioCache().play('audio/语音提醒.mp3');
+  } else {
+    print("myPlayVoiceRemind resume() from cache");
+    playerVoiceRemind.seek(Duration(milliseconds: 0));
+    playerVoiceRemind.resume();
+  }
+}
 
 ////////////////////////////////////////////
 // begin hyzp_ybqx-Commit022-区县切换新方法-OK
@@ -71,7 +113,51 @@ const serviceUrl_ybqx_media = 'http://125.64.218.67:9906/';
 // 2、新增sip参数，0表示市级平台，1表示区县平台。之前是通过不同端口来分别访问市级和区县的，因缩减了我们的端口数，现在统一使用1个端口，通过sip参数来区分市级和区县
 const String setSphericalCameraUrl = 'http://125.64.218.67:9903/'; //新版的
 const int g_sip = 1; // 新增sip参数，0表示市级平台，1表示区县平台。
-bool g_bVoiceRemind = false;  // 用户设置是否开启语音提醒
+
+///用于定时提醒的变量和函数
+//获取待审核黑烟车记录
+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();
+    }
+  }
+}
+
+///用于定时提醒的变量和函数
 
 // {
 //     "ret": 200,

lib/components/hyxx_data_handle.dart

@@ -447,9 +447,6 @@ List listGetTsjj = [];
 //获取指定id的抓拍记录列表存入listGetZpjl
 List listGetZpjl = [];
 
-//获取待审核黑烟车记录
-List listReviewed = [];
-
 //workflow	整型	审核状态: 1=>待审 | 2=>已初审 | 999=>已复审 | 1000=>非黑烟车
 Map<int, String> mapAuditStatus = {
   1: "待审",