feat:更新代码

liangchengyou
1 parent 478f2c8c
Showing 10 changed files with 95 additions and 13 deletions
lib/app/app.dart
lib/app/transition_page.dart → lib/app/splash_page.dart
lib/login/login_page.dart
lib/modes/response_model.dart
lib/modes/response_model.g.dart
lib/network/api.dart
lib/network/basic_configuration.dart
lib/network/network_manager.dart
lib/route/route.dart
lib/widgets/we_app_bar.dart
@@ -2,8 +2,6 @@ import &#39;package:flutter/material.dart&#39;;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:wow_english/app/transition_page.dart';
-import 'package:wow_english/login/login_page.dart';
 import 'package:wow_english/route/route.dart';
 import 'package:wow_english/tab/blocs/tab_bloc.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:wow_english/network/basic_configuration.dart';
 import 'package:wow_english/route/route.dart';
 import 'package:wow_english/widgets/we_app_bar.dart';
-class TransitionPage extends StatelessWidget {
-  const TransitionPage({super.key});
+class SplashPage extends StatelessWidget {
+  const SplashPage({super.key});
   @override
   Widget build(BuildContext context) {
@@ -31,7 +33,11 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
       body: Center(
         child: GestureDetector(
           onTap: (){
-            Navigator.of(context).pushNamed(AppRouteName.login,arguments: {'title':'登陆'});
+            if(BasicConfigurationManager().sessionId!.isNotEmpty) {
+              Navigator.of(context).pushNamedAndRemoveUntil(AppRouteName.tab, (route) => false);
+            } else {
+              Navigator.of(context).pushNamed(AppRouteName.login,arguments: {'title':'登陆'});
+            }
           },
           child: const Text('登陆'),
         ),
@@ -13,7 +13,6 @@ class LoginPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    // TODO: implement build
     return BlocProvider(
       create: (context) => LoginBloc(),
       child: _buildLoginViewWidget(),
@@ -25,7 +24,6 @@ class LoginPage extends StatelessWidget {
       final bloc = BlocProvider.of<LoginBloc>(context);
       return Scaffold(
         appBar: WEAppBar(
-          backgroundColor: Theme.of(context).colorScheme.inversePrimary,
           titleText: title??'',
         ),
         body: Center(
+import 'package:json_annotation/json_annotation.dart';
+
+part 'response_model.g.dart';
+
+@JsonSerializable()
+class ResponseModel {
+  int? code;
+  dynamic data;
+  String? msg;
+
+  ResponseModel(this.code,this.data,this.msg);
+
+  factory ResponseModel.fromJson(Map<String, dynamic> json) => _$ResponseModelFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ResponseModelToJson(this);
+}
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'response_model.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+ResponseModel _$ResponseModelFromJson(Map<String, dynamic> json) =>
+    ResponseModel(
+      json['code'] as int?,
+      json['data'],
+      json['msg'] as String?,
+    );
+
+Map<String, dynamic> _$ResponseModelToJson(ResponseModel instance) =>
+    <String, dynamic>{
+      'code': instance.code,
+      'data': instance.data,
+      'msg': instance.msg,
+    };
 class Api {
-  static const String testApi = 'https://dart.dev';
+  static const String testApi = 'home/courseLesson';
 }
 \ No newline at end of file
+enum DevelopEvent {
+  ///开发环境
+  dev,
+  ///测试环境
+  test,
+  ///正式环境
+  formal
+}
+
+class BasicConfigurationManager {
+  factory BasicConfigurationManager() => _getInstance();
+
+  static BasicConfigurationManager? _instance;
+
+  //服务器地址
+  String? baseUrl;
+  //SessionId
+  String? sessionId;
+
+  BasicConfigurationManager._internal(){
+    DevelopEvent developType = DevelopEvent.dev;
+    if (developType == DevelopEvent.test) {
+      baseUrl = 'http://wow-app.dev.kouyuxingqiu.com';
+    } else if(developType == DevelopEvent.dev) {
+      baseUrl = 'http://wow-app.dev.kouyuxingqiu.com';
+    } else {
+      baseUrl = 'http://wow-app.dev.kouyuxingqiu.com';
+    }
+    sessionId = '';
+  }
+
+  static BasicConfigurationManager _getInstance() {
+    _instance ??= BasicConfigurationManager._internal();
+    return _instance!;
+  }
+}
 \ No newline at end of file
@@ -3,6 +3,7 @@ import &#39;dart:io&#39;;
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:wow_english/network/basic_configuration.dart';
 enum HttpMethod {
   get,
@@ -24,9 +25,10 @@ class DioUtil {
   static BaseOptions getDefOptions() {
     final BaseOptions options = BaseOptions();
-    options.baseUrl = '';
+    options.baseUrl = BasicConfigurationManager().baseUrl??'';
     options.connectTimeout = const Duration(milliseconds: 1000);
     options.receiveTimeout = const Duration(milliseconds: 1000);
+    options.headers['content-type'] = 'application/x-www-form-urlencoded';
     return options;
   }
@@ -41,12 +43,17 @@ class DioUtil {
         required Function errorCallBack,
       }) async{
     try {
+      Map<String, dynamic> headers = <String, dynamic>{};
+
+      if (method == HttpMethod.post) {
+        headers['content-type'] = 'application/x-www-form-urlencoded';
+      }
       Response<dynamic> response;
       response = await _dio.request(
           path,
           data: data??{},
           queryParameters: queryParameters,
-          options: Options(method: method.name),
+          options: Options(method: method.name,headers: headers),
           onSendProgress: onSendProgress,
           onReceiveProgress: onReceiveProgress);
       if (response.statusCode == HttpStatus.ok ||
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:wow_english/app/transition_page.dart';
+import 'package:wow_english/app/splash_page.dart';
 import 'package:wow_english/login/login_page.dart';
 import 'package:wow_english/tab/tab_page.dart';
@@ -21,7 +21,7 @@ class AppRouter {
       case AppRouteName.splash:
         return PageRouteBuilder(
             opaque: false,
-            pageBuilder: (_,__,___) => const TransitionPage(),
+            pageBuilder: (_,__,___) => const SplashPage(),
             transitionDuration: Duration.zero,
             transitionsBuilder: (_, __, ___, child) => child);
       case AppRouteName.login:
@@ -19,7 +19,7 @@ class WEAppBar extends StatelessWidget implements PreferredSizeWidget {
     return AppBar(
       centerTitle: centerTitle,
       title: Text(titleText??''),
-      backgroundColor: backgroundColor,
+      backgroundColor: backgroundColor??Theme.of(context).colorScheme.inversePrimary,
     );
   }