xt / Flutter-ReserveApp · Commits

Go to a project

Commit 6378c8e756b8d4966ed0276b5865ff263068f0f4

Authored by wdn127929
1 parent 2fa6c3db

xiaomi

Inline Side-by-side
Showing 13 changed files with 223 additions and 142 deletions
... ... @@ -12,14 +12,14 @@ if (flutterRoot == null) {
}
def flutterVersionCode = "345"
def flutterVersionCode = "356"
if (flutterVersionCode == null) {
flutterVersionCode = '345'
flutterVersionCode = '356'
}
def flutterVersionName = "3.4.5"
def flutterVersionName = "3.5.6"
if (flutterVersionName == null) {
flutterVersionName = '3.4.5'
flutterVersionName = '3.5.6'
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
... ...
... ... @@ -19,6 +19,7 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE"/>
<application
android:name="io.flutter.app.FlutterApplication"
android:label="一键订"
... ...
... ... @@ -13,14 +13,14 @@ class App {
static double screenHeight;
static double statusBarHeight;
static double bottomBarHeight;
static GetIt getIt = GetIt.instance;
// static GetIt getIt = GetIt.instance;
static bool isInstallWx = false;
static initSp() async {
sp = await SharedPreferences.getInstance();
}
static setupLocator() {
getIt.registerSingleton(NavigateService());
}
// static setupLocator() {
// getIt.registerSingleton(NavigateService());
// }
}
... ...
... ... @@ -9,13 +9,13 @@ import 'package:flutter_bugly/flutter_bugly.dart';
import 'package:flutter_easyrefresh/ball_pulse_footer.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart';
import 'package:flutter_easyrefresh/material_header.dart';
import 'package:flutter_screenutil/screenutil.dart';
import 'package:fluwx/fluwx.dart';
import 'package:one_key/pages/detail/handle_online_page.dart';
import 'package:one_key/pages/home/home_page.dart';
import 'package:one_key/pages/login/first_page.dart';
import 'package:one_key/pages/login/login_page_f.dart';
import 'package:one_key/provider/base_info_provider.dart';
import 'package:one_key/provider/coupon_provider.dart';
import 'package:one_key/provider/create_store_model.dart';
import 'package:one_key/provider/customer_making_provider.dart';
... ... @@ -23,110 +23,97 @@ import 'package:one_key/provider/message_dialog_model.dart';
import 'package:intl/date_symbol_data_local.dart';
import 'package:one_key/provider/message_model.dart';
import 'package:one_key/provider/notebook_detail_model.dart';
import 'package:one_key/provider/online_check_edit_provider.dart';
import 'package:one_key/provider/other_login_provider.dart';
import 'package:one_key/provider/remark_manager_model.dart';
import 'package:one_key/provider/tools.dart';
import 'package:one_key/provider/upload_img_provider.dart';
import 'package:one_key/route/navigator_util.dart';
import 'package:one_key/utils/utils.dart';
import 'package:provider/provider.dart';
import 'package:tpns_flutter_plugin/tpns_flutter_plugin.dart';
import 'app.dart';
import 'net/dio_util.dart';
import 'net/http_url.dart';
import 'pages/login/login_page.dart';
import 'provider/order_food_provider.dart';
import 'provider/user_model.dart';
import 'route/navigate_service.dart';
import 'route/routes.dart';
import 'package:flutter/services.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:permission_handler/permission_handler.dart';
Future<bool> _requestPermissions() async {
Map<Permission, PermissionStatus> permissions = await [
Permission.photos,
Permission.location,
Permission.camera,
Permission.contacts,
Permission.storage,
Permission.notification
].request();
List<bool> results = permissions.values.toList().map((status) {
return status == PermissionStatus.granted;
}).toList();
print(results.toString());
}
// Future<bool> _requestPermissions() async {
// Map<Permission, PermissionStatus> permissions = await [
// Permission.photos,
// Permission.location,
// Permission.camera,
// Permission.contacts,
// Permission.storage,
// Permission.notification
// ].request();
// List<bool> results = permissions.values.toList().map((status) {
// return status == PermissionStatus.granted;
// }).toList();
// print(results.toString());
// }
Future<void> main() async {
FlutterBugly.postCatchedException(() async {
WidgetsFlutterBinding.ensureInitialized();
FluroRouter router = FluroRouter();
Routes.configureRoutes(router);
App.router = router;
App.setupLocator();
LogUtil.init(isDebug: true, tag: 'ONE_KEY');
Provider.debugCheckInvalidValueType = null;
await initializeDateFormatting();
// _requestPermissions();
Utils.changeStatusColor();
// FlutterBugly.postCatchedException(() async {
WidgetsFlutterBinding.ensureInitialized();
// _requestPermissions();
Utils.changeStatusColor();
await App.initSp();
// App.setupLocator();
FluroRouter router = FluroRouter();
Routes.configureRoutes(router);
App.router = router;
await App.initSp();
SystemChrome.setPreferredOrientations(
[DeviceOrientation.portraitUp, DeviceOrientation.portraitDown])
.then((_) {
runApp(MultiProvider(
providers: [
ChangeNotifierProvider<MessageModel>(
create: (_) => MessageModel(),
),
ChangeNotifierProvider<UserModel>(
create: (_) => UserModel(),
),
ChangeNotifierProvider<MessageDialogModel>(
create: (_) => MessageDialogModel()..init(),
),
// ChangeNotifierProvider<OnlineCheckEditProvider>(
// create: (_) => OnlineCheckEditProvider(),
// ),
ChangeNotifierProvider<OrderFoodProvider>(
create: (_) => OrderFoodProvider(),
),
ChangeNotifierProvider<NotebookDetailModel>(
create: (_) => NotebookDetailModel(),
),
ChangeNotifierProvider<CouponProvider>(
create: (_) => CouponProvider(),
),
ChangeNotifierProvider<UploadImageProvider>(
create: (_) => UploadImageProvider(),
),
ChangeNotifierProvider<CreateStoreModel>(
create: (_) => CreateStoreModel(),
),
ChangeNotifierProvider<RemarkManagerModel>(
create: (_) => RemarkManagerModel(),
),
ChangeNotifierProvider<CustomerMakingProvider>(
create: (_) => CustomerMakingProvider(),
),
],
child: MyApp(),
));
});
// await App.initSp();
await AmapService.instance.init(
iosKey: 'e373581528f8fd901c01dfbda236159e',
androidKey: 'dbced781d0acd36184d5b4b54da7188d');
/// 如果你觉得引擎的日志太多, 可以关闭Fluttify引擎的日志
await enableFluttifyLog(false); // 关闭log
FlutterBugly.init(androidAppId: "f71a313f42", iOSAppId: "3089e4587e");
SystemChrome.setPreferredOrientations(
[DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]).then((_) {
runApp(MultiProvider(
providers: [
ChangeNotifierProvider<MessageModel>(
create: (_) => MessageModel(),
),
ChangeNotifierProvider<UserModel>(
create: (_) => UserModel(),
),
ChangeNotifierProvider<MessageDialogModel>(
create: (_) => MessageDialogModel()..init(),
),
// ChangeNotifierProvider<OnlineCheckEditProvider>(
// create: (_) => OnlineCheckEditProvider(),
// ),
ChangeNotifierProvider<OrderFoodProvider>(
create: (_) => OrderFoodProvider(),
),
ChangeNotifierProvider<NotebookDetailModel>(
create: (_) => NotebookDetailModel(),
),
ChangeNotifierProvider<CouponProvider>(
create: (_) => CouponProvider(),
),
ChangeNotifierProvider<UploadImageProvider>(
create: (_) => UploadImageProvider(),
),
ChangeNotifierProvider<CreateStoreModel>(
create: (_) => CreateStoreModel(),
),
ChangeNotifierProvider<RemarkManagerModel>(
create: (_) => RemarkManagerModel(),
),
ChangeNotifierProvider<CustomerMakingProvider>(
create: (_) => CustomerMakingProvider(),
),
],
child: MyApp(),
));
});
// await App.initSp();
/// 如果你觉得引擎的日志太多, 可以关闭Fluttify引擎的日志
// await enableFluttifyLog(false); // 关闭log
// FlutterBugly.init(androidAppId: "f71a313f42", iOSAppId: "3089e4587e");
// });
}
class MyApp extends StatefulWidget {
... ... @@ -145,8 +132,7 @@ class MyAppState extends State<MyApp> {
void initState() {
// TODO: implement initState
super.initState();
initDio();
_initFluwx();
_isFirst();
Utils.changeStatusColor();
// 设置EasyRefresh的默认样式
... ... @@ -181,18 +167,26 @@ class MyAppState extends State<MyApp> {
}
//第一次打开应用
bool _isFirst() {
_isFirst() async {
isFirst = App.sp.getBool("isFirst") ?? true;
if (!isFirst) {
_isLogin();
initDio();
}
}
//判断是否登录
bool _isLogin() {
_isLogin() async {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
userModel.initUser();
isLogin = App.sp.getBool("isLogin") ?? false;
if (isLogin) {
LogUtil.init(isDebug: true, tag: 'ONE_KEY');
Provider.debugCheckInvalidValueType = null;
await initializeDateFormatting();
_initFluwx();
}
}
@override
... ... @@ -201,7 +195,7 @@ class MyAppState extends State<MyApp> {
return MaterialApp(
debugShowCheckedModeBanner: false,
title: '一键订',
navigatorKey: App.getIt<NavigateService>().key,
// navigatorKey: App.getIt<NavigateService>().key,
theme: ThemeData(
brightness: Brightness.light,
primaryColor: Colors.white,
... ...
import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'package:amap_map_fluttify/amap_map_fluttify.dart';
import 'package:common_utils/common_utils.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_app_update/azhon_app_update.dart';
import 'package:flutter_bugly/flutter_bugly.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/models/pull_marketing_by_uid_model.dart';
... ... @@ -66,6 +68,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
// TODO: implement initState
super.initState();
LogUtil.v("home_initState");
// FlutterBugly.init(androidAppId: "f71a313f42", iOSAppId: "3089e4587e");
_initAmap();
AzhonAppUpdate.listener(
// () {
... ... @@ -153,6 +157,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
});
}
_initAmap() async {
await AmapService.instance.init(
iosKey: 'e373581528f8fd901c01dfbda236159e',
androidKey: 'dbced781d0acd36184d5b4b54da7188d');
}
_endTimerSeller() {
if (timerSeller != null) {
timerSeller.cancel();
... ...
... ... @@ -152,6 +152,24 @@ class _FirstPageState extends State<FirstPage> {
),
VEmptyView(16),
Text(
'''为了向您提供更好的服务，我们需要获取以下权限和信息，系统将以弹窗提示征求您的授权。
\n1.地理位置：经授权，为了让您的客户快速地找到您的店铺，我们会收集您店铺的名称、所在位置相关信息（您授权的GPS位置信息，我们仅收集您当时所处的地理位置，但不会将您各时段的位置信息进行结合以判断您的行踪轨迹）来判断您所处的地点。
\n2.通讯录：经授权，为了方便您快速录入客户的姓名、联系电话，在您同意开启通讯录权限后您在录入预订订单时不需再手动输入您通讯录中联系人的信息，用于订单快速生成。
\n3.相册：经授权，当您设置您的通知信息时，“一键订”需要调用基于图片/视频上传的扩展功能：我们会使用您所上传的图片，作为您的形象照片和微信二维码展示，方便客户添加您的微信。
\n4.相机：经授权，当您传送订单水单给客户时，“一键订”需要调用基于摄像头（相机）的扩展功能：您可以使用这项扩展功能完成拍照上传水单传送给客户。
\n5.设备信息：经授权，我们会收集您的设备信息以保障系统运行和您的账号、交易安全。''',
style: TextStyle(
color: MyColours.color_333333,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(28),
),
strutStyle: StrutStyle(
forceStrutHeight: true,
height: 1,
leading: 0.3),
),
VEmptyView(16),
Text(
'我们将通过《隐私政策》向您说明：\n我们在您使用我们的产品与/或服务时如何收集、使用、保存、共享和转让这些信息，以及我们为您提供的访问、更新、控制和保护这些信息的方式。',
style: TextStyle(
color: MyColours.color_333333,
... ...
... ... @@ -2,8 +2,10 @@ import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'package:amap_map_fluttify/amap_map_fluttify.dart';
import 'package:common_utils/common_utils.dart';
import 'package:dio/dio.dart';
import 'package:fluro/fluro.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
... ... @@ -13,12 +15,14 @@ import 'package:one_key/app.dart';
import 'package:one_key/models/checkbind_phone_model.dart';
import 'package:one_key/models/store_info.dart';
import 'package:one_key/net/dio_util.dart';
import 'package:one_key/net/http_url.dart';
import 'package:one_key/provider/create_store_model.dart';
import 'package:one_key/provider/other_login_provider.dart';
import 'package:one_key/provider/user_model.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/route/navigate_service.dart';
import 'package:one_key/route/navigator_util.dart';
import 'package:one_key/route/routes.dart';
import 'package:one_key/utils/dialog_util.dart';
import 'package:one_key/utils/utils.dart';
import 'package:one_key/widgets/MyDivider.dart';
... ... @@ -28,6 +32,7 @@ import 'package:one_key/widgets/round_button.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import 'package:sign_in_with_apple/sign_in_with_apple.dart';
import 'package:intl/date_symbol_data_local.dart';
class LoginPage extends StatefulWidget {
@override
... ... @@ -61,10 +66,12 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
void initState() {
// TODO: implement initState
super.initState();
//第一次打开应用
_checkWechat();
_initFluwx();
// _initFluwx();
isLogin();
WidgetsBinding.instance.addObserver(this);
WidgetsBinding.instance.addPostFrameCallback((_) {
final UserModel userModel =
... ... @@ -79,6 +86,23 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
});
}
//初始化微信SDK
_initFluwx() async {
await registerWxApi(
appId: "wx85aa3cdd0f791e65",
doOnAndroid: true,
doOnIOS: true,
universalLink: "https://xt04.colorcun.com/link/OneKey/");
var result = await isWeChatInstalled;
if (result != null && result) {
App.isInstallWx = true;
} else {
App.isInstallWx = false;
}
setState(() {});
LogUtil.v("is installed $result");
}
//当页面离开时要清除监听器
@override
void dispose() {
... ... @@ -136,7 +160,6 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
//判断是否登录
void isLogin() async {
await App.initSp();
UserModel userModel = Provider.of<UserModel>(context, listen: false);
userModel.initUser();
if (App.sp.getBool("isLogin") ?? false) {
... ... @@ -150,8 +173,12 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
///微信登陆
_wxLogin() {
_wxLogin() async {
await initializeDateFormatting();
sendWeChatAuth(scope: "snsapi_userinfo");
await AmapService.instance.init(
iosKey: 'e373581528f8fd901c01dfbda236159e',
androidKey: 'dbced781d0acd36184d5b4b54da7188d');
}
///获取微信登录code
... ... @@ -237,6 +264,15 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
// }
// }
initDio() {
DioUtil.openDebug();
BaseOptions options = DioUtil.getDefOptions();
options.baseUrl = HttpUrl.server_address;
HttpConfig config = new HttpConfig(
options: options, status: "ret", code: "ret", msg: "msg", data: "data");
DioUtil().setConfig(config);
}
/*
苹果登录获取用户信息
*/
... ... @@ -684,6 +720,9 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
setState(() {
_check = !_check;
});
if (_check) {
initDio();
}
},
child: Container(
alignment: Alignment.topCenter,
... ... @@ -777,6 +816,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
if (!_check) {
DialogUtil.openAlertDialogLogin(context, 500,
onTap: () {
initDio();
Navigator.pop(context);
_wxLogin();
});
... ... @@ -814,6 +854,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
if (!_check) {
DialogUtil.openAlertDialogLogin(context, 500,
onTap: () {
initDio();
Navigator.pop(context);
NavigatorUtil.goAccountLoginPage(context);
});
... ... @@ -860,6 +901,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
if (!_check) {
DialogUtil.openAlertDialogLogin(context, 500,
onTap: () {
initDio();
Navigator.pop(context);
_iosLogin(value);
});
... ...
import 'dart:async';
import 'package:device_info/device_info.dart';
// import 'package:device_info/device_info.dart';
import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:one_key/net/dio_util.dart';
... ... @@ -78,37 +78,37 @@ class _WebPageState extends State<WebPage> {
_init();
}
Future<bool> _checkPermission() async {
DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
if (Platform.isAndroid && androidInfo.version.sdkInt <= 28) {
final status = await Permission.storage.status;
if (status != PermissionStatus.granted) {
final result = await Permission.storage.request();
if (result == PermissionStatus.granted) {
return true;
}
} else {
return true;
}
} else {
return true;
}
return false;
}
// Future<bool> _checkPermission() async {
// DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
// AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
// if (Platform.isAndroid && androidInfo.version.sdkInt <= 28) {
// final status = await Permission.storage.status;
// if (status != PermissionStatus.granted) {
// final result = await Permission.storage.request();
// if (result == PermissionStatus.granted) {
// return true;
// }
// } else {
// return true;
// }
// } else {
// return true;
// }
// return false;
// }
Future<bool> checkPermissionStorage() async {
var status = await Permission.storage.status;
if (!status.isGranted) {
status = await Permission.storage.request();
if (status.isGranted) {
return true;
}
} else {
return true;
}
return false;
}
// Future<bool> checkPermissionStorage() async {
// var status = await Permission.storage.status;
// if (!status.isGranted) {
// status = await Permission.storage.request();
// if (status.isGranted) {
// return true;
// }
// } else {
// return true;
// }
// return false;
// }
_init() async {
// WidgetsFlutterBinding.ensureInitialized();
... ...
import 'dart:io';
import 'package:amap_map_fluttify/amap_map_fluttify.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:flutter_native_image/flutter_native_image.dart';
... ...
import 'package:amap_map_fluttify/amap_map_fluttify.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart';
... ...
... ... @@ -10,6 +10,15 @@ Future<bool> checkContactPermission() async {
}
}
// Future<bool> checkReasPhoneStatePermission() async {
// PermissionStatus permissionStatus = await Permission..status;
// if (permissionStatus == PermissionStatus.granted) {
// return true;
// } else {
// return false;
// }
// }
Future<bool> checkPermission(Permission permissionGroup) async {
PermissionStatus permissionStatus = await permissionGroup.status;
if (permissionStatus == PermissionStatus.granted) {
... ...
... ... @@ -294,7 +294,14 @@ packages:
name: device_info
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.4.2+6"
version: "2.0.3"
device_info_platform_interface:
dependency: transitive
description:
name: device_info_platform_interface
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
dio:
dependency: "direct main"
description:
... ... @@ -383,7 +390,7 @@ packages:
name: flutter_bugly
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.2.9"
version: "0.4.4"
flutter_cache_manager:
dependency: transitive
description:
... ...
... ... @@ -62,7 +62,7 @@ dependencies:
# sqlite数据库
sqflite: ^1.2.2+1
# Bugly
flutter_bugly: ^0.2.8
flutter_bugly: ^0.4.4
# 设置状态栏颜色
flutter_statusbarcolor: ^0.2.3
# 语音播放器
... ... @@ -90,7 +90,7 @@ dependencies:
# 获取应用版本信息
package_info: ^0.4.0+18
# 获取设备信息
device_info: ^0.4.2+4
device_info: ^2.0.3
flutter_sms: ^2.1.1
... ...