From 07ca6cf5ae1ad63f8ac74dbe943d54fc9bf8b8e5 Mon Sep 17 00:00:00 2001
From: fmk <fengmeikan@hotmail.com>
Date: Wed, 29 Jun 2022 16:13:26 +0800
Subject: [PATCH] =?UTF-8?q?ios=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../area_code_full.json                       |  0
 ios/Runner.xcodeproj/project.pbxproj          | 12 +--
 .../community_view/class_details_video.dart   |  9 ++-
 lib/login/phone_address_page.dart             |  2 +-
 lib/setting/platform_code_page.dart           |  5 +-
 lib/setting/platform_pay_code.dart            |  3 +-
 lib/setting/platform_pay_code_success.dart    |  3 +-
 lib/store/store_order.dart                    | 74 ++++++++-----------
 pubspec.yaml                                  |  1 -
 9 files changed, 50 insertions(+), 59 deletions(-)
 rename assets/{area_code => map_style}/area_code_full.json (100%)

diff --git a/assets/area_code/area_code_full.json b/assets/map_style/area_code_full.json
similarity index 100%
rename from assets/area_code/area_code_full.json
rename to assets/map_style/area_code_full.json
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 19faaafa..4fb9367b 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -616,7 +616,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -666,7 +666,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 2.0.26;
+				MARKETING_VERSION = 2.0.27;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -816,7 +816,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -866,7 +866,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 2.0.26;
+				MARKETING_VERSION = 2.0.27;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -907,7 +907,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -957,7 +957,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 2.0.26;
+				MARKETING_VERSION = 2.0.27;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
diff --git a/lib/community/community_view/class_details_video.dart b/lib/community/community_view/class_details_video.dart
index 62611fde..dcf28316 100644
--- a/lib/community/community_view/class_details_video.dart
+++ b/lib/community/community_view/class_details_video.dart
@@ -4,6 +4,7 @@ import 'package:chewie/src/chewie_progress_colors.dart' as chewie;
 import 'package:flutter/services.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:video_player/video_player.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class ClassDetailsVideo extends StatefulWidget {
   final Function(bool isShowImg) changeShowImg;
