feat:增加过渡页&集成串联游戏

吴启风
1 parent 07599105
Showing 19 changed files with 430 additions and 3 deletions
android/app/build.gradle
android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt
android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/methodChannels/GameMethodChannel.kt
android/build.gradle
assets/images/bg_frame_module_pic.png
assets/images/bg_header_sliver.png
assets/images/ic_countdown.png
assets/images/label_module_game.png
assets/images/label_module_study.png
assets/images/pic_module_game.png
assets/images/pic_module_study.png
lib/app/splash_page.dart
lib/pages/moduleSelect/bloc.dart
lib/pages/moduleSelect/event.dart
lib/pages/moduleSelect/state.dart
lib/pages/moduleSelect/view.dart
lib/pages/moduleSelect/widgets/BaseHomeHeaderWidget.dart
lib/pages/shop/home/widgets/product_item.dart
lib/route/route.dart
@@ -29,7 +29,7 @@ android {
     namespace "com.kouyuxingqiu.wow_english"
     // compileSdkVersion flutter.compileSdkVersion
     compileSdkVersion 33
-    // 展示没有ndk需求
+    // 暂时没有ndk需求
     // ndkVersion flutter.ndkVersion
     compileOptions {
@@ -87,4 +87,5 @@ dependencies {
     implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     // kotlin扩展（可选）
     implementation 'com.geyifeng.immersionbar:immersionbar-ktx:3.2.2'
+    implementation 'io.keyss.android.library:bjgame:1.0.2'
 }
@@ -8,6 +8,7 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import com.gyf.immersionbar.BarHide
 import com.gyf.immersionbar.ImmersionBar
+import com.kouyuxingqiu.wow_english.methodChannels.GameMethodChannel
 import com.kouyuxingqiu.wow_english.methodChannels.SingSoungMethodChannel
 import io.flutter.embedding.android.FlutterActivity
@@ -17,7 +18,10 @@ class MainActivity : FlutterActivity() {
         Log.i("WowEnglish", "MainActivity onCreate")
         //隐藏状态栏和导航栏
         ImmersionBar.with(this).hideBar(BarHide.FLAG_HIDE_BAR).init()
-        flutterEngine?.let { SingSoungMethodChannel(this, it) }
+        flutterEngine?.let {
+            SingSoungMethodChannel(this, it)
+            GameMethodChannel(this, it)
+        }
     }
     override fun onResume() {
+package com.kouyuxingqiu.wow_english.methodChannels
+
+import android.content.Intent
+import android.content.Intent.getIntent
+import android.util.Log
+import androidx.core.content.ContextCompat.startActivity
+import com.kouyuxingqiu.wow_english.singsound.SingEngineHelper
+import com.kouyuxingqiu.wow_english.util.GlobalHandler
+import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.MethodChannel
+import org.cocos2dx.cpp.AppActivity
+import java.lang.ref.WeakReference
+
+
+/**
+ * @author:        stay
+ * @date:          2024/4/22 18:36
+ * @description:   游戏方法通道
+ */
+class GameMethodChannel(activity: FlutterActivity, flutterEngine: FlutterEngine) {
+    private var methodChannel: MethodChannel? = null
+    private val TAG = "GameMethodChannel"
+
+    companion object {
+        var channel: WeakReference<GameMethodChannel>? = null
+
+        fun invokeMethod(method: String, arguments: Any?) {
+            channel?.get()?.methodChannel?.invokeMethod(method, arguments)
+        }
+    }
+
+    init {
+        // name需与flutter端一致
+        methodChannel =
+            MethodChannel(
+                flutterEngine.dartExecutor.binaryMessenger,
+                "wow_english/game_method_channel"
+            )
+        methodChannel?.setMethodCallHandler { call, result ->
+            Log.d(TAG, "call=${call.method} ${call.arguments} result=$result")
+            when (call.method) {
+                "openGamePage" -> {
+                    if (call.hasArgument("gameId")) {
+                        val gameId = call.argument<Int>("gameId")
+                        activity.startActivity(
+                            Intent(activity, AppActivity::class.java).apply {
+                            putExtra("game", gameId)
+                        })
+                        result.success(true)
+                    } else {
+                        result.success(false)
+                    }
+                }
+            }
+        }
+        channel = WeakReference(this)
+    }
+}
 \ No newline at end of file
@@ -17,6 +17,7 @@ allprojects {
         google()
         mavenCentral()
         maven { url 'https://repo.singsound.com/repository/singsound_ginger_android_sdk/' }
+        maven { url 'https://maven.zjzxsl.com/repository/android-public/' }
     }
 }
@@ -69,7 +69,7 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
       } else {
         pushNamedAndRemoveUntil(AppRouteName.login, (route) => false);
       }*/
-      pushNamedAndRemoveUntil(AppRouteName.home, (route) => false);
+      pushNamedAndRemoveUntil(AppRouteName.moduleSelect, (route) => false);
     });
   }
