Merge pull request boyan01#2 from boyan01/dev

sounds fix

Author: boyan01

assets/audios/clean.mp3

@@ -131,12 +131,14 @@ class GameControl extends State<Game> with RouteAware {
     return next;
   }
 
+  SoundState get _sound => Sound.of(context);
+
   void rotate() {
     if (_states == GameStates.running && _current != null) {
       final next = _current.rotate();
       if (next.isValidInMatrix(_data)) {
         _current = next;
-        sounds.rotate();
+        _sound.rotate();
       }
     }
     setState(() {});
@@ -149,7 +151,7 @@ class GameControl extends State<Game> with RouteAware {
       final next = _current.right();
       if (next.isValidInMatrix(_data)) {
         _current = next;
-        sounds.move();
+        _sound.move();
       }
     }
     setState(() {});
@@ -162,7 +164,7 @@ class GameControl extends State<Game> with RouteAware {
       final next = _current.left();
       if (next.isValidInMatrix(_data)) {
         _current = next;
-        sounds.move();
+        _sound.move();
       }
     }
     setState(() {});
@@ -177,7 +179,7 @@ class GameControl extends State<Game> with RouteAware {
           _states = GameStates.drop;
           setState(() {});
           await Future.delayed(const Duration(milliseconds: 100));
-          _mixCurrentIntoData(mixSound: sounds.fall);
+          _mixCurrentIntoData(mixSound: _sound.fall);
           break;
         }
       }
@@ -193,7 +195,7 @@ class GameControl extends State<Game> with RouteAware {
       if (next.isValidInMatrix(_data)) {
         _current = next;
         if (enableSounds) {
-          sounds.move();
+          _sound.move();
         }
       } else {
         _mixCurrentIntoData();
@@ -225,7 +227,7 @@ class GameControl extends State<Game> with RouteAware {
     if (clearLines.isNotEmpty) {
       setState(() => _states = GameStates.clear);
 
-      sounds.clear();
+      _sound.clear();
 
       ///消除效果动画
       for (int count = 0; count < 5; count++) {
@@ -325,7 +327,7 @@ class GameControl extends State<Game> with RouteAware {
     if (_states == GameStates.reset) {
       return;
     }
-    sounds.start();
+    _sound.start();
     _states = GameStates.reset;
     () async {
       int line = GAME_PAD_MATRIX_H;
@@ -383,13 +385,13 @@ class GameControl extends State<Game> with RouteAware {
     }
     debugPrint("game states : $_states");
     return GameState(
-        mixed, _states, _level, sounds.muted, _points, _cleared, _next,
+        mixed, _states, _level, _sound.mute, _points, _cleared, _next,
         child: widget.child);
   }
 
   void soundSwitch() {
     setState(() {
-      sounds.muted = !sounds.muted;
+      _sound.mute = !_sound.mute;
     });
   }
 }

assets/audios/drop.mp3

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:tetris/gamer/gamer.dart';
 import 'package:tetris/generated/i18n.dart';
+import 'package:tetris/material/audios.dart';
 import 'package:tetris/panel/page_portrait.dart';
 
 void main() {
@@ -41,7 +42,7 @@ class MyApp extends StatelessWidget {
         primarySwatch: Colors.blue,
       ),
       home: Scaffold(
-        body: Game(child: _HomePage()),
+        body: Sound(child: Game(child: _HomePage())),
       ),
     );
   }

assets/audios/explosion.mp3

@@ -1,72 +1,88 @@
-import 'package:audioplayers/audio_cache.dart';
-import 'package:audioplayers/audioplayers.dart';
+import 'dart:async';
 
-Sounds sounds = Sounds._();
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:soundpool/soundpool.dart';
 
-class Sounds {
-  final _audioPlayer = AudioCache(fixedPlayer: AudioPlayer());
+class Sound extends StatefulWidget {
+  final Widget child;
 
-  bool _initialized = false;
+  const Sound({Key key, this.child}) : super(key: key);
 
-  bool _playing = false;
+  @override
+  SoundState createState() => SoundState();
 
-  bool muted = false;
-
-  Sounds._() {
-    _init();
+  static SoundState of(BuildContext context) {
+    final state = context.ancestorStateOfType(const TypeMatcher<SoundState>());
+    assert(state != null, 'can not find Sound widget');
+    return state;
   }
+}
+
+const _SOUNDS = [
+  'clean.mp3',
+  'drop.mp3',
+  'explosion.mp3',
+  'move.mp3',
+  'rotate.mp3',
+  'start.mp3'
+];
+
+class SoundState extends State<Sound> {
+  Soundpool _pool;
 
-  void _init() async {
-    final player = _audioPlayer.fixedPlayer;
-    player.setReleaseMode(ReleaseMode.STOP);
-    player.audioPlayerStateChangeHandler = (state) {
-      if (state == AudioPlayerState.PLAYING) {
-        player.pause();
-        _initialized = true;
-        player.audioPlayerStateChangeHandler = null;
-      }
-    };
-    await _audioPlayer.play("music.mp3");
+  Map<String, int> _soundIds;
+
+  bool mute = false;
+
+  void _play(String name) {
+    final soundId = _soundIds[name];
+    if (soundId != null && !mute) {
+      _pool.play(soundId);
+    }
   }
 
-  void _play(Duration start, Duration length) async {
-    if (!_initialized || _playing || muted) {
-      return;
+  @override
+  void initState() {
+    super.initState();
+    _pool = Soundpool(streamType: StreamType.music);
+    _soundIds = Map();
+    for (var value in _SOUNDS) {
+      scheduleMicrotask(() async {
+        final data = await rootBundle.load('assets/audios/$value');
+        _soundIds[value] = await _pool.load(data);
+      });
     }
-    _playing = true;
-    final player = _audioPlayer.fixedPlayer;
-    await player.seek(start);
-    await player.resume();
-    await Future.delayed(length);
-    player.pause();
-    _playing = false;
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    _pool.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return widget.child;
   }
 
   void start() {
-    _play(
-        const Duration(milliseconds: 3720), const Duration(milliseconds: 3622));
+    _play('start.mp3');
   }
 
   void clear() {
-    _play(const Duration(milliseconds: 0), const Duration(milliseconds: 767));
+    _play('clean.mp3');
   }
 
   void fall() {
-    _play(
-        const Duration(milliseconds: 1255), const Duration(milliseconds: 354));
-  }
-
-  void gameOver() {
-    _play(
-        const Duration(milliseconds: 8127), const Duration(milliseconds: 1143));
+    _play('drop.mp3');
   }
 
   void rotate() {
-    _play(const Duration(milliseconds: 2247), const Duration(milliseconds: 80));
+    _play('rotate.mp3');
   }
 
   void move() {
-    _play(
-        const Duration(milliseconds: 2908), const Duration(milliseconds: 143));
+    _play('move.mp3');
   }
 }

assets/audios/move.mp3

@@ -18,7 +18,7 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   overlay_support: ^0.0.4
-  audioplayers: ^0.8.0
+  soundpool: ^0.4.1
 
 dev_dependencies:
   flutter_test:
@@ -34,7 +34,7 @@ flutter:
 
   assets:
   - assets/material.png
-  - assets/music.mp3
+  - assets/audios/
   - assets/alipay.jpg
   - assets/wechat.png