@@ -78,8 +79,10 @@ class ClassDetailsVideoState extends State<ClassDetailsVideo> {
         //自动播放
         looping: false,
         //循环播放
-        allowFullScreen: false,
-        // 允许的屏幕睡眠
+        allowFullScreen: true,
+        //允许全屏
+        allowedScreenSleep: true,
+        // 允许屏幕睡眠
         materialProgressColors: chewie.ChewieProgressColors(
           playedColor: Colors.white,
           handleColor: Colors.white,
@@ -97,6 +100,8 @@ class ClassDetailsVideoState extends State<ClassDetailsVideo> {
   @override
   Widget build(BuildContext context) {
     return Container(
+    padding: EdgeInsets.only(top: (Theme.of(context).platform == TargetPlatform.android) ? 0 : 70.h),
+        color: Colors.black,
         key: globalKey,child:(videoPlayerController?.value?.isInitialized ?? false) ? videoWidget(
       MediaQuery.of(context).size.height,
       (MediaQuery.of(context).size.height/videoPlayerController.value.aspectRatio)-43,
diff --git a/lib/login/phone_address_page.dart b/lib/login/phone_address_page.dart
index b7529de7..cd7e50ad 100644
--- a/lib/login/phone_address_page.dart
+++ b/lib/login/phone_address_page.dart
@@ -27,7 +27,7 @@ class _PhoneAddressPage extends State<PhoneAddressPage> {
 
   void areaCode() async {
     var value =
-        await rootBundle.loadString('assets/area_code/area_code_full.json');
+        await rootBundle.loadString('assets/map_style/area_code_full.json');
     areaMap = jsonDecode(value);
     areaMap.forEach((key, value) {
       areaList.add(key);
diff --git a/lib/setting/platform_code_page.dart b/lib/setting/platform_code_page.dart
index 101e9887..5611a7be 100644
--- a/lib/setting/platform_code_page.dart
+++ b/lib/setting/platform_code_page.dart
@@ -253,9 +253,8 @@ class _PlatformCodePage extends State<PlatformCodePage> {
             height: 14.h,
           ),
           Container(
-            margin: EdgeInsets.only(top: 24.h, bottom: 31.h,right: 48.w,left: 48.w),
-            // padding: EdgeInsets.only(left: 48.w, right: 48.w),
-            height: 55.h,
+            margin: EdgeInsets.only(top: 24.h, bottom: 31.h,right: 55.w,left: 55.w),
+            height: 58.h,
             child: PinInputTextField(
               pinLength: 4,
               onChanged: (txt) {
diff --git a/lib/setting/platform_pay_code.dart b/lib/setting/platform_pay_code.dart
index ab3ce56b..6774e731 100644
--- a/lib/setting/platform_pay_code.dart
+++ b/lib/setting/platform_pay_code.dart
@@ -97,8 +97,7 @@ class _PlatformPayCode extends State<PlatformPayCode> {
             ),
           ),
           Container(
-            margin: EdgeInsets.only(top: 24.h, bottom: 31.h),
-            padding: EdgeInsets.only(left: 48.w, right: 48.w),
+            margin: EdgeInsets.only(top: 24.h, bottom: 31.h,right: 35.w,left: 35.w),
             height: 45.h,
             child: PinInputTextField(
               onChanged: (txtCode){
diff --git a/lib/setting/platform_pay_code_success.dart b/lib/setting/platform_pay_code_success.dart
index df75d7f4..8ea2f13b 100644
--- a/lib/setting/platform_pay_code_success.dart
+++ b/lib/setting/platform_pay_code_success.dart
@@ -127,8 +127,7 @@ class _PlatformPayCodeSuccess extends State<PlatformPayCodeSuccess> {
             ),
           ),
           Container(
-            margin: EdgeInsets.only(top: 24.h, bottom: 31.h),
-            padding: EdgeInsets.only(left: 48.w, right: 48.w),
+            margin: EdgeInsets.only(top: 24.h, bottom: 31.h,right: 35.w,left: 35.w),
             height: 45.h,
             child: PinInputTextField(
               onChanged: (txtCode){
diff --git a/lib/store/store_order.dart b/lib/store/store_order.dart
index 0f7a4f8c..158d90ac 100644
--- a/lib/store/store_order.dart
+++ b/lib/store/store_order.dart
@@ -207,17 +207,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-        onWillPop: () async {
-          if (dialogShowing) {
-            debugPrint("ssssasdadsasdadasd");
-            SmartDialog.dismiss();
-            return false;
-          } else {
-            return true;
-          }
-        },
-        child:Container(
+    return Container(
         color: Colors.white,
         child: Stack(
           children: [
@@ -373,36 +363,36 @@ class _StoreOrderPage extends State<StoreOrderPage>
                             EdgeInsets.symmetric(horizontal: 10.w),
                             width: MediaQuery.of(context).size.width,
                             child: Theme(
-                              data: ThemeData(
-                                splashColor: Colors.transparent, // 点击时的水波纹颜色设置为透明
-                                highlightColor: Colors.transparent, // 点击时的背景高亮颜色设置为透明
-                              ),
-                              child: TabBar(
-                              controller: tabcontroller,
-                              automaticIndicatorColorAdjustment: true,
-                              isScrollable: true,
-                              indicatorWeight: 3,
-                              indicatorColor: Color(0xFF32A060),
-                              labelPadding: EdgeInsets.only(
-                                left: 8.w,
-                                right: 8.w,
-                              ),
-                              indicatorSize: TabBarIndicatorSize.label,
-                              unselectedLabelStyle: TextStyle(
-                                fontSize: 15.sp,
-                                fontWeight: FontWeight.w400,
-                              ),
-                              labelStyle: TextStyle(
-                                color: Colors.black,
-                                fontSize: 18.sp,
-                                fontWeight: FontWeight.bold,
-                              ),
-                              labelColor: Colors.black,
-                              tabs: [
-                                MyTab(text: S.of(context).diandan),
-                                // MyTab(text: ""),
-                              ],
-                            )),
+                                data: ThemeData(
+                                  splashColor: Colors.transparent, // 点击时的水波纹颜色设置为透明
+                                  highlightColor: Colors.transparent, // 点击时的背景高亮颜色设置为透明
+                                ),
+                                child: TabBar(
+                                  controller: tabcontroller,
+                                  automaticIndicatorColorAdjustment: true,
+                                  isScrollable: true,
+                                  indicatorWeight: 3,
+                                  indicatorColor: Color(0xFF32A060),
+                                  labelPadding: EdgeInsets.only(
+                                    left: 8.w,
+                                    right: 8.w,
+                                  ),
+                                  indicatorSize: TabBarIndicatorSize.label,
+                                  unselectedLabelStyle: TextStyle(
+                                    fontSize: 15.sp,
+                                    fontWeight: FontWeight.w400,
+                                  ),
+                                  labelStyle: TextStyle(
+                                    color: Colors.black,
+                                    fontSize: 18.sp,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                  labelColor: Colors.black,
+                                  tabs: [
+                                    MyTab(text: S.of(context).diandan),
+                                    // MyTab(text: ""),
+                                  ],
+                                )),
                           ),
                         ),
                       ),
@@ -550,7 +540,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
               ),
             ),
           ],
-        )));
+        ));
   }
 
   ///领取优惠券
diff --git a/pubspec.yaml b/pubspec.yaml
index b6225673..e29f45e9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -111,7 +111,6 @@ flutter:
     - assets/image/2x/
     - assets/image/3x/
     - assets/map_style/
-    - asstes/area_code/
     - assets/riv/
     - assets/svg/
   #    - assets/fonts/