diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 3c472b9..33b6059 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +#distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https://mirrors.cloud.tencent.com/gradle/gradle-7.5-all.zip diff --git a/lib/pages/practice/bloc/topic_picture_bloc.dart b/lib/pages/practice/bloc/topic_picture_bloc.dart index 807cc9c..59d46d5 100644 --- a/lib/pages/practice/bloc/topic_picture_bloc.dart +++ b/lib/pages/practice/bloc/topic_picture_bloc.dart @@ -92,11 +92,14 @@ class TopicPictureBloc extends Bloc { _isResultSoundPlaying = false; if (_forbiddenWhenCorrect) { _forbiddenWhenCorrect = false; - // 答对后自动翻页 - pageController.nextPage( - duration: const Duration(milliseconds: 500), - curve: Curves.ease, - ); + debugPrint('播放完成后解除禁止'); + if (event == PlayerState.completed) { + // 答对后且播放完自动翻页 + pageController.nextPage( + duration: const Duration(milliseconds: 500), + curve: Curves.ease, + ); + } } } } else { @@ -286,7 +289,11 @@ class TopicPictureBloc extends Bloc { } void _playResultSound(bool isCorrect) async { - await audioPlayer.stop(); + // await audioPlayer.stop(); + if (audioPlayer.state == PlayerState.playing && _isResultSoundPlaying == false) { + _voicePlayState = VoicePlayState.stop; + } + debugPrint("_playResultSound isCorrect=$isCorrect"); _isResultSoundPlaying = true; _forbiddenWhenCorrect = isCorrect; if (isCorrect) { diff --git a/lib/pages/shop/home/shop_home_page.dart b/lib/pages/shop/home/shop_home_page.dart index 56f44f7..638b19e 100644 --- a/lib/pages/shop/home/shop_home_page.dart +++ b/lib/pages/shop/home/shop_home_page.dart @@ -68,8 +68,8 @@ class _ShopHomeView extends StatelessWidget { gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, childAspectRatio: 2, - mainAxisSpacing: 14.h, - crossAxisSpacing: 6.w, + mainAxisSpacing: 16.h, + crossAxisSpacing: 12.w, ), itemBuilder: (BuildContext context, int index) { final productEntity = bloc.productDatas[index]; diff --git a/lib/pages/shop/home/widgets/product_item.dart b/lib/pages/shop/home/widgets/product_item.dart index 17c1f29..6c92213 100644 --- a/lib/pages/shop/home/widgets/product_item.dart +++ b/lib/pages/shop/home/widgets/product_item.dart @@ -18,11 +18,10 @@ class ProductItem extends StatelessWidget { border: Border.all(width: 1.0, color: Colors.black)), padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 16.h), child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Container( width: 124.w, // 图片宽度 - height: 124.h, // 图片高度 + height: 124.w, // 图片高度 decoration: BoxDecoration( borderRadius: BorderRadius.circular(5), // 圆角为5 diff --git a/lib/pages/shopping/view.dart b/lib/pages/shopping/view.dart index 1ef973b..de81065 100644 --- a/lib/pages/shopping/view.dart +++ b/lib/pages/shopping/view.dart @@ -85,7 +85,7 @@ class _ShoppingView extends StatelessWidget { children: [ Container( width: 210.w, // 图片宽度 - height: 210.h, // 图片高度 + height: 210.w, // 图片高度 decoration: BoxDecoration( borderRadius: BorderRadius.circular(5.w), // 圆角为5 diff --git a/lib/pages/user/user_page.dart b/lib/pages/user/user_page.dart index 34c7dcc..5c73518 100644 --- a/lib/pages/user/user_page.dart +++ b/lib/pages/user/user_page.dart @@ -107,7 +107,7 @@ class _UserView extends StatelessWidget { ), 14.horizontalSpace, Offstage( - offstage: user.effectiveDate == null, + offstage: user.effectiveDate == null || AppConfigHelper.shouldHidePay(), child: Image.asset( AssetsConst.icVip, height: 18.h, @@ -116,7 +116,7 @@ class _UserView extends StatelessWidget { ], ), Offstage( - offstage: user.effectiveDate == null, + offstage: user.effectiveDate == null || AppConfigHelper.shouldHidePay(), child: Row( children: [ Text(