feats

android/app/build.gradle

 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.farmer_client"
+        applicationId "com.njyunzhi.farmer_client"
         minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
+
+            //关闭混淆, 否则在运行release包后可能出现运行崩溃， TODO后续进行混淆配置
+            minifyEnabled false //删除无用代码
+            shrinkResources false //删除无用资源
         }
     }
 }

android/app/src/debug/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.farmer_client">
+    package="com.njyunzhi.farmer_client">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/app/src/main/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.example.farmer_client">
+    package="com.njyunzhi.farmer_client">
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <!--允许获取精确位置，精准定位必选-->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

android/app/src/main/java/com/example/farmer_client/MainActivity.java → android/app/src/main/java/com/njyunzhi/farmer_client/MainActivity.java

-package com.example.farmer_client;
+package com.njyunzhi.farmer_client;
 
 import io.flutter.embedding.android.FlutterActivity;
 

android/app/src/profile/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.farmer_client">
+    package="com.njyunzhi.farmer_client">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

ios/Runner.xcodeproj/project.pbxproj

 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.farmerClient;
+				PRODUCT_BUNDLE_IDENTIFIER = com.njyunzhi.farmerClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.farmerClient;
+				PRODUCT_BUNDLE_IDENTIFIER = com.njyunzhi.farmerClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.farmerClient;
+				PRODUCT_BUNDLE_IDENTIFIER = com.njyunzhi.farmerClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

lib/pages/home/index.dart

+import 'package:farmer_client/widgets/Modal.dart' as modal;
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import '../../utils/timer.dart';
 import './widgets/home/index.dart';
 
 
 
   @override
   Widget builder(BuildContext context) {
+
+    setTimeout(() {
+      // showDialog(context: Get.overlayContext!, builder: (BuildContext c) {
+      //   return Modal(type: 'dialog', title: '测试', message: '这是一段 message ！', onConfirm: () => print('hahahaha'),);
+      // } );
+      // Get.dialog(Modal(type: 'dialog', title: '测试', message: '这是一段 message ！', onConfirm: () => print('hahahaha'),));
+      modal.showDialog(title: '测试', content: SizedBox(width: 300, height: 300,), onConfirm: () => false);
+    }, 2000);
+    
     return const HomePage();
   }
 }

lib/utils/timer.dart

   return Timer.periodic(duration, f);
 }
 
