diff --git a/android/app/release/output.json b/android/app/release/output.json index 3af1c29..da82b3e 100644 --- a/android/app/release/output.json +++ b/android/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20220303,"versionName":"1.4.19","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":20220306,"versionName":"1.4.20","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 247079e..0aba1d5 100644 --- a/lib/pages/Login/LoginByName3.dart +++ b/lib/pages/Login/LoginByName3.dart @@ -428,10 +428,17 @@ class _LoginPageState extends State { ///构建历史账号ListView Widget _buildListView() { + double _line_height = 110; + int _height = g_users.length * _line_height.toInt(); + if (_height > 550) { + _height = 550; + } if (g_can_expand_ListView) { return Center( child: Container( width: ScreenUtil().screenWidth * 0.9, + // 模拟器:610越界,600刚好,550存放5个行刚好。S10,600越界 + height: ScreenUtil().setHeight(_height), decoration: BoxDecoration( border: Border( left: BorderSide(width: 1, color: Colors.black), @@ -444,65 +451,65 @@ class _LoginPageState extends State { // // color: Colors.black, // // borderRadius: new BorderRadius.circular((20.0)), // ), - child: Column( - children: [ - ListView.builder( - shrinkWrap: true, - physics: BouncingScrollPhysics(), - itemBuilder: (context, index) { - UserAccount user = g_users[index]; - return GestureDetector( - child: Column( - children: [ - Container( - // color: Colors.grey[200], - color: Colors.grey[200], - padding: EdgeInsets.only(left: 8, top: 8, right: 8, bottom: 8), - child: Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text("${user.username}"), - GestureDetector( - child: Padding( - padding: EdgeInsets.all(0), - child: Icon( - // Icons.remove_circle_outline, - Icons.highlight_off, - color: Colors.grey, - ), - ), - onTap: () { - setState(() { - g_users.remove(user); - SaveAccountPasswordManager.delUser(user); - //处理最后一个数据,假如最后一个被删掉,将Expand置为false - //如果个数大于1个或者唯一一个账号跟当前账号不一样才弹出历史账号 - g_can_expand_ListView = g_users.isNotEmpty; - }); - }, + child: ListView.builder( + shrinkWrap: true, + physics: BouncingScrollPhysics(), + itemBuilder: (context, index) { + UserAccount user = g_users[index]; + return GestureDetector( + child: Column( + children: [ + Container( + // height: ScreenUtil().setHeight(_line_height), + // color: Colors.grey[200], + color: Colors.grey[200], + // padding: EdgeInsets.only(left: 8, top: 4, right: 8, bottom: 4), + padding: EdgeInsets.symmetric( + horizontal: ScreenUtil().setHeight(35), + vertical: ScreenUtil().setHeight(17)), + child: Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text("${(index + 1).toString()}、${user.username}"), + GestureDetector( + child: Padding( + padding: EdgeInsets.all(0), + child: Icon( + // Icons.remove_circle_outline, + Icons.highlight_off, + color: Colors.grey, ), - ], + ), + onTap: () { + setState(() { + g_users.remove(user); + SaveAccountPasswordManager.delUser(user); + //处理最后一个数据,假如最后一个被删掉,将Expand置为false + //如果个数大于1个或者唯一一个账号跟当前账号不一样才弹出历史账号 + g_can_expand_ListView = g_users.isNotEmpty; + }); + }, ), - Divider(height: 1.0, color: Colors.black), ], ), - ), - ], + Divider(height: 1.0, color: Colors.black), + ], + ), ), - onTap: () { - setState(() { - g_userInfo.username = user.username; - g_userInfo.password = user.password; - g_can_expand_ListView = false; - }); - }, - ); + ], + ), + onTap: () { + setState(() { + g_userInfo.username = user.username; + g_userInfo.password = user.password; + g_can_expand_ListView = false; + }); }, - itemCount: g_users.length, - ) - ], + ); + }, + itemCount: g_users.length, ), ), ); diff --git a/pubspec.yaml b/pubspec.yaml index f6fb24e..3b33bb3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -59,7 +59,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev #version: 1.4.16+20220126 #version: 1.4.17+20220227 #version: 1.4.18+20220302 -version: 1.4.19+20220303 +#version: 1.4.19+20220303 +version: 1.4.20+20220306 environment: sdk: ">=2.7.0 <3.0.0"