feat:适配ipad

liangchengyou
1 parent f5fc01c1
Showing 10 changed files with 51 additions and 21 deletions
lib/common/pages/wow_web_page.dart
lib/generated/json/course_entity.g.dart
lib/main.dart
lib/models/course_entity.dart
lib/pages/home/home_page.dart
lib/pages/home/widgets/home_tab_header_widget.dart
lib/pages/home/widgets/home_vidoe_item.dart
lib/pages/listen/widgets/listen_item_widget.dart
lib/pages/login/forgetpwd/bloc/forget_pwd_home_bloc.dart
lib/pages/repeataftercontent/repeat_after_content_page.dart
@@ -61,7 +61,12 @@ class _WowWebViewPageState extends State&lt;WowWebViewPage&gt; {
       appBar: WEAppBar(
         titleText: widget.webViewTitle,
       ),
-      body: WebViewWidget(controller: _controller,),
+      body: Container(
+        color: Colors.white,
+        child: SafeArea(
+          child: WebViewWidget(controller: _controller,),
+        )
+      ),
     );
   }
 }
@@ -86,6 +86,10 @@ CourseCourseLessons $CourseCourseLessonsFromJson(Map&lt;String, dynamic&gt; json) {
 	if (status != null) {
 		courseCourseLessons.status = status;
 	}
+	final String? courseModuleThemeColor = jsonConvert.convert<String>(json['courseModuleThemeColor']);
+	if (courseModuleThemeColor != null) {
+		courseCourseLessons.courseModuleThemeColor = courseModuleThemeColor;
+	}
 	return courseCourseLessons;
 }
@@ -103,5 +107,6 @@ Map&lt;String, dynamic&gt; $CourseCourseLessonsToJson(CourseCourseLessons entity) {
 	data['name'] = entity.name;
 	data['sortOrder'] = entity.sortOrder;
 	data['status'] = entity.status;
+	data['courseModuleThemeColor'] = entity.courseModuleThemeColor;
 	return data;
 }
 \ No newline at end of file
 import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:limiting_direction_csx/limiting_direction_csx.dart';
 import 'package:wow_english/app/app.dart';
-import 'package:flutter/services.dart';
 void main() {
   ///设置设备默认方向
@@ -36,6 +36,7 @@ class CourseCourseLessons {
 	String? name;
 	int? sortOrder;
 	int? status;
+	String? courseModuleThemeColor;
 	CourseCourseLessons();
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:wow_english/app/app.dart';
 import 'package:wow_english/common/core/user_util.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
 import 'package:wow_english/models/course_entity.dart';
@@ -71,10 +71,10 @@ class HomeTabHeaderWidget extends StatelessWidget {
           20.horizontalSpace,
           const Expanded(
               child: Text(
-            'learn wow',
-            textAlign: TextAlign.left,
-            style: TextStyle(color: Colors.white, fontSize: 30.0),
-          )),
+                'learn wow',
+                textAlign: TextAlign.left,
+                style: TextStyle(color: Colors.white, fontSize: 30.0),
+              )),
           IconButton(
               onPressed: () {
                 if (actionTap != null) {
@@ -106,7 +106,7 @@ class HomeTabHeaderWidget extends StatelessWidget {
           // ),
           ScreenUtil().bottomBarHeight.horizontalSpace,
         ],
-      ),
+      )
     );
   }
 }
