Commit 50197839933f5b9dedc76ff918d3599a49332069

Authored by wdn127929
1 parent f6e620e4

选择联系人插件 iOS版本修复 && iOS返回手势拦截不生效 && iOS 小程序样式 OK

... ... @@ -449,7 +449,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5504;
CURRENT_PROJECT_VERSION = 5505;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -632,7 +632,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5504;
CURRENT_PROJECT_VERSION = 5505;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -658,7 +658,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5504;
CURRENT_PROJECT_VERSION = 5505;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ...
... ... @@ -52,6 +52,7 @@ import 'package:flutter/material.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:pop_scope_page_transitions/pop_scope_page_transitions.dart';
// import 'package:xbr_gaode_amap/xbr_gaode_amap.dart';
// import 'package:flutter_wxwork/flutter_wxwork.dart';
... ... @@ -180,7 +181,7 @@ class MyAppState extends State<MyApp> {
//初始化微信SDK
_initFluwx() async {
Fluwx fluwx = Fluwx();
Fluwx fluwx = Fluwx();
await fluwx.registerApi(
// appId: "wx85aa3cdd0f791e65",
appId: "wx4d105e36a36a6139",
... ... @@ -297,6 +298,12 @@ class MyAppState extends State<MyApp> {
Locale('en', 'US'),
],
theme: ThemeData(
pageTransitionsTheme: const PageTransitionsTheme(
builders: {
// TargetPlatform.android: PopScopePageTransitionsBuilder(),
TargetPlatform.iOS: PopScopePageTransitionsBuilder(),
},
),
useMaterial3: false,
brightness: Brightness.light,
primaryColor: Colors.white,
... ...
... ... @@ -29,7 +29,7 @@ import 'package:one_key/utils/event_bus.dart';
import '../../app.dart';
import '../../utils/common_utils.dart';
import '../../utils/my_will_pop_scope.dart';
class HandleOnlinePage extends StatefulWidget {
final String rid;
... ... @@ -416,7 +416,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
},
),
body: SafeArea(
child: MyWillPopScope(
child: WillPopScope(
child: Consumer<NotebookDetailModel>(builder: (context, model, _) {
if (model.pageStateChange!= PageState.Success) {
return ExceptionPage(
... ...
... ... @@ -63,7 +63,7 @@ import '../../provider/collect_store_provider.dart';
import '../../provider/notebook_detail_model.dart';
import '../../provider/personnel_provider.dart';
import '../../provider/upload_img_provider.dart';
import '../../utils/my_will_pop_scope.dart';
import '../../utils/screen_util.dart';
import '../../utils/upload_image_util.dart';
import '../../widgets/special_text/my_extended_text_selection_controls.dart';
... ... @@ -2585,7 +2585,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
onTap: () {
FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
},
child:MyWillPopScope(
child:WillPopScope(
child: Scaffold(
backgroundColor: MyColours.color_ffffff,
resizeToAvoidBottomInset: false,
... ...
... ... @@ -62,7 +62,6 @@ import '../../provider/remark_manager_model.dart';
import '../../provider/store_base_info_provider.dart';
import '../../provider/table_manage_model.dart';
import '../../utils/event_bus.dart';
import '../../utils/my_will_pop_scope.dart';
import '../../utils/screen_util.dart';
import '../feast/feast_page.dart';
// import 'package:sipflutterplugin/sipflutterplugin.dart';
... ... @@ -1550,7 +1549,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
collectStoreProvider =
Provider.of<CollectStoreProvider>(context, listen: true);
return MyWillPopScope(
return new WillPopScope(
child: Scaffold(
bottomNavigationBar: BottomNavigationBar(
iconSize: ScreenUtil().setWidth(48),
... ...
... ... @@ -20,7 +20,7 @@ import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
import '../../utils/my_will_pop_scope.dart';
/*
已选菜品
... ... @@ -468,7 +468,7 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> {
}
},
),
body: MyWillPopScope(child: Consumer<OrderFoodProvider>(
body: WillPopScope(child: Consumer<OrderFoodProvider>(
builder: (context, model, _) {
if (model.pageState != PageState.Success) {
return ExceptionPage(
... ...
... ... @@ -19,7 +19,7 @@ import 'package:one_key/widgets/system_app_bar.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import '../../../../utils/my_will_pop_scope.dart';
class SellerMyMarketingRecordsDetailPage extends StatefulWidget {
final String? idstr;
... ... @@ -159,7 +159,7 @@ class _SellerMyMarketingRecordsDetailPageState
}
},
),
body: MyWillPopScope(
body: WillPopScope(
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(30),
... ...
... ... @@ -14,7 +14,7 @@ import 'package:one_key/widgets/system_app_bar.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import '../../utils/my_will_pop_scope.dart';
class InvoiceDetailPage extends StatefulWidget {
final bool? fromNotify;
... ... @@ -472,7 +472,7 @@ class _InvoiceDetailPageState extends State<InvoiceDetailPage> {
}
},
),
body:MyWillPopScope(
body:WillPopScope(
child: SingleChildScrollView(
child: Padding(
padding: EdgeInsets.all(ScreenUtil().setWidth(20)),
... ...
... ... @@ -17,7 +17,7 @@ import 'package:one_key/widgets/system_app_bar.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import '../../utils/my_will_pop_scope.dart';
class OnlineCheckDetailPage extends StatefulWidget {
final String? rid;
... ... @@ -976,7 +976,7 @@ class _OnlineCheckDetailPageState extends State<OnlineCheckDetailPage> {
}
},
),
body: MyWillPopScope(
body: WillPopScope(
child: SingleChildScrollView(
child: Padding(
padding: EdgeInsets.all(ScreenUtil().setWidth(20)),
... ...
... ... @@ -25,7 +25,7 @@ import 'package:one_key/widgets/system_app_bar.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import '../../utils/my_will_pop_scope.dart';
class OnlineCheckEditPage extends StatefulWidget {
final bool fromNotify;
... ... @@ -694,7 +694,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> {
}
},
),
body: MyWillPopScope(
body: WillPopScope(
child: InkWell(
onTap: () {
_focusNode.unfocus();
... ...
... ... @@ -29,7 +29,7 @@ import 'package:one_key/utils/event_bus.dart';
import '../../app.dart';
import '../../utils/common_utils.dart';
import '../../utils/my_will_pop_scope.dart';
class HandleOnlinePageSim extends StatefulWidget {
final String rid;
... ... @@ -417,7 +417,7 @@ class HandleOnlinePageSimState extends State<HandleOnlinePageSim> {
},
),
body: SafeArea(
child: MyWillPopScope(
child: WillPopScope(
child: Consumer<NotebookDetailModel>(builder: (context, model, _) {
if (model.pageStateSim != PageState.Success) {
return ExceptionPage(
... ...
... ... @@ -64,7 +64,7 @@ import '../../pages/online_check/img_picker_widget.dart';
import '../../pages/online_check/photo_view_wiget.dart';
import '../../provider/collect_store_provider.dart';
import '../../provider/upload_img_provider.dart';
import '../../utils/my_will_pop_scope.dart';
import '../../utils/screen_util.dart';
import '../../utils/upload_image_util.dart';
import '../../widgets/special_text/my_extended_text_selection_controls.dart';
... ... @@ -2356,7 +2356,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> {
FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
},
child: SafeArea(
child: MyWillPopScope(
child: WillPopScope(
child: Scaffold(
backgroundColor: MyColours.color_ffffff,
resizeToAvoidBottomInset: false,
... ...
... ... @@ -60,7 +60,7 @@ import '../../provider/notebook_detail_model.dart';
import '../../provider/remark_manager_model.dart';
import '../../provider/store_base_info_provider.dart';
import '../../utils/event_bus.dart';
import '../../utils/my_will_pop_scope.dart';
import '../../utils/screen_util.dart';
// import 'package:sipflutterplugin/sipflutterplugin.dart';
... ... @@ -1660,7 +1660,7 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
// ScreenUtil.init(context, width: 750, height: 1334);
collectStoreProvider =
Provider.of<CollectStoreProvider>(context, listen: true);
return MyWillPopScope(
return WillPopScope(
child: Scaffold(
bottomNavigationBar: BottomNavigationBar(
iconSize: ScreenUtil().setWidth(48),
... ...
import 'dart:developer';
import 'dart:io';
import 'package:flutter/material.dart' as material;
import 'package:flutter/src/widgets/navigator.dart';
import 'package:flutter/src/widgets/routes.dart';
import 'package:flutter/src/widgets/framework.dart';
class MyWillPopScope extends StatefulWidget {
const MyWillPopScope({
super.key,
required this.child,
required this.onWillPop,
});
final Widget child;
final WillPopCallback onWillPop;
@override
State<MyWillPopScope> createState() => _WillPopScopeState();
}
class _WillPopScopeState extends State<MyWillPopScope> {
double startDx = 0;
double endDx = 0;
@override
Widget build(BuildContext context) {
if (Platform.isIOS) {
return material.Listener(
onPointerUp: (details) async {
bool safe1 = startDx < 30;
bool safe2 = endDx < 30;
log(
"\n按下手指位置(${safe1 ? '安全区' : '非安全区'}) => $startDx"
"\n手指抬起位置(${safe2 ? '安全区' : '非安全区'}) => $endDx",
name: "WillPopScope",
);
// 左侧滑动、安全区
if ((endDx > startDx) && safe1 && !safe2) {
log("ios左侧滑动返回被拦截$endDx", name: "WillPopScope");
widget.onWillPop();
}
},
onPointerDown: (details) => startDx = details.localPosition.dx,
onPointerMove: (details) => endDx = details.localPosition.dx,
child: material.WillPopScope(
child: widget.child,
onWillPop: () async => false,
),
);
} else {
widget.onWillPop().then((value) {
log(value ? "android触发滑动返回" : "android滑动返回被拦截", name: "WillPopScope");
});
return material.WillPopScope(
onWillPop: widget.onWillPop,
child: widget.child,
);
}
}
}
... ... @@ -1502,6 +1502,14 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.5.1"
pop_scope_page_transitions:
dependency: "direct main"
description:
name: pop_scope_page_transitions
sha256: "9720e515fd4babbc32ad19621b93b95c61f7e851467b0f469ee834adbff2f22e"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.0.1"
protobuf:
dependency: transitive
description:
... ...
... ... @@ -280,6 +280,7 @@ dependencies:
# flutter_card_swiper: ^6.1.0
# flutter_swiper: ^1.1.6
flutter_swiper_null_safety: ^1.0.2
pop_scope_page_transitions: ^0.0.1
... ...