Merge branch 'develop_liuyf' into develop

android/app/src/main/res/raw/shrink_keep.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+           tools:keep="@drawable/sky_login_btn_normal,@drawable/xhj_login_btn_normal,@drawable/icon_left_grey,@drawable/check,@drawable/uncheck"/>

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": [],

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<LockListPage> with RouteAware {
   void initState() {
     super.initState();
     logic = Get.put(LockListLogic(widget.lockListInfoGroupEntity));
-    state = Get.find<LockListLogic>().state;
+    state = Get
+        .find<LockListLogic>()
+        .state;
   }
 
   @override
@@ -57,15 +58,14 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
   }
 
   //设备多层级列表
-  Widget _buildLockExpandedList(
+  Widget _buildLockExpandedList(BuildContext context, int index,
-      BuildContext context, int index, GroupList itemData) {
+      GroupList itemData) {
     final List<LockListInfoItemEntity> lockItemList =
         itemData.lockList ?? <LockListInfoItemEntity>[];
     return LockListGroupView(
       onTap: () {
         //是否选中组
-        if (itemData.isChecked) {
+        if (itemData.isChecked) {} else {}
-        } else {}
         setState(() {});
       },
       typeImgList: const <dynamic>[],
@@ -135,8 +135,8 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
     );
   }
 
-  Widget lockInfoListItem(
+  Widget lockInfoListItem(LockListInfoItemEntity keyInfo, bool isLast,
-      LockListInfoItemEntity keyInfo, bool isLast, Function() action) {
+      Function() action) {
     return GestureDetector(
       onTap: action,
       child: Container(
@@ -259,7 +259,11 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
               children: <Widget>[
                 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<LockListPage> with RouteAware {
 
   @override
   void dispose() {
+    Get.delete<LockListLogic>();
     /// 取消路由订阅
     AppRouteObserver().routeObserver.unsubscribe(this);
-    super.dispose();
+    super
+    .
+    dispose
+    (
+    );
   }
 
   /// 从上级界面进入 当前界面即将出现

lib/main/lockMian/lockMain/lockMain_page.dart

@@ -344,6 +344,7 @@ class _StarLockMainPageState extends State<StarLockMainPage>
   @override
   void dispose() {
     super.dispose();
+    Get.delete<LockMainLogic>();
     _teamEvent.cancel();
   }
 

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.logBtnTextSize = 16;
-      if (isiOS) {
       uiConfig.logBtnTextColor = Colors.white.value;
+      uiConfig.logBtnTextSize = 16;
+      print('----${F.loginBtnImagePrefix}_login_btn_normal-----');
+      uiConfig.logBtnBackgroundPath =
+          '${F.loginBtnImagePrefix}_login_btn_normal';
+      if (isiOS) {
         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.privacyCheckboxInCenter = true;
       uiConfig.privacyCheckboxHidden = false;

lib/tools/storage.dart

@@ -154,6 +154,7 @@ class Storage {
   static Future<void> clearAll() async {
     final SharedPreferences sp = await SharedPreferences.getInstance();
     // sp.clear();
+    sp.remove(saveLockMainListData);
     sp.remove(saveUserLoginData);
     // 重新设置需要保留的数据
     //退出登录不清除隐私协议同意状态

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:

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
   #<cn>
   umeng_common_sdk: 1.2.8
   #</cn>