瀏覽代碼

禁用Android混淆

Melon 1 年之前
父節點
當前提交
81dedcff6d
共有 4 個文件被更改,包括 15 次插入3 次删除
  1. 4 0
      android/app/build.gradle
  2. 8 0
      lib/pages/settings/devices/widgets/search_dialog.dart
  3. 2 2
      pubspec.lock
  4. 1 1
      pubspec.yaml

+ 4 - 0
android/app/build.gradle

@@ -57,6 +57,9 @@ android {
 
     buildTypes {
         release {
+            minifyEnabled false
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             // 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
@@ -76,4 +79,5 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
     implementation 'androidx.work:work-runtime:2.7.1' 
+    implementation 'org.greenrobot:eventbus:3.1.1'
 }

+ 8 - 0
lib/pages/settings/devices/widgets/search_dialog.dart

@@ -40,6 +40,7 @@ class _DialogState extends State<DeviceSearchDialog> {
         searcher = DeviceSearcher(widget.type);
         searcher!.successEvent.addListener(_onSuccess);
         searcher!.failEvent.addListener(_onFail);
+        searcher!.timeoutEvent.addListener(_onTimeout);
         searcher!.start();
       }
     });
@@ -51,6 +52,7 @@ class _DialogState extends State<DeviceSearchDialog> {
     if (searcher != null) {
       searcher!.successEvent.removeListener(_onSuccess);
       searcher!.failEvent.removeListener(_onFail);
+      searcher!.timeoutEvent.removeListener(_onTimeout);
       searcher!.stop().then((value) {
         searcher = null;
       });
@@ -88,6 +90,12 @@ class _DialogState extends State<DeviceSearchDialog> {
       errorMsg = e ?? "";
     });
   }
+
+  void _onTimeout(_, e) {
+    setState(() {
+      errorMsg = "未找到设备";
+    });
+  }
 }
 
 class _LoadingWidget extends StatelessWidget {

+ 2 - 2
pubspec.lock

@@ -932,8 +932,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "05786f1c82"
-      resolved-ref: "05786f1c827c45dc994793cdff329a8fdc347c8e"
+      ref: "6f5f3a3fd1"
+      resolved-ref: "6f5f3a3fd160cb6359ad4dda9a5bb208da51dbda"
       url: "http://git.ius.plus/Project-Vital/FlutterDevicePlugin.git"
     source: git
     version: "0.0.1"

+ 1 - 1
pubspec.yaml

@@ -49,7 +49,7 @@ dependencies:
   vnote_device_plugin:
     git:
       url: http://git.ius.plus/Project-Vital/FlutterDevicePlugin.git
-      ref: 6262d75192
+      ref: 6f5f3a3fd1
     # path: ..\FlutterDevicePlugin
   vital_local_database:
     git: