From 6e0a314a71b04e53057c0c13874afa613aa46c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com>
Date: Mon, 12 Aug 2024 10:04:40 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E4=BA=86=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E6=98=AFlite=E7=89=88=E6=9C=AC=202=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=94=81=E9=80=9A=E9=80=9A=E7=82=B9=E5=87=BB=E5=BC=80?=
 =?UTF-8?q?=E9=94=81=E6=8C=89=E9=92=AE=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=8A=A8?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98=203=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=8A=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lockDetail/lockDetail_page.dart           | 38 +++++++++----------
 pre_build.sh                                  |  4 +-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart
index ec5a7e81..e997e18b 100755
--- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart
+++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart
@@ -89,18 +89,10 @@ class _LockDetailPageState extends State<LockDetailPage>
 
   //鑫泓佳布局
   Widget xhjWidget() {
-    final bool isShowTip = (state.keyInfos.value.keyType ==
-                XSConstantMacro.keyTypeTime ||
-            state.keyInfos.value.keyType ==
-                XSConstantMacro.keyTypeLoop) && // 限时、循环
-        (DateTool().compareTimeGetDaysFromNow(state.keyInfos.value.endDate!) <=
-                15 &&
-            DateTool()
-                    .compareTimeGetDaysFromNow(state.keyInfos.value.endDate!) >=
-                0) && // 0到30天
-        (state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusNormalUse ||
-            state.keyInfos.value.keyStatus ==
-                XSConstantMacro.keyStatusWaitReceive);
+    final bool isShowTip =
+        (state.keyInfos.value.keyType == XSConstantMacro.keyTypeTime || state.keyInfos.value.keyType == XSConstantMacro.keyTypeLoop)
+        && (DateTool().compareTimeGetDaysFromNow(state.keyInfos.value.endDate!) <= 15 && DateTool().compareTimeGetDaysFromNow(state.keyInfos.value.endDate!) >= 0)
+            && (state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusNormalUse || state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusWaitReceive);
     return Scaffold(
       backgroundColor: Colors.white,
       body: Obx(() {
@@ -1393,7 +1385,13 @@ class _LockDetailPageState extends State<LockDetailPage>
   }
 
   //如果需要实名认证，需认证完成，方可开锁
-  void isNeedRealNameAuthThenOpenLock() {
+  Future<void> isNeedRealNameAuthThenOpenLock() async {
+    final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false;
+    final bool isOpenLockNeedOnline = state.isOpenLockNeedOnline.value == 0;
+    if (!isOpenLockNeedOnline && !isNetWork) {
+      return;
+    }
+
     state.nextAuthTime.value = state.keyInfos.value.nextFaceValidateTime ?? 0;
     if (state.keyInfos.value.faceAuthentication == 1 &&
         state.nextAuthTime.value > 0 &&
@@ -1404,24 +1402,24 @@ class _LockDetailPageState extends State<LockDetailPage>
             state.nextAuthTime.value = getNextAuthTime;
             if (isSuccess) {
               // 认证成功，去开锁
-              startOpenLock();
+              setState(startOpenLock);
             }
           }).initAliyunRealNameAuth();
     } else {
       //无需认证，直接开锁
-      startOpenLock();
+      setState(startOpenLock);
     }
   }
 
-  Future<void> startOpenLock() async {
+  void startOpenLock() {
     if (state.openLockBtnState.value == 1) {
       return;
     }
-    final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false;
+    // final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false;
     final bool isOpenLockNeedOnline = state.isOpenLockNeedOnline.value == 0;
-    if (!isOpenLockNeedOnline && !isNetWork) {
-      return;
-    }
+    // if (!isOpenLockNeedOnline && !isNetWork) {
+    //   return;
+    // }
     state.iSOpenLock.value = true;
     state.openLockBtnState.value = 1;
     state.animationController!.forward();
diff --git a/pre_build.sh b/pre_build.sh
index f996e68c..af1aadb1 100755
--- a/pre_build.sh
+++ b/pre_build.sh
@@ -25,11 +25,11 @@ case $environment in
     api_prefix='https://pre.lock.star-lock.cn'
     ;;
   sky)
-    main_file="lib/main_sky_full.dart"
+    main_file="lib/main_sky_lite.dart"
     api_prefix='https://lock.skychip.top'
     ;;
   xhj)
-    main_file="lib/main_xhj_full.dart"
+    main_file="lib/main_xhj_lite.dart"
     api_prefix='https://lock.xhjcn.ltd'
     ;;
   local)