增加修改密码。

android/build.gradle

@@ -1,4 +1,9 @@
 allprojects {
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            options.compilerArgs << "-Xlint:unchecked"
+        }
+    }
     repositories {
         google()
         mavenCentral()

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Runner.xcodeproj/project.pbxproj

@@ -169,7 +169,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C8080294A63A400263BE5 = {
@@ -345,7 +345,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -472,7 +472,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -521,7 +521,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

lib/network/api.dart

@@ -8,6 +8,7 @@ import 'package:lszlgl/model/rsp/login_rsp.dart';
 import 'package:lszlgl/model/rsp/sample_task_rsp.dart';
 import 'package:lszlgl/model/rsp/user_rsp.dart';
 import 'package:lszlgl/network/base_dio.dart';
+import 'package:retrofit/http.dart';
 import 'package:retrofit/retrofit.dart';
 
 import '../model/req/device_req.dart';
@@ -94,5 +95,12 @@ abstract class Api {
   /// 提交设备绑定信息
   @POST('/admin-api/zj/base-device/createBatch')
   Future<ApiRsp> postDeviceInfos(@Body() List<DeviceReq> req);
-
+  
+  /// 获取手机验证码
+  @POST('/admin-api/system/auth/reset_password_send_sms_code')
+  Future<ApiRsp<bool?>> postPhoneMsg(@Body() Map<String, dynamic> map);
+
+  ///忘记密码
+  @POST('/admin-api/system/auth/reset_password')
+  Future<ApiRsp<bool?>> resetPassword(@Body() Map<String, dynamic> map);
 }

lib/network/api.g.dart

@@ -574,6 +574,68 @@ class _Api implements Api {
     return value;
   }
 
+  @override
+  Future<ApiRsp<bool?>> postPhoneMsg(Map<String, dynamic> map) async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _headers = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(map);
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<ApiRsp<bool>>(Options(
+      method: 'POST',
+      headers: _headers,
+      extra: _extra,
+    )
+            .compose(
+              _dio.options,
+              '/admin-api/system/auth/reset_password_send_sms_code',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
+    final value = ApiRsp<bool?>.fromJson(
+      _result.data!,
+      (json) => json as bool?,
+    );
+    return value;
+  }
+
+  @override
+  Future<ApiRsp<bool?>> resetPassword(Map<String, dynamic> map) async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _headers = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(map);
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<ApiRsp<bool>>(Options(
+      method: 'POST',
+      headers: _headers,
+      extra: _extra,
+    )
+            .compose(
+              _dio.options,
+              '/admin-api/system/auth/reset_password',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
+    final value = ApiRsp<bool?>.fromJson(
+      _result.data!,
+      (json) => json as bool?,
+    );
+    return value;
+  }
+
   RequestOptions _setStreamType<T>(RequestOptions requestOptions) {
     if (T != dynamic &&
         !(requestOptions.responseType == ResponseType.bytes ||

lib/network/my_api.dart

@@ -7,7 +7,7 @@ class MyApi {
   MyApi._();
 
   /// 生产url
-  static String productUrl = 'http://121.36.17.6:49099';
+  static String productUrl = 'http://121.36.17.6:39099';
 
   /// 测试url
   static String testUrl = 'http://121.36.17.6:19090';

lib/page/login/login_page.dart

@@ -28,6 +28,7 @@ class LoginPage extends StatefulWidget {
 class _LoginPageState extends BaseLifecycleState<LoginPage> {
   late TextEditingController accountCtrl;
   late TextEditingController pwdCtrl;
+  late ValueNotifier<bool> _showPwd;
 
   void onLogin() async {
     var account = accountCtrl.text;
@@ -94,6 +95,7 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
   void onInit() {
     accountCtrl = TextEditingController();
     pwdCtrl = TextEditingController();
+    _showPwd = ValueNotifier<bool>(true);
   }
 
   @override
@@ -106,7 +108,8 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
     RefreshConfig.get().initDefault();
     LocationUtils.updatePrivacyShow(true, true);
     LocationUtils.updatePrivacyAgree(true);
-    LocationUtils.setApiKey(kReleaseMode ? '2c783509376e267b24d63b21681686fa' : '7d0c033909f84adc14a0e60a835f044f', '');
+    LocationUtils.setApiKey(
+        kReleaseMode ? '2c783509376e267b24d63b21681686fa' : '7d0c033909f84adc14a0e60a835f044f', '');
 
     /// 获取手机设备信息
     PrintService.getDeviceInfo();
@@ -214,7 +217,8 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
       child: Container(
         padding: const EdgeInsets.symmetric(horizontal: 24),
         alignment: Alignment.center,
-        decoration: const BoxDecoration(color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(32))),
+        decoration: const BoxDecoration(
+            color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(32))),
         child: Column(
           children: [
             const SizedBox(height: 56),
@@ -225,16 +229,36 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
               action: TextInputAction.next,
             ),
             const SizedBox(height: 32),
-            buildEdit(
-              ctrl: pwdCtrl,
-              hint: '请输入登录密码',
-              icon: imgLoginPwd,
-              obscure: true,
-              onSubmit: (value) => onLogin(),
-            ),
-            const SizedBox(height: 64),
+            ValueListenableBuilder(
+                valueListenable: _showPwd,
+                builder: (BuildContext ctx, bool show, Widget? child) {
+                  return buildEdit(
+                    ctrl: pwdCtrl,
+                    hint: '请输入登录密码',
+                    icon: imgLoginPwd,
+                    obscure: show,
+                    onSubmit: (value) => onLogin(),
+                    rightIcon: child,
+                  );
+                },
+                child: IconButton(
+                  icon: const Icon(Icons.remove_red_eye_outlined, size: 16, color: Color(0xFFBBBBBB)),
+                  onPressed: () {
+                    _showPwd.value = !_showPwd.value;
+                  },
+                )),
+            const SizedBox(height: 44),
             buildLoginBtn(),
-            const SizedBox(height: 48),
+            SizedBox(
+              width: double.infinity,
+              child: TextButton(
+                  onPressed: () {
+                    MyRouter.forgetPwd();
+                  },
+                  style: const ButtonStyle(alignment: Alignment.centerRight),
+                  child: const Text('忘记密码', style: TextStyle(color: Color(0xFF25A6EE), fontSize: 14))),
+            ),
+            const SizedBox(height: 18),
           ],
         ),
       ),
@@ -248,6 +272,7 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
     TextInputAction action = TextInputAction.done,
     bool obscure = false,
     ValueChanged? onSubmit,
+    Widget? rightIcon,
   }) {
     return TextField(
       controller: ctrl,
@@ -268,6 +293,7 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
         hintStyle: const TextStyle(color: Color(0xFFBBBBBB)),
         isDense: true,
         contentPadding: EdgeInsets.zero,
+        suffixIcon: rightIcon,
       ),
       style: const TextStyle(fontSize: 14),
       textInputAction: action,

lib/page/print/print_page.dart

@@ -234,16 +234,25 @@ class _PrintPageState extends BaseLifecycleState<PrintPage> {
           myAppBar(title: '打印二维码'),
           const SizedBox(height: 18),
           buildServiceItem(serviceList[0]),
-          const Text('已连接打印机'),
+
+          Offstage(
+            offstage: PrintService.connectedDeviceList.isEmpty,
+            child: const Text('已连接打印机'),
+          ),
           ...List.generate(
             PrintService.connectedDeviceList.length,
                 (index) => buildDeviceItem(PrintService.connectedDeviceList[index]),
           ).toList(),
-          const Text('可用打印机'),
+
+          Offstage(
+            offstage: deviceList.isEmpty,
+            child: const Text('可用打印机'),
+          ),
           ...List.generate(
             deviceList.length,
                 (index) => buildDeviceItem(deviceList[index]),
           ).toList(),
+
           Offstage(
             offstage: PrintService.connectedDeviceList.isEmpty,
             child: buildServiceItem(serviceList[1]),

lib/page/user_center/change_pwd_page.dart

@@ -142,16 +142,25 @@ class _ChangePwdPageState extends BaseState<ChangePwdPage> {
     return Column(
       children: [
         myAppBar(title: '修改密码'),
-        buildList(),
-        const SizedBox(height: 32),
-        MyButton(
-          '确认修改',
-          onTap: onChange,
-          gradient: const LinearGradient(colors: [Color(0xFF3BD2E5), Color(0xFF247AF8)]),
-          alignment: Alignment.center,
-          minHeight: 40,
-          margin: const EdgeInsets.symmetric(horizontal: 24),
+        Expanded(
+          child: SingleChildScrollView(
+            child: Column(
+              children: [
+                buildList(),
+                const SizedBox(height: 32),
+                MyButton(
+                  '确认修改',
+                  onTap: onChange,
+                  gradient: const LinearGradient(colors: [Color(0xFF3BD2E5), Color(0xFF247AF8)]),
+                  alignment: Alignment.center,
+                  minHeight: 40,
+                  margin: const EdgeInsets.symmetric(horizontal: 24),
+                ),
+              ],
+            ),
+          ),
         ),
+
       ],
     );
   }

lib/router/my_router.dart

@@ -1,4 +1,5 @@
 import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:lszlgl/page/login/forget_password_page.dart';
 import 'package:lszlgl/page/login/login_page.dart';
 import 'package:lszlgl/page/main_tab_page.dart';
 import 'package:lszlgl/page/print/connect_print_page.dart';
@@ -38,6 +39,8 @@ const rPrintPage = '/PrintPage';
 const rConnectPrintPage = '/ConnectPrintPage';
 // 扫一扫
 const rQrCodeScanPage = '/QrCodeScanPage';
+// 忘记密码
+const rForgetPasswordPage = '/ForgetPasswordPage';
 
 final Map<String, MyNavigatorBuilder> rRouteMap = {
   // 根页面
@@ -53,6 +56,7 @@ final Map<String, MyNavigatorBuilder> rRouteMap = {
   rPrintPage: (context, args) => PrintPage(args: args as PrintPageArgs),
   rConnectPrintPage: (context, args) => ConnectPrintPage(args: args as ConnectPrintPageArgs),
   rQrCodeScanPage: (context, args) => const QrCodeScanPage(),
+  rForgetPasswordPage:(context,args) => const ForgetPasswordPage(),
 };
 
 class MyRouter {
@@ -91,6 +95,11 @@ class MyRouter {
     MyNavigator.push(rChangePwdPage, args: startHome);
   }
 
+  /// 忘记密码
+  static void forgetPwd(){
+    MyNavigator.push(rForgetPasswordPage);
+  }
+
   /// 收获环节列表
   static Future<dynamic> startSampleTaskList(SampleTaskListTabPageArgs args) {
     return MyNavigator.push(rSampleTaskListTabPage, args: args);

lib/utils/string_utils.dart

@@ -17,4 +17,16 @@ class StringUtils {
       _ => '',
     };
   }
+
+  /// 判断是否是手机号
+  static bool isPhoneNum(String? nums) {
+    if(nums == null){
+      return false;
+    }
+
+    RegExp mobile = RegExp(
+        r'^((13[0-9])|(14[0-9])|(15[0-9])|(16[0-9])|(17[0-9])|(18[0-9])|(19[0-9]))\d{8}$');
+    return mobile.hasMatch(nums);
+  }
+
 }

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.0.19+19
+version: 0.0.20+20
 
 environment:
   sdk: '>=3.1.5 <4.0.0'