xt / Flutter-ReserveApp · Commits

Go to a project

Commit b3edc0ecd4e11d9c6f39bb3bb677e210089f3181

Authored by wdn127929
1 parent bdb253e0
build: skipped

华为隐私审核修改---同小米

Inline Side-by-side
Showing 5 changed files with 152 additions and 52 deletions
... ... @@ -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());
// }
}
... ...
... ... @@ -46,21 +46,21 @@ 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 {
... ... @@ -68,12 +68,12 @@ Future<void> main() async {
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();
// App.setupLocator();
// LogUtil.init(isDebug: true, tag: 'ONE_KEY');
// Provider.debugCheckInvalidValueType = null;
// await initializeDateFormatting();
// // _requestPermissions();
// Utils.changeStatusColor();
await App.initSp();
SystemChrome.setPreferredOrientations(
... ... @@ -122,18 +122,18 @@ Future<void> main() async {
));
});
// await App.initSp();
await AmapLocation.instance.updatePrivacyShow(true);
await AmapLocation.instance.updatePrivacyAgree(true);
await AmapService.instance.init(
iosKey: '24fe3a700e69114a4328d4e46823dcda',
androidKey: '13464ddadd6a5d825e79f90e10ba72d2');
// await AmapLocation.instance.updatePrivacyShow(true);
// await AmapLocation.instance.updatePrivacyAgree(true);
// await AmapService.instance.init(
// iosKey: '24fe3a700e69114a4328d4e46823dcda',
// androidKey: '13464ddadd6a5d825e79f90e10ba72d2');
await AmapLocation.instance.init(
iosKey: '24fe3a700e69114a4328d4e46823dcda',
);
// await AmapLocation.instance.init(
// iosKey: '24fe3a700e69114a4328d4e46823dcda',
// );
/// 如果你觉得引擎的日志太多, 可以关闭Fluttify引擎的日志
await enableFluttifyLog(false); // 关闭log
// await enableFluttifyLog(false); // 关闭log
// FlutterBugly.init(androidAppId: "f71a313f42", iOSAppId: "3089e4587e");
});
}
... ... @@ -154,13 +154,13 @@ class MyAppState extends State<MyApp> {
void initState() {
// TODO: implement initState
super.initState();
initDio();
_initFluwx();
// initDio();
// _initFluwx();
_isFirst();
Utils.changeStatusColor();
// Utils.changeStatusColor();
// 设置EasyRefresh的默认样式
EasyRefresh.defaultHeader = MaterialHeader();
EasyRefresh.defaultFooter = BallPulseFooter();
// EasyRefresh.defaultHeader = MaterialHeader();
// EasyRefresh.defaultFooter = BallPulseFooter();
}
//初始化微信SDK
... ... @@ -179,7 +179,7 @@ class MyAppState extends State<MyApp> {
LogUtil.v("is installed $result");
}
//初始化dio
//初始化dio
initDio() {
DioUtil.openDebug();
BaseOptions options = DioUtil.getDefOptions();
... ... @@ -187,18 +187,46 @@ class MyAppState extends State<MyApp> {
HttpConfig config = new HttpConfig(
options: options, status: "ret", code: "ret", msg: "msg", data: "data");
DioUtil().setConfig(config);
_initAmap();
}
_initAmap() async {
await AmapLocation.instance.updatePrivacyShow(true);
await AmapLocation.instance.updatePrivacyAgree(true);
await AmapService.instance.init(
iosKey: '24fe3a700e69114a4328d4e46823dcda',
androidKey: '13464ddadd6a5d825e79f90e10ba72d2');
await AmapLocation.instance.init(
iosKey: '24fe3a700e69114a4328d4e46823dcda',
);
}
//第一次打开应用
bool _isFirst() {
_isFirst() async {
isFirst = App.sp.getBool("isFirst") ?? true;
if (!isFirst) {
_isLogin();
await _ontherInit();
}
}
_ontherInit() async {
initDio();
await _initFluwx();
LogUtil.init(isDebug: true, tag: 'ONE_KEY');
Provider.debugCheckInvalidValueType = null;
await initializeDateFormatting();
// 设置EasyRefresh的默认样式
EasyRefresh.defaultHeader = MaterialHeader();
EasyRefresh.defaultFooter = BallPulseFooter();
_isLogin();
// FlutterBugly.init(androidAppId: "f71a313f42", iOSAppId: "3089e4587e");
}
//判断是否登录
bool _isLogin() {
_isLogin() {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
userModel.initUser();
isLogin = App.sp.getBool("isLogin") ?? false;
... ... @@ -215,7 +243,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:io';
import 'package:amap_map_fluttify/amap_map_fluttify.dart';
import 'package:common_utils/common_utils.dart';
import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
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/flutter_screenutil.dart';
import 'package:fluwx/fluwx.dart';
import 'package:one_key/app.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/route/navigator_util.dart';
... ... @@ -10,6 +18,11 @@ import 'package:one_key/utils/utils.dart';
import 'package:one_key/widgets/MyDivider.dart';
import 'package:one_key/widgets/round_button.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import 'package:intl/date_symbol_data_local.dart';
import '../../net/dio_util.dart';
import '../../net/http_url.dart';
class FirstPage extends StatefulWidget {
FirstPage({Key key}) : super(key: key);
... ... @@ -23,7 +36,62 @@ class _FirstPageState extends State<FirstPage> {
void initState() {
// TODO: implement initState
super.initState();
Utils.changeStatusColor(color: MyColours.color_199095);
// Utils.changeStatusColor(color: MyColours.color_199095);
}
_ontherInit() async {
initDio();
await _initFluwx();
LogUtil.init(isDebug: true, tag: 'ONE_KEY');
Provider.debugCheckInvalidValueType = null;
await initializeDateFormatting();
// 设置EasyRefresh的默认样式
EasyRefresh.defaultHeader = MaterialHeader();
EasyRefresh.defaultFooter = BallPulseFooter();
App.sp.setBool("isFirst", false);
//进入应用
NavigatorUtil.goLoginPage(context);
FlutterBugly.init(androidAppId: "f71a313f42", iOSAppId: "3089e4587e");
}
//初始化微信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;
}
LogUtil.v("is installed $result");
}
//初始化dio
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);
_initAmap();
}
_initAmap() async {
await AmapLocation.instance.updatePrivacyShow(true);
await AmapLocation.instance.updatePrivacyAgree(true);
await AmapService.instance.init(
iosKey: '24fe3a700e69114a4328d4e46823dcda',
androidKey: '13464ddadd6a5d825e79f90e10ba72d2');
await AmapLocation.instance.init(
iosKey: '24fe3a700e69114a4328d4e46823dcda',
);
}
@override
... ... @@ -207,9 +275,10 @@ class _FirstPageState extends State<FirstPage> {
gradientStart: MyColours.color_199095,
gradientEnd: MyColours.color_199095,
onPressed: () {
App.sp.setBool("isFirst", false);
//进入应用
NavigatorUtil.goLoginPage(context);
_ontherInit();
// App.sp.setBool("isFirst", false);
// //进入应用
// NavigatorUtil.goLoginPage(context);
}),
],
),
... ...
... ... @@ -63,7 +63,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
super.initState();
//第一次打开应用
_checkWechat();
// _checkWechat();
isLogin();
WidgetsBinding.instance.addObserver(this);
WidgetsBinding.instance.addPostFrameCallback((_) {
... ... @@ -134,9 +134,8 @@ 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) {
... ... @@ -144,6 +143,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
NavigatorUtil.goHomePage(context);
});
} else {
_checkWechat();
_getWxCode();
}
}
... ...
... ... @@ -836,7 +836,10 @@ class Utils {
}
static String showEndPhone(String phone) {
return '*' + phone.substring(phone.length - 4);
if (phone.length > 4) {
return '*' + phone.substring(phone.length - 4);
}
return phone;
}
static List<String> stringToList(String str) {
... ...