sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并代码

Browse Source
This commit is contained in:
魏少阳 2024-04-10 16:04:33 +08:00
parent bf349e6413
commit f6d7fe59c3
2 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
star_lock/images/lan/lan_zh.json
View File

@ -616,7 +616,6 @@
"跳过": "跳过", "跳过": "跳过",
"还未获取到位置信息哦，请耐心等待一下！": "还未获取到位置信息哦，请耐心等待一下！", "还未获取到位置信息哦，请耐心等待一下！": "还未获取到位置信息哦，请耐心等待一下！",
"请填写信息": "请填写信息", "请填写信息": "请填写信息",
<<<<<<< HEAD
"有效期": "有效期", "有效期": "有效期",
"生效时间": "生效时间", "生效时间": "生效时间",
"失效时间": "失效时间", "失效时间": "失效时间",
@ -629,7 +628,7 @@
"请将您的手指按下": "请将您的手指按下", "请将您的手指按下": "请将您的手指按下",
"根据提示，抬起手指后再进行下一次指纹采集": "根据提示，抬起手指后再进行下一次指纹采集", "根据提示，抬起手指后再进行下一次指纹采集": "根据提示，抬起手指后再进行下一次指纹采集",
"添加成功": "添加成功", "添加成功": "添加成功",
"搜索": "搜索" "搜索": "搜索",
"permission_dialog_camera": "相机", "permission_dialog_camera": "相机",
"permission_dialog_photos": "相册", "permission_dialog_photos": "相册",

38
star_lock/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart
View File

@ -1,17 +1,12 @@
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:image_picker/image_picker.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import 'package:star_lock/app_settings/app_colors.dart'; import 'package:star_lock/app_settings/app_colors.dart';
import 'package:star_lock/app_settings/app_settings.dart';
import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_logic.dart'; import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_logic.dart';
import 'package:star_lock/tools/appFirstEnterHandle.dart';
import 'package:star_lock/tools/custom_bottom_sheet.dart'; import 'package:star_lock/tools/custom_bottom_sheet.dart';
import 'package:star_lock/tools/storage.dart';
import '../../../appRouters.dart'; import '../../../appRouters.dart';
import '../../../tools/commonItem.dart'; import '../../../tools/commonItem.dart';
import '../../../tools/customNetworkImage.dart'; import '../../../tools/customNetworkImage.dart';
@ -30,14 +25,6 @@ class _MinePersonInfoPageState extends State<MinePersonInfoPage> {
final state = Get.find<MinePersonInfoLogic>().state; final state = Get.find<MinePersonInfoLogic>().state;
@override @override
<<<<<<< HEAD
=======
initState() {
super.initState();
}
@override
>>>>>>> fa316cb889104cbd0029a178352847359e728a77
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
@ -179,29 +166,6 @@ class _MinePersonInfoPageState extends State<MinePersonInfoPage> {
}); });
} }
<<<<<<< HEAD
Future<void> _checkCameraPermission() async {
var status = await Permission.camera.status;
if (status.isGranted) {
selectCamera();
} else {
_requestCameraPermission();
}
}
Future<void> _checkPhotoPermission() async {
var status = await Permission.photos.status;
if (status.isGranted) {
selectImage();
} else {
_requestPhotoPermission();
}
}
=======
>>>>>>> fa316cb889104cbd0029a178352847359e728a77
@override @override
void dispose() { void dispose() {
super.dispose(); super.dispose();