1、修改了打包是lite版本
2、修复锁通通点击开锁按钮,没有动效问题 3、修改版本上架
This commit is contained in:
parent
43f969b6c2
commit
6e0a314a71
@ -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();
|
||||
|
||||
@ -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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user