From 7d8a4770114b3a67eee87c636e537093f9fd2c93 Mon Sep 17 00:00:00 2001
From: WinUser01 <WinUser01@163.com>
Date: Mon, 3 Jan 2022 11:54:56 +0800
Subject: [PATCH] =?UTF-8?q?hyzp=5Fybqx-Commit068=EF=BC=9A=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E6=9B=B4=E6=96=B0=E4=B8=BA=EF=BC=9A1.4.9+202?=
 =?UTF-8?q?20103=E3=80=82=E4=B8=80=E5=A5=97APP=E9=80=82=E5=BA=94=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E5=8C=BA=E5=8E=BF=EF=BC=8C=E5=B7=B2=E7=BB=8F=E5=90=B8?=
 =?UTF-8?q?=E6=94=B6=E4=B8=8A=E4=B8=80=E6=AC=A1=E8=AE=BE=E8=AE=A1=E8=BF=87?=
 =?UTF-8?q?=E7=A8=8BCommit065-Commit073=E7=9A=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/release/output.json | 2 +-
 lib/components/UserInfo.dart    | 7 ++++++-
 lib/components/dioFun.dart      | 8 ++++++--
 pubspec.yaml                    | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/android/app/release/output.json b/android/app/release/output.json
index 7c54f99..64b8303 100644
--- a/android/app/release/output.json
+++ b/android/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20220101,"versionName":"1.4.7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20220103,"versionName":"1.4.9","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/lib/components/UserInfo.dart b/lib/components/UserInfo.dart
index 6c73b25..87ec9e8 100644
--- a/lib/components/UserInfo.dart
+++ b/lib/components/UserInfo.dart
@@ -18,7 +18,7 @@ class UserInfo {
   }
 
   //_mapGetData = {is_login: true, user_id: 135, token: 4C5B3F93FEACAEF4B6CAA7296F22CC67825D7E48B867614383D19E3F23DFE510}
-  setUserInfoFaceLogin(Map _mapGetData) {
+  Future setUserInfoFaceLogin(Map _mapGetData) async {
     mapUserInfo['user_id'] = _mapGetData['user_id'];
     mapUserInfo['token'] = _mapGetData['token'];
     setQxInfo(mapUserInfo["qx_code"], mapUserInfo["qx_name"]);
@@ -86,6 +86,11 @@ class UserInfo {
         service_tel = '';
         copyright_info = '© ' + qx_name_long + '生态环境局 版权所有' + service_tel;
         copyright_info_PinYin = 'YIBIN CHANGNING BLACK SMOKE CAR CAPTURE SYSTEM';
+        // 长宁S308固废填埋场附近, dwzb: 104.941567|28.627746
+        // 长宁站, pt: {latitude: 28.601496170763852, longitude: 104.93546828595213
+        // 中心地址：天泉商城
+        center_latitude = 28.601496170763852; // 区县中心纬度
+        center_longitude = 104.93546828595213; // 区县中心经度
         break;
       case 511525: // 高县
         copyright_info_PinYin = 'YIBIN GAOXIAN BLACK SMOKE CAR CAPTURE SYSTEM';
diff --git a/lib/components/dioFun.dart b/lib/components/dioFun.dart
index 5351755..37bc385 100644
--- a/lib/components/dioFun.dart
+++ b/lib/components/dioFun.dart
@@ -3,6 +3,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hyzp_ybqx/components/doJSON.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart';
 import 'package:hyzp_ybqx/services/EventBus.dart';
 import 'package:hyzp_ybqx/widget/my_superplayer.dart';
 import 'package:sprintf/sprintf.dart';
@@ -2620,9 +2621,12 @@ Future faceLoginFun({@required String filePath, @required BuildContext context})
         // I/flutter ( 9884): _mapGetData = {code: 1, msg: 未检测到人脸信息, count: 0, data: []}
         if (_mapGetData.containsKey('is_login') && _mapGetData['is_login']) {
           print('人脸认证成功！');
-          faceLogin = 1; //设置人脸验证成功标志。1 成功，0 失败，-1 处理中
           //保存人脸认证成功的用户信息
-          g_userInfo.setUserInfoFaceLogin(_mapGetData);
+          g_userInfo.setUserInfoFaceLogin(_mapGetData).then((value) {
+            // 一套APP适应多个区县登录过程04、登录成功，开始使用保存的登录信息预加载数据，并设置faceLogin = 1
+            faceLogin = 1; //设置人脸验证成功标志。1 成功，0 失败，-1 处理中
+            startGetStatisDataNew(); // 2、登录前提前获取统计数据，改善用户登录体验
+          });
           //获取其他用户信息
           getMyUserinfo().then((value) {
             //获取用户所属分组和相应权限
diff --git a/pubspec.yaml b/pubspec.yaml
index 439df42..305268a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -45,7 +45,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # version: 1.4.4+20211230
 # version: 1.4.6+20211231
 # version: 1.4.7+20220101
-version: 1.4.8+20220102
+version: 1.4.9+20220103
 
 environment:
   sdk: ">=2.7.0 <3.0.0"