@@ -12,17 +12,18 @@ class HomeVideoItem extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Padding(
-      padding: EdgeInsets.symmetric(horizontal: 12.w),
+      padding: EdgeInsets.symmetric(horizontal: 12.w,vertical: 24.h),
       child: Container(
         width: 165.w,
         padding: EdgeInsets.symmetric(horizontal: 16.w,vertical: 24.h),
         decoration: BoxDecoration(
           image: DecorationImage(
             image: AssetImage('gendubeij'.assetPng),
+            fit: BoxFit.fill
           ),
         ),
         child: Column(
-          mainAxisAlignment: MainAxisAlignment.spaceAround,
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Expanded(
                 child: Container(
@@ -35,7 +36,7 @@ class HomeVideoItem extends StatelessWidget {
                   ),
                   child: OwImageWidget(
                     name: lessons?.coverUrl??'',
-                    fit: BoxFit.fill,
+                    fit: BoxFit.fitHeight,
                   ),
                 )),
             24.verticalSpace,
@@ -25,7 +25,7 @@ class ListenItemWidget extends StatelessWidget {
               clickEvent.call();
             },
             child: ClipRRect(
-              borderRadius:BorderRadius.circular(90.r),
+              borderRadius:BorderRadius.circular(90.h),
               child: Stack(
                 alignment:Alignment.center,
                 children: [
 import 'package:common_utils/common_utils.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:wow_english/common/request/dao/user_dao.dart';
+import 'package:wow_english/common/request/exception.dart';
+import 'package:wow_english/utils/loading.dart';
 import 'package:wow_english/utils/toast_util.dart';
 part 'forget_pwd_home_event.dart';
@@ -65,5 +68,21 @@ class ForgetPwdHomeBloc extends Bloc&lt;ForgetPwdHomeEvent, ForgetPwdHomeState&gt; {
     emitter(SetPwdCheckCodeState());
   }
-  void _sendSmsCode(SendSmsCodeEvent event, Emitter<ForgetPwdHomeState> emitter) async {}
+  void _sendSmsCode(SendSmsCodeEvent event, Emitter<ForgetPwdHomeState> emitter) async {
+    final phoneNumber = phoneNumController.text;
+    if (!RegexUtil.isMobileExact(phoneNumber)) {
+      showToast('请检查手机号');
+      return;
+    }
+    try {
+      await loading(() async {
+        await UserDao.sendCode(phoneNumber,smsType:'change_passWord');
+      });
+      emitter(SendSmsCodeState());
+    } catch (e) {
+      if(e is ApiException) {
+        showToast(e.message??'网络请求失败');
+      }
+    }
+  }
 }
@@ -39,7 +39,7 @@ class _RepeatAfterContentPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return BlocListener<RepeatAfterContentBloc,RepeatAfterContentState>(
       listener: (context,state){
-        debugPrint('123');
+
       },
       child: _repeatAfterContentView(),
     );
@@ -56,7 +56,6 @@ class _RepeatAfterContentPage extends StatelessWidget {
           children: [
             ///返回
             Positioned(
-              top: 13.h,
               child: GestureDetector(
                 onTap: () => popPage(),
                 child: Image.asset(
@@ -68,7 +67,7 @@ class _RepeatAfterContentPage extends StatelessWidget {
             ),
             ///左侧视频区
             Positioned(
-              top: 53.h,
+              top: 40.h,
               left: 20.w,
               child: Container(
                 width: 285.w,
@@ -85,8 +84,8 @@ class _RepeatAfterContentPage extends StatelessWidget {
             ),
             ///右侧操作区
             Positioned(
-              top: 53.h,
-              right: 25.w,
+              top: 40.h,
+              left: 331.w,
               child: Container(
                 width: 240.w,
                 height: 299.h,
@@ -103,8 +102,9 @@ class _RepeatAfterContentPage extends StatelessWidget {
                 child: bloc.isRecord?_buildLongPressWidget():_buildPlayVideoWidget(),
               ),
             ),
+            ///连接
             Positioned(
-              top: 72.h,
+              top: 59.h,
               left: 274.w,
               child: Container(
                 width: 87.w,
@@ -119,7 +119,7 @@ class _RepeatAfterContentPage extends StatelessWidget {
             ),
             ///跟读
             Positioned(
-              top: 29.h,
+              top: 16.h,
               left: 65.w,
               child: Container(
                 width: 185.w,
@@ -130,6 +130,7 @@ class _RepeatAfterContentPage extends StatelessWidget {
                       fit: BoxFit.fill
                   ),
                 ),
+                alignment: Alignment.center,
                 child: Text(
                   'read title',
                   textAlign: TextAlign.center,