+import 'package:bloc/bloc.dart';
+
+import 'event.dart';
+import 'state.dart';
+
+
+class ModuleSelectBloc extends Bloc<ModuleSelectEvent, ModuleSelectState> {
+
+  ModuleSelectBloc() : super(ModuleSelectState().init()) {
+    on<InitEvent>(_init);
+  }
+
+  void _init(InitEvent event, Emitter<ModuleSelectState> emit) async {
+    emit(state.clone());
+  }
+}
+abstract class ModuleSelectEvent {}
+
+class InitEvent extends ModuleSelectEvent {}
 \ No newline at end of file
+class ModuleSelectState {
+  ModuleSelectState init() {
+    return ModuleSelectState();
+  }
+
+  ModuleSelectState clone() {
+    return ModuleSelectState();
+  }
+}
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:wow_english/common/extension/string_extension.dart';
+import 'package:wow_english/pages/moduleSelect/state.dart';
+import 'package:wow_english/pages/moduleSelect/widgets/BaseHomeHeaderWidget.dart';
+
+import 'bloc.dart';
+import 'event.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:wow_english/route/route.dart';
+
+class ModuleSelectPage extends StatelessWidget {
+  const ModuleSelectPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (BuildContext context) => ModuleSelectBloc()..add(InitEvent()),
+      child: Builder(builder: (context) => _HomePageView()),
+    );
+  }
+}
+
+class _HomePageView extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final bloc = BlocProvider.of<ModuleSelectBloc>(context);
+    return BlocListener<ModuleSelectBloc, ModuleSelectState>(
+      listener: (context, state) {},
+      child: _homeView(),
+    );
+  }
+
+  Widget _homeView() => BlocBuilder<ModuleSelectBloc, ModuleSelectState>(
+          builder: (context, state) {
+        final bloc = BlocProvider.of<ModuleSelectBloc>(context);
+        return Scaffold(
+          body: Container(
+            color: Colors.white,
+            child: Column(
+              children: [
+                const BaseHomeHeaderWidget(),
+                Expanded(
+                  child: Center(
+                    child: Row(
+                      children: [
+                        Expanded(
+                          child: GestureDetector(
+                            onTap: () {
+                              pushNamed(AppRouteName.home);
+                            },
+                            child: Column(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                Image.asset('pic_module_study'.assetPng,
+                                    width: 162.5.w, height: 203.5.h),
+                                10.verticalSpace,
+                                Image.asset('label_module_study'.assetPng,
+                                    width: 124.w, height: 34.h),
+                              ],
+                            ),
+                          ),
+                        ),
+                        Expanded(
+                          child: GestureDetector(
+                              onTap: () {
+                                pushNamed(AppRouteName.games);
+                              },
+                              child: Column(
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  Image.asset('pic_module_game'.assetPng,
+                                      width: 162.5.w, height: 203.5.h),
+                                  10.verticalSpace,
+                                  Image.asset('label_module_game'.assetPng,
+                                      width: 124.w, height: 34.h),
+                                ],
+                              )),
+                        ),
+                      ],
+                    ),
+                  ),
+                )
+              ],
+            ),
+          ),
+        );
+      });
+}
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:wow_english/common/extension/string_extension.dart';
+
+import '../../../common/core/user_util.dart';
+import '../../../models/course_entity.dart';
+import '../../../route/route.dart';
+import '../../../utils/image_util.dart';
+import '../../user/bloc/user_bloc.dart';
+
+class BaseHomeHeaderWidget extends StatelessWidget {
+  const BaseHomeHeaderWidget({super.key, this.entity});
+
+  final CourseEntity? entity;
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<UserBloc, UserState>(
+      builder: (context, state) {
+        return Container(
+            height: 45,
+            width: double.infinity,
+            decoration: BoxDecoration(
+              image: DecorationImage(
+                image: AssetImage('bg_header_sliver'.assetPng),
+                fit: BoxFit.cover,
+              ),
+            ),
+            padding: EdgeInsets.symmetric(horizontal: 9.5.w),
+            child: Row(
+              children: [
+                ScreenUtil().bottomBarHeight.horizontalSpace,
+                GestureDetector(
+                  onTap: () => {onUserClick()},
+                  child: Container(
+                    decoration: BoxDecoration(
+                      border: Border.all(
+                        width: 1.0,
+                        color: const Color(0xFF140C10),
+                      ),
+                      borderRadius: BorderRadius.circular(21),
+                    ),
+                    child: CircleAvatar(
+                      radius: 21,
+                      backgroundImage: ImageUtil.getImageProviderOnDefault(
+                          UserUtil.getUser()?.avatarUrl),
+                    ),
+                  ),
+                ),
+                GestureDetector(
+                  onTap: () {
+                    onUserClick();
+                  },
+                  child: Container(
+                    margin: const EdgeInsets.only(left: 7),
+                    padding: const EdgeInsets.all(4.0),
+                    decoration: BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.circular(2),
+                      border: Border.all(
+                          width: 1.0,
+                          color: const Color(0xFF140C10),
+                          style: BorderStyle.solid),
+                    ),
+                    child: Text(
+                      UserUtil.getUser()?.name ?? '未登录',
+                      style: TextStyle(
+                          color: const Color(0xFF333333), fontSize: 16.sp),
+                    ),
+                  ),
+                ),
+                20.horizontalSpace,
+                const Expanded(
+                    child: Text(
+                  "WOW ENGLISH",
+                  textAlign: TextAlign.left,
+                  style: TextStyle(color: Colors.white, fontSize: 30.0),
+                )),
+                Row(children: <Widget>[
+                  Image(
+                      width: 20.0.w,
+                      height: 20.0.h,
+                      image: AssetImage('ic_countdown'.assetPng)),
+                  // 替换为你的图片资源路径
+                  const SizedBox(width: 10.0),
+                  // 图片和文本之间的间隔
+                  const Text('还剩29天'),
+                ]),
+                ScreenUtil().bottomBarHeight.horizontalSpace,
+              ],
+            ));
+      },
+    );
+  }
+}
+
+void onUserClick() {
+  if (UserUtil.token.isEmpty) {
+    pushNamed(AppRouteName.login);
+  } else {
+    pushNamed(AppRouteName.user);
+  }
+}
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:wow_english/models/product_entity.dart';
+
+class ProductItem extends StatelessWidget {
+  const ProductItem({super.key,
+    required this.onTap, this.entity});
+
+  final ProductEntity? entity;
+
+  final Function() onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(10.r),
+        border: Border.all(
+          width: 1.0,
+          color: Colors.black
+        )
+        // image: DecorationImage(
+        //   image: AssetImage(
+        //     ''.assetPng,
+        //   ),
+        //   fit: BoxFit.fill
+        // )
+      ),
+      padding: EdgeInsets.symmetric(horizontal: 16.w,vertical: 16.h),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          // Container(
+          //   width: 124.w,
+          //   decoration: BoxDecoration(
+          //       border: Border.all(
+          //         width: 1.0,
+          //         color: const Color(0xFF333333),
+          //       ),
+          //       image: const DecorationImage(
+          //
+          //         image: NetworkImage(entity?.coverUrl??''),
+          //       )
+          //   ),
+          // ),
+          CachedNetworkImage(
+            imageUrl: entity?.picUrl ?? '',
+            fit: BoxFit.fill,
+            imageBuilder: (context, imageProvider) =>
+                Container(
+                  decoration: BoxDecoration(
+                    border: Border.all(
+                      width: 1.0,
+                      color: const Color(0xFF333333),
+                    ),
+                    borderRadius: BorderRadius.circular(5.0),
+                  ),
+                ),
+            placeholder: (context, url) => CircularProgressIndicator(),
+            // errorWidget: (context, url, error) => const Icon(Icons.error),
+            height: 124.h,
+            width: 124.w,
+          ),
+          21.5.horizontalSpace,
+          Expanded(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              crossAxisAlignment: CrossAxisAlignment.end,
+              children: [
+                Text(
+                  entity?.name ?? '',
+                  softWrap: true,
+                  textAlign: TextAlign.left,
+                  style: TextStyle(
+                      fontSize: 12.sp,
+                      color: const Color(0xFF333333)
+                  ),
+                ),
+                RichText(
+                  text: TextSpan(
+                      children:[
+                        TextSpan(
+                            text: '¥',
+                            style: TextStyle(
+                              fontSize: 21.sp,
+                              color: const Color(0xFFF51A1A),
+                            )
+                        ),
+                        TextSpan(
+                            text: entity?.price?.toString() ?? '',
+                            style: TextStyle(
+                              fontSize: 40.sp,
+                              color: const Color(0xFFF51A1A),
+                            ),
+                        )
+                      ]
+                  ),
+                ),
+                GestureDetector(
+                  onTap: () {
+                    onTap();
+                  },
+                  child: Container(
+                    decoration: BoxDecoration(
+                        color: const Color(0xFFF5C51F),
+                        borderRadius: BorderRadius.circular(5.r),
+                        border: Border.all(
+                          color: const Color(0xFF333333),
+                          width: 1.0,
+                        )
+                    ),
+                    padding: EdgeInsets.symmetric(
+                      vertical: 1.h,
+                      horizontal: 26.5.w,
+                    ),
+                    child: Text(
+                      '立即购买',
+                      style: TextStyle(
+                          fontSize: 10.sp,
+                          color: const Color(0xFF333333)
+                      ),
+                    ),
+                  ),
+                )
+              ],
+            ),
+          )
+        ],
+      ),
+    );
+  }
+}
 \ No newline at end of file