-Timer setTimeout(void Function () f, int milliseconds) {
+void setTimeout(void Function () f, int milliseconds) {
   var duration = Duration(milliseconds: milliseconds);
-  return Timer(duration, f);
+  Timer? t = null;
+  t = Timer(duration, () {
+    if (null != t) {
+      t.cancel();
+    }
+    f();
+  });
 }

lib/widgets/Modal.dart

 
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
 
-class Dialog extends StatelessWidget {
+typedef ModalFunc = dynamic Function();
+
+/// func 函数如果返回 bool 值, 则只有 true 的情况下才默认关闭弹窗
+/// 如果返回 Future , 则只有正常结束的时候 才关闭弹窗
+/// 其余情况, 都默认关闭弹窗
+void _handleFunc(ModalFunc? func) {
+  if (null != func) {
+    dynamic res = func();
+    if (res.runtimeType == bool) {
+      if (res) {
+        Get.back(closeOverlays: true);
+      }
+    } else if (res is Future) {
+      res.then((_) => Get.back(closeOverlays: true));
+    } else {
+      Get.back(closeOverlays: true);
+    }
+  } else {
+    Get.back(closeOverlays: true);
+  }
+}
+
+/// 打开一个 dialog
+void showDialog({ required String title, String? message, Widget? content, ModalFunc? onConfirm, ModalFunc? onCancel }) {
+  Get.dialog(
+    Modal(
+      type: 'dialog',
+      title: title,
+      message: message,
+      content: content,
+      onConfirm: () => _handleFunc(onConfirm),
+      onCancel: () => _handleFunc(onCancel),
+    )
+  );
+}
+
+/// 打开一个 alert
+void showAlert({ required String title, String? message, Widget? content, ModalFunc? onConfirm }) {
+  Get.dialog(
+      Modal(
+        type: 'alert',
+        title: title,
+        message: message,
+        content: content,
+        onConfirm: () => _handleFunc(onConfirm),
+      )
+  );
+}
+
+class Modal extends StatelessWidget {
 
   String title;
   String type;
   VoidCallback? onConfirm;
   VoidCallback? onCancel;
 
-  Dialog({Key? key,
+  final _titleStyle = TextStyle(color: const Color(0xFF222222), fontSize: 20.sp, fontWeight: FontWeight.bold);
+  final _messageStyle = TextStyle(color: const Color(0xFF666666), fontSize: 18.sp);
+  final _primaryColor = const Color(0xFFFF703B);
+  final _btnSize = Size(90.w, 36.w);
+  final _btnShape = RoundedRectangleBorder(
+    side: const BorderSide(color: Color(0xFFFF703B), width: 2.0),
+    borderRadius: BorderRadius.all(Radius.circular(24.5.w)),
+  );
+
+  void _handleConfirm() {
+    if (null != onConfirm) {
+      onConfirm!();
+    }
+  }
+  void _handleCancel() {
+    if (null != onCancel) {
+      onCancel!();
+    }
+  }
+
+  Modal({Key? key,
     this.type = 'alert',
     required this.title,
     this.message,
 
   Widget _confirmBtn() {
     return ElevatedButton(
-      child: const Text("确定"),
+      child: Text("确定", style: TextStyle(color: Colors.white, fontSize: 18.sp, letterSpacing: 5.sp)),
       style: ElevatedButton.styleFrom(
-          primary: const Color(0xFFFF703B),
-          textStyle: TextStyle(color: Colors.white, fontSize: 20.sp, letterSpacing: 5.sp),
+          primary: _primaryColor,
           elevation: 0,
-          minimumSize: Size(90.w, 49.w),
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.all(Radius.circular(24.5.w)),
-          )
+          minimumSize: _btnSize,
+          shape: _btnShape,
       ),
-      onPressed: onConfirm,
+      onPressed: _handleConfirm,
     );
   }
 
   Widget _cancelBtn() {
     return ElevatedButton(
-      child: const Text("取消"),
+      child: Text("取消", style: TextStyle(color: _primaryColor, fontSize: 18.sp, letterSpacing: 5.sp)),
       style: ElevatedButton.styleFrom(
-        primary: Colors.transparent,
-        textStyle: TextStyle(color: const Color(0xFFFF703B), fontSize: 20.sp, letterSpacing: 5.sp),
+        primary: Colors.white,
         elevation: 0,
-        minimumSize: Size(90.w, 49.w),
-        shape: RoundedRectangleBorder(
-          side: const BorderSide(color: Color(0xFFFF703B), width: 2.0),
-          borderRadius: BorderRadius.all(Radius.circular(24.5.w)),
-        )
+        minimumSize: _btnSize,
+        shape: _btnShape,
       ),
-      onPressed: onCancel,
+      onPressed: _handleCancel,
     );
   }
 
   Widget _alert() {
     return SimpleDialog(
-      title: Text(title),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24.w)),
+      titleTextStyle: _titleStyle,
+      title: Text(title, textAlign: TextAlign.center),
         children: [
-          if (null != message) Text(message!),
+          if (null != message) Text(message!, textAlign: TextAlign.center, style: _messageStyle),
           if (null != content) content!,
+          SizedBox(height: 16.w),
           Center(
             child: _confirmBtn(),
-          )
+          ),
+          SizedBox(height: 10.w),
         ]
     );
   }
 
   Widget _dialog() {
+    Widget hSpacer = SizedBox(width: 16.w);
+
     return SimpleDialog(
-        title: Text(title),
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24.w)),
+        titleTextStyle: _titleStyle,
+        title: Text(title, textAlign: TextAlign.center),
+        alignment: Alignment.center,
         children: [
-          if (null != message) Text(message!),
+          if (null != message) Text(message!, textAlign: TextAlign.center, style: _messageStyle),
           if (null != content) content!,
+          SizedBox(height: 16.w),
           Row(
+            mainAxisAlignment: MainAxisAlignment.center,
             children: [
+              hSpacer,
               Center(
                 child: _confirmBtn(),
               ),
+              hSpacer,
               Center(
                 child: _cancelBtn(),
-              )
+              ),
+              hSpacer,
             ],
-          )
+          ),
+          SizedBox(height: 10.w),
         ]
     );
   }