Merge remote-tracking branch 'Gitea/master' into iOS

# Conflicts:
#	pubspec.yaml

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":{}}]
+[{"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":{}}]

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;
                                   });
                                 },
                               ),

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),
         );