@@ -3,12 +3,14 @@ import &#39;package:flutter/material.dart&#39;;
 import 'package:wow_english/app/splash_page.dart';
 import 'package:wow_english/common/pages/wow_web_page.dart';
 import 'package:wow_english/models/product_entity.dart';
+import 'package:wow_english/pages/games/view.dart';
 import 'package:wow_english/pages/home/home_page.dart';
 import 'package:wow_english/pages/lessons/lesson_page.dart';
 import 'package:wow_english/pages/listen/listen_page.dart';
 import 'package:wow_english/pages/login/forgetpwd/forget_password_home_page.dart';
 import 'package:wow_english/pages/login/loginpage/login_page.dart';
 import 'package:wow_english/pages/login/setpwd/set_pwd_page.dart';
+import 'package:wow_english/pages/moduleSelect/view.dart';
 import 'package:wow_english/pages/practice/topic_picture_page.dart';
 import 'package:wow_english/pages/repeatafter/repeat_after_page.dart';
 import 'package:wow_english/pages/repeataftercontent/repeat_after_content_page.dart';
@@ -32,6 +34,8 @@ import &#39;../utils/log_util.dart&#39;;
 class AppRouteName {
   static const String splash = 'splash';
   static const String login = 'login';
+  static const String moduleSelect = 'moduleSelect';
+  static const String games = 'games';
   static const String home = 'home';
   static const String fogPwd = 'fogPwd';
@@ -88,6 +92,10 @@ class AppRouter {
             transitionsBuilder: (_, __, ___, child) => child);
       case AppRouteName.login:
         return CupertinoPageRoute(builder: (_) => const LoginPage());
+      case AppRouteName.moduleSelect:
+        return CupertinoPageRoute(builder: (_) => const ModuleSelectPage());
+      case AppRouteName.games:
+        return CupertinoPageRoute(builder: (_) => const GamesPage());
       case AppRouteName.home:
         var moduleId = '';
         if (settings.arguments != null) {