From 740d79d412b16d7a03f46435a66442fa49d2fc20 Mon Sep 17 00:00:00 2001
From: WinUser01 <WinUser01@163.com>
Date: Sat, 23 Apr 2022 13:58:18 +0800
Subject: [PATCH] =?UTF-8?q?hyzp=5Fybqx-Commit124=EF=BC=9A=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8AudioPlayer=20cache=E4=BC=98=E5=8C=96=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E9=80=BB=E8=BE=91=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=A4=9A?=
 =?UTF-8?q?=E6=AC=A1=E6=92=AD=E6=94=BE=E5=90=8E=E6=8A=A5=E9=94=99=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=92=AD=E6=94=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/audio/{yinxiao1064.mp3 => clacks.mp3} | Bin
 assets/audio/click.mp3                       | Bin 0 -> 22208 bytes
 lib/components/commonFun.dart                |  53 +++++++++++++------
 lib/pages/Login/TakePictuer.dart             |   2 +-
 lib/pages/tabs/page7_setRemind.dart          |   4 +-
 pubspec.yaml                                 |  10 ----
 6 files changed, 39 insertions(+), 30 deletions(-)
 rename assets/audio/{yinxiao1064.mp3 => clacks.mp3} (100%)
 create mode 100644 assets/audio/click.mp3

diff --git a/assets/audio/yinxiao1064.mp3 b/assets/audio/clacks.mp3
similarity index 100%
rename from assets/audio/yinxiao1064.mp3
rename to assets/audio/clacks.mp3
diff --git a/assets/audio/click.mp3 b/assets/audio/click.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..cc6480815f95fbee3d27a079b43d3fb66aee4687
GIT binary patch
literal 22208
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

literal 0
HcmV?d00001

diff --git a/lib/components/commonFun.dart b/lib/components/commonFun.dart
index ea22bc3..58ab3f2 100644
--- a/lib/components/commonFun.dart
+++ b/lib/components/commonFun.dart
@@ -6,8 +6,8 @@ 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:audioplayers/audio_cache.dart';
 import 'package:camera/camera.dart';
 import 'package:convert/convert.dart';
 import 'package:crypto/crypto.dart' as crypto;
@@ -16,30 +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 'package:just_audio/just_audio.dart';
 
 import 'UserInfo.dart';
 import 'dioFun.dart';
 
-// final myPlayer = AudioPlayer();
-final myPlayer = AudioCache();
-
-// myPlayMp3({String asset = 'assets/audio/yinxiao1064.mp3'}) {
-//   // myPlayer.setAsset(asset, preload: true).then((value) {
-//   //   myPlayer.play();
-//   // });
-//   // myPlayer.setAsset(asset).then((value) {
-//   //   myPlayer.play();
-//   // });
-// }
+////////////////////////////////////////////
+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();
+  }
+}
 
-myPlayMp3({String asset = 'audio/语音提醒.mp3'}) {
-  myPlayer.play(asset);
+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
@@ -133,7 +152,7 @@ Future doRemind() async {
     // print("播放：语音提醒.mp3");
     if (listReviewed.length > 0) {
       // AudioCache().play(File('audio/语音提醒.mp3').path); //语音提醒
-      myPlayMp3(asset: 'audio/语音提醒.mp3');
+      myPlayVoiceRemind();
     }
   }
 }
diff --git a/lib/pages/Login/TakePictuer.dart b/lib/pages/Login/TakePictuer.dart
index 132dd2d..e4941dd 100644
--- a/lib/pages/Login/TakePictuer.dart
+++ b/lib/pages/Login/TakePictuer.dart
@@ -57,7 +57,7 @@ class _TakePictuerState extends State<TakePictuer> {
     await Future.delayed(Duration(milliseconds: 1000), () {
       print('开始拍照...');
       // AudioCache().play(File('audio/yinxiao1064.mp3').path); //播放咔嚓声
-      myPlayMp3(asset: 'assets/audio/yinxiao1064.mp3'); //播放咔嚓声
+      myPlayClacks(); //播放咔嚓声
       onTakePictureButtonPressed();
     });
   }
diff --git a/lib/pages/tabs/page7_setRemind.dart b/lib/pages/tabs/page7_setRemind.dart
index 048241e..830fcf6 100644
--- a/lib/pages/tabs/page7_setRemind.dart
+++ b/lib/pages/tabs/page7_setRemind.dart
@@ -110,7 +110,7 @@ class _LoginPageState extends State<page7_setRemind> {
       if (bVoiceRemind) {
         print("播放语音提醒");
         // AudioCache().play(File('audio/语音提醒.mp3').path); //语音提醒
-        myPlayMp3(asset: 'audio/语音提醒.mp3');
+        myPlayVoiceRemind();
       }
       getListView();
     });
@@ -164,7 +164,7 @@ class _LoginPageState extends State<page7_setRemind> {
               setRemindTimer(enable: g_bVoiceRemind);
 
               // AudioCache().play(File('audio/yinxiao1064.mp3').path); //音效提醒
-              myPlayMp3(asset: 'assets/audio/yinxiao1064.mp3'); //音效提醒
+              myPlayClacks(); //音效提醒
               Navigator.pop(context);
             },
           ),
diff --git a/pubspec.yaml b/pubspec.yaml
index 9fe459a..4066b53 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -100,16 +100,6 @@ dependencies:
   audioplayers: ^0.16.2
   flutter_background_service: ^0.0.1+21
 
-  # just_audio: ^0.4.0  # 报错
-#  just_audio: ^0.3.4  # OK，不支持中文路径
-  # just_audio: ^0.3.0  # OK
-  # just_audio: ^0.1.0  # OK
-
-  # just_audio: ^0.6.15+1 # 引入该插件编译时报错如下
-  #  Could not determine the dependencies of task ':app:processDebugResources'.
-  #  > Could not resolve all task dependencies for configuration ':app:debugRuntimeClasspath'.
-  #  > Could not resolve androidx.media2:media2-common:[1.1.0-alpha01].
-
   encrypt: ^4.1.0
   device_info: ^1.0.0