diff --git a/android/app/build.gradle b/android/app/build.gradle index 0386ff73..a9e6c2c2 100755 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -119,9 +119,9 @@ android { resValue "string", "app_name", "TTLock Pro" manifestPlaceholders = [ JPUSH_PKGNAME : "com.skychip.lock", - JPUSH_APPKEY : "7ff37d174c1a568a89e98dad",//--skyAppKey + JPUSH_APPKEY : "7ff37d174c1a568a89e98dad",//--skyAppKey JPUSH_CHANNEL : "flutter_channel", - XIAOMI_APPID : "MI-2882303761520287291", + XIAOMI_APPID : "MI-2882303761520287291", XIAOMI_APPKEY : "MI-5352028744291", OPPO_APPKEY : "OP-ccae67a4a8c1470a8350b0d6a89f8105", OPPO_APPID : "OP-31586713", @@ -174,9 +174,9 @@ android { signingConfig signingConfigs.xhj_bundle resValue "string", "app_name", "Star Lock" manifestPlaceholders = [ - JPUSH_PKGNAME : "ltd.xhjcn.lock", - JPUSH_APPKEY : "5ccdb9b8d3faaae66ba5d02e", - JPUSH_CHANNEL : "flutter_channel", + JPUSH_PKGNAME: "ltd.xhjcn.lock", + JPUSH_APPKEY : "5ccdb9b8d3faaae66ba5d02e", + JPUSH_CHANNEL: "flutter_channel", ] proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-xhj.pro' } diff --git a/android/app/src/main/res/drawable/sky_login_btn_normal.png b/android/app/src/main/res/drawable/sky_login_btn_normal.png new file mode 100644 index 00000000..4467ae9a Binary files /dev/null and b/android/app/src/main/res/drawable/sky_login_btn_normal.png differ diff --git a/android/app/src/main/res/drawable/uncheck.png b/android/app/src/main/res/drawable/uncheck.png index 4a1f3dda..f1ff4217 100644 Binary files a/android/app/src/main/res/drawable/uncheck.png and b/android/app/src/main/res/drawable/uncheck.png differ diff --git a/android/app/src/main/res/drawable/xhj_login_btn_normal.png b/android/app/src/main/res/drawable/xhj_login_btn_normal.png new file mode 100644 index 00000000..3678adac Binary files /dev/null and b/android/app/src/main/res/drawable/xhj_login_btn_normal.png differ diff --git a/android/app/src/main/res/raw/shrink_keep.xml b/android/app/src/main/res/raw/shrink_keep.xml new file mode 100644 index 00000000..aaacbfde --- /dev/null +++ b/android/app/src/main/res/raw/shrink_keep.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/android/app/src/xhj_pre/google-services.json b/android/app/src/xhj_pre/google-services.json index 791f2d92..b46d867f 100644 --- a/android/app/src/xhj_pre/google-services.json +++ b/android/app/src/xhj_pre/google-services.json @@ -9,7 +9,7 @@ "client_info": { "mobilesdk_app_id": "1:281500445726:android:ddf52ac7b7f83cf5c4todo", "android_client_info": { - "package_name": "com.xhjcn.lock" + "package_name": "com.xhjcn.lock.pre" } }, "oauth_client": [], @@ -28,7 +28,7 @@ "client_info": { "mobilesdk_app_id": "1:281500445726:android:468195b9cc68dd6cc4todo", "android_client_info": { - "package_name": "com.xhjcn.lock.local" + "package_name": "com.xhjcn.lock.pre" } }, "oauth_client": [], diff --git a/images/sky_login_btn_normal.png b/images/sky_login_btn_normal.png new file mode 100644 index 00000000..4467ae9a Binary files /dev/null and b/images/sky_login_btn_normal.png differ diff --git a/images/xhj_login_btn_normal.png b/images/xhj_login_btn_normal.png new file mode 100644 index 00000000..3678adac Binary files /dev/null and b/images/xhj_login_btn_normal.png differ diff --git a/lib/main/lockMian/lockList/lockList_page.dart b/lib/main/lockMian/lockList/lockList_page.dart index 793790d8..1e53cdb9 100755 --- a/lib/main/lockMian/lockList/lockList_page.dart +++ b/lib/main/lockMian/lockList/lockList_page.dart @@ -1,4 +1,3 @@ - import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_slidable/flutter_slidable.dart'; @@ -31,7 +30,9 @@ class _LockListPageState extends State with RouteAware { void initState() { super.initState(); logic = Get.put(LockListLogic(widget.lockListInfoGroupEntity)); - state = Get.find().state; + state = Get + .find() + .state; } @override @@ -57,15 +58,14 @@ class _LockListPageState extends State with RouteAware { } //设备多层级列表 - Widget _buildLockExpandedList( - BuildContext context, int index, GroupList itemData) { + Widget _buildLockExpandedList(BuildContext context, int index, + GroupList itemData) { final List lockItemList = itemData.lockList ?? []; return LockListGroupView( onTap: () { //是否选中组 - if (itemData.isChecked) { - } else {} + if (itemData.isChecked) {} else {} setState(() {}); }, typeImgList: const [], @@ -104,21 +104,21 @@ class _LockListPageState extends State with RouteAware { ), child: lockInfoListItem(keyInfo, isLast, () { if ((keyInfo.keyType == XSConstantMacro.keyTypeTime || - keyInfo.keyType == XSConstantMacro.keyTypeLoop) && + keyInfo.keyType == XSConstantMacro.keyTypeLoop) && (keyInfo.keyStatus == XSConstantMacro.keyStatusWaitIneffective)) { logic.showToast('您的钥匙未生效'.tr); return; } if ((keyInfo.keyType == XSConstantMacro.keyTypeTime || - keyInfo.keyType == XSConstantMacro.keyTypeLong || - keyInfo.keyType == XSConstantMacro.keyTypeLoop) && + keyInfo.keyType == XSConstantMacro.keyTypeLong || + keyInfo.keyType == XSConstantMacro.keyTypeLoop) && (keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen)) { logic.showToast('您的钥匙已冻结'.tr); return; } if ((keyInfo.keyType == XSConstantMacro.keyTypeTime || - keyInfo.keyType == XSConstantMacro.keyTypeLoop) && + keyInfo.keyType == XSConstantMacro.keyTypeLoop) && (keyInfo.keyStatus == XSConstantMacro.keyStatusExpired)) { logic.showToast('您的钥匙已过期'.tr); return; @@ -135,8 +135,8 @@ class _LockListPageState extends State with RouteAware { ); } - Widget lockInfoListItem( - LockListInfoItemEntity keyInfo, bool isLast, Function() action) { + Widget lockInfoListItem(LockListInfoItemEntity keyInfo, bool isLast, + Function() action) { return GestureDetector( onTap: action, child: Container( @@ -146,15 +146,15 @@ class _LockListPageState extends State with RouteAware { : EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w), decoration: BoxDecoration( color: (((keyInfo.keyType == XSConstantMacro.keyTypeTime || - keyInfo.keyType == XSConstantMacro.keyTypeLoop) && - (keyInfo.keyStatus == - XSConstantMacro.keyStatusWaitIneffective || - keyInfo.keyStatus == - XSConstantMacro.keyStatusFrozen || - keyInfo.keyStatus == - XSConstantMacro.keyStatusExpired)) || - (keyInfo.keyType == XSConstantMacro.keyTypeLong && - keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen)) + keyInfo.keyType == XSConstantMacro.keyTypeLoop) && + (keyInfo.keyStatus == + XSConstantMacro.keyStatusWaitIneffective || + keyInfo.keyStatus == + XSConstantMacro.keyStatusFrozen || + keyInfo.keyStatus == + XSConstantMacro.keyStatusExpired)) || + (keyInfo.keyType == XSConstantMacro.keyTypeLong && + keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen)) ? AppColors.greyBackgroundColor : Colors.white, borderRadius: BorderRadius.circular(20.w), @@ -243,14 +243,14 @@ class _LockListPageState extends State with RouteAware { decoration: BoxDecoration( borderRadius: BorderRadius.circular(5.w), color: - DateTool().compareTimeIsOvertime(keyInfo.endDate!) - ? AppColors.listTimeYellowColor - : AppColors.mainColor, + DateTool().compareTimeIsOvertime(keyInfo.endDate!) + ? AppColors.listTimeYellowColor + : AppColors.mainColor, ), child: Text(logic.getKeyEffective(keyInfo), style: TextStyle(fontSize: 18.sp, color: Colors.white) - // child: Text(logic.compareTimeIsOvertime(keyInfo.endDate!) ? "已过期" : "余${logic.compareTimeGetDaysFromNow(keyInfo.endDate!)}天", style: TextStyle(fontSize: 18.sp, color: Colors.white) - ), + // child: Text(logic.compareTimeIsOvertime(keyInfo.endDate!) ? "已过期" : "余${logic.compareTimeGetDaysFromNow(keyInfo.endDate!)}天", style: TextStyle(fontSize: 18.sp, color: Colors.white) + ), ), ], )), @@ -259,7 +259,11 @@ class _LockListPageState extends State with RouteAware { children: [ SizedBox(width: 30.w), Text( - "${logic.getUseKeyTypeStr(keyInfo.startDate, keyInfo.endDate, keyInfo.keyType)}/${keyInfo.isLockOwner == 1 ? '超级管理员'.tr : (keyInfo.keyRight == 1 ? "授权管理员".tr : "普通用户".tr)}", + "${logic.getUseKeyTypeStr(keyInfo.startDate, keyInfo.endDate, + keyInfo.keyType)}/${keyInfo.isLockOwner == 1 + ? '超级管理员'.tr + : (keyInfo.keyRight == 1 ? "授权管理员".tr : "普通用户" + .tr)}", style: TextStyle( fontSize: 18.sp, color: AppColors.darkGrayTextColor), ), @@ -282,9 +286,14 @@ class _LockListPageState extends State with RouteAware { @override void dispose() { + Get.delete(); /// 取消路由订阅 AppRouteObserver().routeObserver.unsubscribe(this); - super.dispose(); + super + . + dispose + ( + ); } /// 从上级界面进入 当前界面即将出现 diff --git a/lib/main/lockMian/lockMain/lockMain_page.dart b/lib/main/lockMian/lockMain/lockMain_page.dart index 8d0e50d3..8d5e8e68 100755 --- a/lib/main/lockMian/lockMain/lockMain_page.dart +++ b/lib/main/lockMian/lockMain/lockMain_page.dart @@ -344,6 +344,7 @@ class _StarLockMainPageState extends State @override void dispose() { super.dispose(); + Get.delete(); _teamEvent.cancel(); } diff --git a/lib/tools/jverify_one_click_login.dart b/lib/tools/jverify_one_click_login.dart index bd4a6ec2..324d1b62 100644 --- a/lib/tools/jverify_one_click_login.dart +++ b/lib/tools/jverify_one_click_login.dart @@ -190,7 +190,7 @@ class JverifyOneClickLoginManage { uiConfig.numberColor = AppColors.mainColor.value; uiConfig.numberSize = 18; - uiConfig.sloganOffsetY = isiOS ? 10 : 300; + uiConfig.sloganOffsetY = isiOS ? 10 : 280; uiConfig.sloganVerticalLayoutItem = JVIOSLayoutItem.ItemNumber; uiConfig.sloganTextColor = Colors.black.value; uiConfig.sloganTextSize = 15; @@ -204,18 +204,18 @@ class JverifyOneClickLoginManage { uiConfig.logBtnOffsetY = isiOS ? 30 : 330; uiConfig.logBtnVerticalLayoutItem = JVIOSLayoutItem.ItemSlogan; uiConfig.logBtnText = '一键登录'.tr; - uiConfig.logBtnTextColor = AppColors.mainColor.value; + uiConfig.logBtnTextColor = Colors.white.value; uiConfig.logBtnTextSize = 16; + print('----${F.loginBtnImagePrefix}_login_btn_normal-----'); + uiConfig.logBtnBackgroundPath = + '${F.loginBtnImagePrefix}_login_btn_normal'; if (isiOS) { - uiConfig.logBtnTextColor = Colors.white.value; uiConfig.loginBtnNormalImage = '${F.loginBtnImagePrefix}_login_btn_normal'; //图片必须存在 uiConfig.loginBtnPressedImage = '${F.loginBtnImagePrefix}_login_btn_press'; //图片必须存在 uiConfig.loginBtnUnableImage = '${F.loginBtnImagePrefix}_login_btn_normal'; //图片必须存在 - uiConfig.logBtnBackgroundPath = - '${F.loginBtnImagePrefix}_login_btn_normal'; } // uiConfig.logBtnTextBold = true; @@ -224,10 +224,8 @@ class JverifyOneClickLoginManage { uiConfig.privacyState = false; //设置默认勾选 uiConfig.privacyCheckboxSize = 22; - if (isiOS) { - uiConfig.checkedImgPath = 'check'; //图片必须存在 - uiConfig.uncheckedImgPath = 'uncheck'; //图片必须存在 - } + uiConfig.checkedImgPath = 'check'; //图片必须存在 + uiConfig.uncheckedImgPath = 'uncheck'; //图片必须存在 uiConfig.privacyCheckboxInCenter = true; uiConfig.privacyCheckboxHidden = false; diff --git a/lib/tools/storage.dart b/lib/tools/storage.dart index 12bd5a0b..85477417 100755 --- a/lib/tools/storage.dart +++ b/lib/tools/storage.dart @@ -154,6 +154,7 @@ class Storage { static Future clearAll() async { final SharedPreferences sp = await SharedPreferences.getInstance(); // sp.clear(); + sp.remove(saveLockMainListData); sp.remove(saveUserLoginData); // 重新设置需要保留的数据 //退出登录不清除隐私协议同意状态 diff --git a/pubspec.lock b/pubspec.lock index b1ead27d..511bb66a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1017,10 +1017,10 @@ packages: dependency: "direct main" description: name: jverify - sha256: "26d1667d8c71403b77a2620a8c618625f8b4bfc950dac285b8f35ebc5e60fa5a" + sha256: "720384c7dedeb48a64bad9d403cbd76a90c298bbdab91c738913912c81bfa21f" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.5" leak_tracker: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index f0f95559..50d0fc2d 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -253,7 +253,7 @@ dependencies: flutter_bugly: ^1.0.2 open_filex: ^4.4.0 - jverify: 3.0.0 + jverify: 3.0.5 # umeng_common_sdk: 1.2.8 #