From 22b7d4da737cd287f8a313069243e2fbef15b1f8 Mon Sep 17 00:00:00 2001 From: Key Date: Mon, 19 Jun 2023 17:09:38 +0800 Subject: [PATCH] feat: user, api path --- android/app/build.gradle | 4 ++-- android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt | 2 +- lib/common/extension/string_extension.dart | 10 ++++++---- lib/login/loginpage/bloc/login_state.dart | 4 +++- lib/network/api.dart | 26 ++++++++++++++++++++++++-- lib/network/basic_configuration.dart | 8 ++------ lib/route/route.dart | 8 ++++++-- lib/user/bloc/user_bloc.dart | 13 +++++++++++++ lib/user/bloc/user_event.dart | 4 ++++ lib/user/bloc/user_state.dart | 6 ++++++ lib/user/user_page.dart | 18 ++++++++++++++++++ 11 files changed, 85 insertions(+), 18 deletions(-) create mode 100644 lib/user/bloc/user_bloc.dart create mode 100644 lib/user/bloc/user_event.dart create mode 100644 lib/user/bloc/user_state.dart create mode 100644 lib/user/user_page.dart diff --git a/android/app/build.gradle b/android/app/build.gradle index ca4f22f..278de80 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - namespace "com.kouyuxingqiu.wowenglish" + namespace "com.kouyuxingqiu.wow_english" // compileSdkVersion flutter.compileSdkVersion compileSdkVersion 33 // 展示没有ndk需求 @@ -46,7 +46,7 @@ android { } defaultConfig { - applicationId "com.kouyuxingqiu.wowenglish" + applicationId "com.kouyuxingqiu.wow_english" //minSdkVersion flutter.minSdkVersion //targetSdkVersion flutter.targetSdkVersion minSdkVersion 23 diff --git a/android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt b/android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt index f7fa602..4a5cd2d 100644 --- a/android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt +++ b/android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt @@ -1,4 +1,4 @@ -package com.kouyuxingqiu.wowenglish +package com.kouyuxingqiu.wow_english import io.flutter.embedding.android.FlutterActivity diff --git a/lib/common/extension/string_extension.dart b/lib/common/extension/string_extension.dart index 2536904..9d472c3 100644 --- a/lib/common/extension/string_extension.dart +++ b/lib/common/extension/string_extension.dart @@ -1,9 +1,11 @@ -const String _assetImagePrefix = "assets/images/"; - /// 资源类扩展方法 extension AssetExtension on String { + static const String _assetImagePrefix = "assets/images/"; + /// 图片url String get assetImg => _assetImagePrefix + this; - String get assetPng => 'assets/images/$this.png'; - String get assetGif => 'assets/images/$this.gif'; + + String get assetPng => '$assetImg.png'; + + String get assetGif => '$assetImg.gif'; } diff --git a/lib/login/loginpage/bloc/login_state.dart b/lib/login/loginpage/bloc/login_state.dart index b824b30..42da334 100644 --- a/lib/login/loginpage/bloc/login_state.dart +++ b/lib/login/loginpage/bloc/login_state.dart @@ -13,4 +13,6 @@ class SmsSendTypeChangeState extends LoginState {} ///是否同意协议 class AgreementTypeChangeState extends LoginState {} ///登陆请求结果 -class LoginResultChangeState extends LoginState {} +class LoginResultChangeState extends LoginState { + +} diff --git a/lib/network/api.dart b/lib/network/api.dart index 98cf196..65f2840 100644 --- a/lib/network/api.dart +++ b/lib/network/api.dart @@ -1,3 +1,25 @@ class Api { - static const String testApi = 'home/courseLesson'; -} \ No newline at end of file + /// app初始化配置信息 + // GET /system/app/config + // 接口地址：https://app.apifox.com/link/project/2684751/apis/api-89897678 + static const String appConfig = '/system/app/config'; + + /// 登陆 + static const String login = 'login'; + + /// 登出 + static const String logout = 'logout'; + + /// 发送验证码 + static const String sendSmsCode = '/system/send/code'; + + /// 课程模块 + // GET /home/courseModule + // 接口地址：https://app.apifox.com/link/project/2684751/apis/api-89897663 + static const String courseModule = '/home/courseModule'; + + /// 课程列表 + // GET /home/courseLesson + // 接口地址：https://app.apifox.com/link/project/2684751/apis/api-89897662 + static const String courseLesson = '/home/courseLesson'; +} diff --git a/lib/network/basic_configuration.dart b/lib/network/basic_configuration.dart index ed65158..505f859 100644 --- a/lib/network/basic_configuration.dart +++ b/lib/network/basic_configuration.dart @@ -1,8 +1,6 @@ enum DevelopEvent { ///开发环境 dev, - ///测试环境 - test, ///正式环境 formal } @@ -19,9 +17,7 @@ class BasicConfigurationManager { BasicConfigurationManager._internal(){ DevelopEvent developType = DevelopEvent.dev; - if (developType == DevelopEvent.test) { - baseUrl = 'http://wow-app.dev.kouyuxingqiu.com'; - } else if(developType == DevelopEvent.dev) { + if(developType == DevelopEvent.dev) { baseUrl = 'http://wow-app.dev.kouyuxingqiu.com'; } else { baseUrl = 'http://wow-app.dev.kouyuxingqiu.com'; @@ -33,4 +29,4 @@ class BasicConfigurationManager { _instance ??= BasicConfigurationManager._internal(); return _instance!; } -} \ No newline at end of file +} diff --git a/lib/route/route.dart b/lib/route/route.dart index a48edce..89411be 100644 --- a/lib/route/route.dart +++ b/lib/route/route.dart @@ -15,6 +15,7 @@ import 'package:wow_english/shop/exchane/exchange_lesson_page.dart'; import 'package:wow_english/shop/exchangelist/exchange_lesson_list_page.dart'; import 'package:wow_english/shop/home/shop_home_page.dart'; import 'package:wow_english/tab/tab_page.dart'; +import 'package:wow_english/user/user_page.dart'; import 'package:wow_english/video/lookvideo/look_video_page.dart'; @@ -33,6 +34,7 @@ class AppRouteName { static const String reAfter = 'reAfter'; static const String topicPic = 'topicPic'; static const String topicWord = 'topicWord'; + static const String user = 'user'; static const String lookVideo = 'lookVideo'; static const String tab = '/'; } @@ -41,7 +43,7 @@ class AppRouter { static final navigatorKey = GlobalKey(); // App 根节点Context static BuildContext get context => navigatorKey.currentContext!; - + static Route generateRoute(RouteSettings settings) { switch (settings.name) { case AppRouteName.splash: @@ -68,6 +70,8 @@ class AppRouter { return CupertinoPageRoute(builder: (_) => const ExchangeLessonListPage()); case AppRouteName.reAfter: return CupertinoPageRoute(builder: (_) => const RepeatAfterPage()); + case AppRouteName.user: + return CupertinoPageRoute(builder: (_) => const UserPage()); case AppRouteName.topicPic: return CupertinoPageRoute(builder: (_) => const TopicPicturePage()); case AppRouteName.topicWord: @@ -95,4 +99,4 @@ class AppRouter { child: Text('No route defined for ${settings.name}')))); } } -} \ No newline at end of file +} diff --git a/lib/user/bloc/user_bloc.dart b/lib/user/bloc/user_bloc.dart new file mode 100644 index 0000000..377b2aa --- /dev/null +++ b/lib/user/bloc/user_bloc.dart @@ -0,0 +1,13 @@ +import 'package:bloc/bloc.dart'; +import 'package:meta/meta.dart'; + +part 'user_event.dart'; +part 'user_state.dart'; + +class UserBloc extends Bloc { + UserBloc() : super(UserInitial()) { + on((event, emit) { + // TODO: implement event handler + }); + } +} diff --git a/lib/user/bloc/user_event.dart b/lib/user/bloc/user_event.dart new file mode 100644 index 0000000..3dd7c37 --- /dev/null +++ b/lib/user/bloc/user_event.dart @@ -0,0 +1,4 @@ +part of 'user_bloc.dart'; + +@immutable +abstract class UserEvent {} diff --git a/lib/user/bloc/user_state.dart b/lib/user/bloc/user_state.dart new file mode 100644 index 0000000..a2a6220 --- /dev/null +++ b/lib/user/bloc/user_state.dart @@ -0,0 +1,6 @@ +part of 'user_bloc.dart'; + +@immutable +abstract class UserState {} + +class UserInitial extends UserState {} diff --git a/lib/user/user_page.dart b/lib/user/user_page.dart new file mode 100644 index 0000000..6d1e600 --- /dev/null +++ b/lib/user/user_page.dart @@ -0,0 +1,18 @@ +import 'package:flutter/material.dart'; + +import '../common/widgets/we_app_bar.dart'; + +class UserPage extends StatelessWidget { + const UserPage({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: Colors.white, + appBar: WEAppBar( + titleText: '1', + ), + body: Row(), + ); + } +} -- libgit2 0.22.2