合并代码

star_lock/images/lan/lan_en.json

@@ -614,7 +614,7 @@
   "跳过": "Skip",
   "还未获取到位置信息哦，请耐心等待一下！": "The location information has not been obtained yet, please wait patiently!",
   "请填写信息": "Please fill in the information",
-<<<<<<< HEAD
+
   "有效期": "Validity period",
   "生效时间": "Effective time",
   "失效时间": "Expiration time",
@@ -627,7 +627,7 @@
   "请将您的手指按下": "Please press your finger",
   "根据提示，抬起手指后再进行下一次指纹采集": "According to the prompt, lift your finger and then collect the fingerprint again",
   "添加成功": "Add success",
-  "搜索": "Search"
+  "搜索": "Search",
 
   "permission_dialog_camera": "camera",
   "permission_dialog_photos": "photos",

star_lock/images/lan/lan_keys.json

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

star_lock/lib/tools/noData.dart

@@ -1,3 +1,4 @@
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
@@ -21,15 +22,10 @@ class NoData extends StatelessWidget {
           mainAxisAlignment: MainAxisAlignment.center,
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            Image.asset(
-              'images/icon_noData.png',
-              width: 160.w,
-              height: 180.h,
-            ),
+            Image.asset('images/icon_noData.png', width: 160.w, height: 180.h,),
             Text(
               TranslationLoader.lanKeys!.noData!.tr,
-              style:
-                  TextStyle(color: AppColors.darkGrayTextColor, fontSize: 22.sp),
+              style: TextStyle(color: AppColors.darkGrayTextColor, fontSize: 22.sp),
             )
           ],
         )),