From 7e0cb060b30cd1798e5d5ec568c4fa6ca3041fe3 Mon Sep 17 00:00:00 2001 From: WinUser01 Date: Mon, 3 Jan 2022 10:41:40 +0800 Subject: [PATCH] =?UTF-8?q?hyzp=5Fybqx-Commit067=EF=BC=9A=E4=B8=80?= =?UTF-8?q?=E5=A5=97APP=E9=80=82=E5=BA=94=E5=A4=9A=E4=B8=AA=E5=8C=BA?= =?UTF-8?q?=E5=8E=BF=EF=BC=8C=E5=B7=B2=E7=BB=8F=E5=90=B8=E6=94=B6=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E8=AE=BE=E8=AE=A1=E8=BF=87=E7=A8=8BCommit065?= =?UTF-8?q?-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 --- lib/components/dioFun.dart | 2 +- lib/pages/Login/LoginTabs2.dart | 7 +++++-- lib/pages/Login/ModifyPassword.dart | 2 +- lib/pages/MyMsics/07_myAbout/MyAbout.dart | 2 +- lib/pages/tabs/page4_myMsics_new.dart | 6 ++++++ 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/components/dioFun.dart b/lib/components/dioFun.dart index 82d568b..5351755 100644 --- a/lib/components/dioFun.dart +++ b/lib/components/dioFun.dart @@ -1972,7 +1972,7 @@ Future getThePageList( print('response = ${response.toString()}'); // I/flutter (16869): mapHyshlx[theHyshlx][api] = http://125.64.218.67:9909?s=App.Car_Hyc.GetList // I/flutter (16869): map = {page: 1, perpage: 100, sign: ff2b4ea7283c2a2dd86ab665c5fe0f0f, random: 763117, workflow: 1} - // I/flutter (16869): response = {"ret":400,"data":{},"msg":"非法请求：缺少必要参数qx_code"} + // I/flutter (16869): response = {"ret":400,"data":{},"msg":"非法请求：缺少必要参数qxdm"} //I/flutter ( 5232): {"ret":200,"data":{"items":[],"total":0,"page":1,"perpage":10},"msg":""} if (response.statusCode == 200) { diff --git a/lib/pages/Login/LoginTabs2.dart b/lib/pages/Login/LoginTabs2.dart index d1e30d9..d694417 100644 --- a/lib/pages/Login/LoginTabs2.dart +++ b/lib/pages/Login/LoginTabs2.dart @@ -84,7 +84,7 @@ class LoginTabs2State extends State { text: TextSpan(children: [ TextSpan( // text: '宜宾市翠屏黑烟车', - text: qx_name + '黑烟车', + text: qx_name_long + '黑烟车', style: TextStyle( fontSize: 26.0, color: Colors.white, fontWeight: FontWeight.bold)), TextSpan( @@ -94,7 +94,10 @@ class LoginTabs2State extends State { color: Color.fromRGBO(49, 216, 123, 1), fontWeight: FontWeight.bold)), TextSpan( - text: '\n' + copyright_info_PinYin, + // text: '\n' + copyright_info_PinYin, + text: copyright_info_PinYin.isEmpty + ? '\nBLACK SMOKE CAR CAPTURE SYSTEM' + : ('\n' + copyright_info_PinYin), style: TextStyle(fontSize: 11.0, color: Color.fromRGBO(101, 117, 142, 1))), ]), diff --git a/lib/pages/Login/ModifyPassword.dart b/lib/pages/Login/ModifyPassword.dart index caec543..645cb2f 100644 --- a/lib/pages/Login/ModifyPassword.dart +++ b/lib/pages/Login/ModifyPassword.dart @@ -36,7 +36,7 @@ class _LoginPageState extends State { newPassword1 = newPassword1.trim(); newPassword2 = newPassword2.trim(); - RegExp regNewPw = RegExp(r"^[a-zA-Z0-9\?_！@#\$\%\^&]+$"); + RegExp regNewPw = RegExp(r"^[a-zA-Z0-9\?_!@#\$\%\^&]+$"); if (g_userInfo.password.isNotEmpty && oldPassword != g_userInfo.password) { Fluttertoast.showToast( msg: '输入的旧密码错误！', diff --git a/lib/pages/MyMsics/07_myAbout/MyAbout.dart b/lib/pages/MyMsics/07_myAbout/MyAbout.dart index d950707..2700f30 100644 --- a/lib/pages/MyMsics/07_myAbout/MyAbout.dart +++ b/lib/pages/MyMsics/07_myAbout/MyAbout.dart @@ -113,7 +113,7 @@ class _LoginPageState extends State { children: [ SizedBox(height: 60), // Text('宜宾市翠屏黑烟车电子抓拍系统', style: TextStyle(fontSize: 20)), - Text(qx_name + '黑烟车电子抓拍系统', style: TextStyle(fontSize: 20)), + Text(qx_name_long + '黑烟车电子抓拍系统', style: TextStyle(fontSize: 20)), Text('v${widget.ver}（${widget.date}）', style: TextStyle(fontSize: 20)), SizedBox(height: 60), // Text('© 宜宾市翠屏生态环境局 版权所有', diff --git a/lib/pages/tabs/page4_myMsics_new.dart b/lib/pages/tabs/page4_myMsics_new.dart index 81bae2d..9288eb3 100644 --- a/lib/pages/tabs/page4_myMsics_new.dart +++ b/lib/pages/tabs/page4_myMsics_new.dart @@ -9,6 +9,7 @@ import 'package:hyzp_ybqx/components/commonFun.dart'; import 'package:hyzp_ybqx/pages/Login/FaceLogin.dart'; import 'package:hyzp_ybqx/pages/Login/FaceReg.dart'; import 'package:hyzp_ybqx/pages/MyMsics/05_updated/MyUpdatedNew.dart'; +import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart'; import 'package:hyzp_ybqx/pages/tabs/page5_userManager.dart'; import 'package:hyzp_ybqx/widget/JdButton.dart'; import 'package:package_info/package_info.dart'; @@ -373,6 +374,11 @@ class _Page4_MyMsicsNewState extends State text: "退出登录", color: Color.fromRGBO(80, 159, 245, 1), onTop: () { + clear_user_info(); // 清空用户信息 + //刷新统计数据 + mapStatisInfo.forEach((key, value) { + mapStatisInfo[key] = -1; + }); Navigator.pushNamed(context, '/', arguments: 0); }, ),