From bf0c1bce0ab942ce63253e1171cbe0130e8d01e4 Mon Sep 17 00:00:00 2001
From: WinUser01 <WinUser01@163.com>
Date: Sun, 19 Jun 2022 10:14:15 +0800
Subject: [PATCH] =?UTF-8?q?hyzp=5Fybqx-Commit170=EF=BC=9A=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E6=9B=B4=E6=96=B0=E4=B8=BA1.5.3+20220620?=
 =?UTF-8?q?=E3=80=82=E6=8C=89=E7=85=A7=E5=85=AC=E5=8F=B8=E8=A6=81=E6=B1=82?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E7=BB=8F=E5=AE=9E=E7=8E=B0=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=B0=B1=E7=A6=81=E6=AD=A2=E6=98=BE=E7=A4=BA=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/release/output.json   |  2 +-
 lib/pages/Login/LoginByName3.dart | 15 ++++++++++-----
 lib/widget/JdText.dart            |  3 ++-
 pubspec.yaml                      |  3 ++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/android/app/release/output.json b/android/app/release/output.json
index 0eda983..6063f44 100644
--- a/android/app/release/output.json
+++ b/android/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20220517,"versionName":"1.5.1","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":20220531,"versionName":"1.5.2","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/pages/Login/LoginByName3.dart b/lib/pages/Login/LoginByName3.dart
index 0aba1d5..af90f12 100644
--- a/lib/pages/Login/LoginByName3.dart
+++ b/lib/pages/Login/LoginByName3.dart
@@ -246,7 +246,8 @@ class _LoginPageState extends State<LoginByName3> {
           if (true) {
             FocusManager.instance.primaryFocus.unfocus(); // 【Flutter 实战】全局点击空白处隐藏键盘
             // 全局点击空白处隐藏账号输入框
-            if (g_users.isNotEmpty) {
+            // if (g_users.isNotEmpty) {
+            if (g_users.length > 1) {
               //如果个数大于1个或者唯一一个账号跟当前账号不一样才弹出历史账号
               // _can_expand_ListView = !_can_expand_ListView;
               g_can_expand_ListView = false;
@@ -281,7 +282,8 @@ class _LoginPageState extends State<LoginByName3> {
                       selection: TextSelection.fromPosition(TextPosition(
                           affinity: TextAffinity.downstream, offset: g_userInfo.username.length)))),
                   onEndBtn: () {
-                    if (g_users.isNotEmpty) {
+                    // if (g_users.isNotEmpty) {
+                    if (g_users.length > 1) {
                       //如果个数大于1个或者唯一一个账号跟当前账号不一样才弹出历史账号
                       setState(() {
                         g_can_expand_ListView = !g_can_expand_ListView;
@@ -292,7 +294,8 @@ class _LoginPageState extends State<LoginByName3> {
                     // FocusManager.instance.primaryFocus.unfocus(); // 【Flutter 实战】全局点击空白处隐藏键盘
                     // 全局点击空白处隐藏账号输入框
                     // print('xx2');
-                    if (g_users.isNotEmpty) {
+                    // if (g_users.isNotEmpty) {
+                    if (g_users.length > 1) {
                       //如果个数大于1个或者唯一一个账号跟当前账号不一样才弹出历史账号
                       g_can_expand_ListView = false;
                     }
@@ -406,7 +409,8 @@ class _LoginPageState extends State<LoginByName3> {
                       ),
                     ],
                   ),
-                  g_users.isNotEmpty ? _buildListView() : Container(),
+                  // g_users.isNotEmpty ? _buildListView() : Container(),
+                  g_users.length > 1 ? _buildListView() : Container(),
                 ],
               ),
               // JdButton(
@@ -488,7 +492,8 @@ class _LoginPageState extends State<LoginByName3> {
                                     SaveAccountPasswordManager.delUser(user);
                                     //处理最后一个数据，假如最后一个被删掉，将Expand置为false
                                     //如果个数大于1个或者唯一一个账号跟当前账号不一样才弹出历史账号
-                                    g_can_expand_ListView = g_users.isNotEmpty;
+                                    // g_can_expand_ListView = g_users.isNotEmpty;
+                                    g_can_expand_ListView = g_users.length > 1;
                                   });
                                 },
                               ),
diff --git a/lib/widget/JdText.dart b/lib/widget/JdText.dart
index c9de730..c33aa20 100644
--- a/lib/widget/JdText.dart
+++ b/lib/widget/JdText.dart
@@ -137,7 +137,8 @@ class _JdTextState extends State<JdText> {
                     )
                   : Icon(
                       Icons.arrow_drop_down,
-                      color: g_users.isNotEmpty ? Colors.blueAccent : Colors.grey,
+                      // color: g_users.isNotEmpty ? Colors.blueAccent : Colors.grey,
+                      color: g_users.length > 1 ? Colors.blueAccent : Colors.grey,
                     ),
               onPressed: widget.onEndBtn),
         );
diff --git a/pubspec.yaml b/pubspec.yaml
index faaa468..3a50d29 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -73,7 +73,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 #version: 1.4.32+20220511
 #version: 1.4.33+20220515
 #version: 1.5.1+20220517
-version: 1.5.2+20220531
+#version: 1.5.2+20220531
+version: 1.5.3+20220620
 
 environment:
   sdk: ">=2.7.0 <3.0.0"