更新umeng drash

1fcb038e · 汪林玲 · 2ebb2c4d · 1fcb038e · 1fcb038e · 1fcb038e
Commit 1fcb038e authored Sep 15, 2021 by 汪林玲
10 changed files
--- a/android/.settings/org.eclipse.buildship.core.prefs
+++ b/android/.settings/org.eclipse.buildship.core.prefs
 arguments=
 auto.sync=false
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.0-rc-1))
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/temurin-11.jdk/Contents/Home
+java.home=
 jvm.arguments=
 offline.mode=false
-override.workspace.settings=true
-show.console.view=true
-show.executions.view=true
+override.workspace.settings=false
+show.console.view=false
+show.executions.view=false
--- a/example/android/.settings/org.eclipse.buildship.core.prefs
+++ b/example/android/.settings/org.eclipse.buildship.core.prefs
 arguments=
 auto.sync=false
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.0-rc-1))
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=

--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
+PODS:
+  - Flutter (1.0.0)
+  - UMAPM (1.4.2)
+  - UMCommon (7.3.5):
+    - UMDevice
+  - UMDevice (2.0.5)
+  - umeng_crash (0.0.1):
+    - Flutter
+    - UMAPM
+    - UMCommon
+    - UMDevice
+
+DEPENDENCIES:
+  - Flutter (from `Flutter`)
+  - umeng_crash (from `.symlinks/plugins/umeng_crash/ios`)
+
+SPEC REPOS:
+  trunk:
+    - UMAPM
+    - UMCommon
+    - UMDevice
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: Flutter
+  umeng_crash:
+    :path: ".symlinks/plugins/umeng_crash/ios"
+
+SPEC CHECKSUMS:
+  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
+  UMAPM: 9766611aba84e0755afc785d4399f1e9fbb0a475
+  UMCommon: ab4d875ddefe1b06c60b577e4a58bc4d433ee067
+  UMDevice: c13bbb2e8ca6c67d1e23e03162553e3ec5a8b5b0
+  umeng_crash: 44f5ac9d65533c147e825d5e274b3025a46bf355
+
+PODFILE CHECKSUM: 8e679eca47255a8ca8067c4c67aab20e64cb974d
+
+COCOAPODS: 1.10.2
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -14,6 +14,7 @@
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		AB7EE71EDC962184561AAB47 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0E9B1757FB487729AE76ED4 /* libPods-Runner.a */; };
 /* End PBXBuildFile section */

 /* Begin PBXCopyFilesBuildPhase section */
@@ -32,10 +33,12 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		1555804D0D328CC2E85FE2F8 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		931ACA431E5D689A41E1F2EA /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -44,6 +47,8 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		E6F4E4729A80330F3324895D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		F0E9B1757FB487729AE76ED4 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -51,12 +56,32 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				AB7EE71EDC962184561AAB47 /* libPods-Runner.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
+		3E1F3F6B29722DFCDF8BD27F /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				1555804D0D328CC2E85FE2F8 /* Pods-Runner.debug.xcconfig */,
+				E6F4E4729A80330F3324895D /* Pods-Runner.release.xcconfig */,
+				931ACA431E5D689A41E1F2EA /* Pods-Runner.profile.xcconfig */,
+			);
+			name = Pods;
+			path = Pods;
+			sourceTree = "<group>";
+		};
+		7BDF7F75C3453A0E998B25FE /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				F0E9B1757FB487729AE76ED4 /* libPods-Runner.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -74,7 +99,8 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				CF3B75C9A7D2FA2A4C99F110 /* Frameworks */,
+				3E1F3F6B29722DFCDF8BD27F /* Pods */,
+				7BDF7F75C3453A0E998B25FE /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -117,6 +143,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				2ED9E2FBD39A4061F89CB325 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
@@ -180,6 +207,28 @@
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXShellScriptBuildPhase section */
+		2ED9E2FBD39A4061F89CB325 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

--- a/example/ios/Runner.xcworkspace/contents.xcworkspacedata
+++ b/example/ios/Runner.xcworkspace/contents.xcworkspacedata
@@ -4,4 +4,7 @@
   <FileRef
      location = "group:Runner.xcodeproj">
   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>
--- a/example/lib/app.dart
+++ b/example/lib/app.dart
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:umeng_crash/umeng_crash.dart';

 class MyApp extends StatefulWidget {
+  
  @override
  _MyAppState createState() => _MyAppState();
 }

 class _MyAppState extends State<MyApp> {
-  String _platformVersion = 'Unknown';
+
  @override
  void initState() {
    super.initState();
-    initPlatformState();
-  }
-
-  // Platform messages are asynchronous, so we initialize in an async method.
-  Future<void> initPlatformState() async {
-    String platformVersion;
-    // Platform messages may fail, so we use a try/catch PlatformException.
-    // We also handle the message potentially returning null.
-    try {
-      platformVersion =
-          await UmengCrash.platformVersion ?? 'Unknown platform version';
-    } on PlatformException {
-      platformVersion = 'Failed to get platform version.';
-    }
-
-    if (!mounted) return;
-
-    setState(() {
-      _platformVersion = platformVersion;
-    });
  }

  @override

--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -141,7 +141,7 @@ packages:
      path: ".."
      relative: true
    source: path
-    version: "0.0.1"
+    version: "1.0.0"
  vector_math:
    dependency: transitive
    description:

--- a/ios/Classes/UmengCrashPlugin.m
+++ b/ios/Classes/UmengCrashPlugin.m
 #import "UmengCrashPlugin.h"
+#import <UMCommon/UMCommon.h>
+#import <UMAPM/UMAPMConfig.h>
+#import <UMAPM/UMCrashConfigure.h>
+#import <UMAPM/UMCrashConfigure.h>

 @implementation UmengCrashPlugin
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
  FlutterMethodChannel* channel = [FlutterMethodChannel
-      methodChannelWithName:@"umeng_crash"
+      methodChannelWithName:@"umeng.crash.plugin"
            binaryMessenger:[registrar messenger]];
  UmengCrashPlugin* instance = [[UmengCrashPlugin alloc] init];
  [registrar addMethodCallDelegate:instance channel:channel];
 }

 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
-  if ([@"getPlatformVersion" isEqualToString:call.method]) {
-    result([@"iOS " stringByAppendingString:[[UIDevice currentDevice] systemVersion]]);
-  } else {
-    result(FlutterMethodNotImplemented);
-  }
+    if([@"preInit" isEqualToString:call.method]){
+        
+    }else if([@"init" isEqualToString:call.method]){
+        NSString *appKey = call.arguments[@"appKey"];
+        NSString *channel = call.arguments[@"channel"];
+        [UMConfigure initWithAppkey:appKey channel:channel];
+        result(@(YES));
+    }else if([@"setAppVersion" isEqualToString:call.method]){
+        NSString *version = call.arguments[@"version"];
+        NSString *subVersion = call.arguments[@"subVersion"];
+        [UMCrashConfigure setAppVersion:version buildVersion:subVersion];
+        result(@(YES));
+    }else if([@"generateCustomLog" isEqualToString:call.method]){
+        NSString *e = call.arguments[@"e"];
+        NSString *type = call.arguments[@"type"];
+        NSLog(@"%@==>%@",type,e);
+        result(@(YES));
+    }else if([@"onKillProcess" isEqualToString:call.method]){
+        
+        result(@(YES));
+    }else if([@"getOaid" isEqualToString: call.method]){
+        NSString *umengZID = [UMConfigure getUmengZID];
+        result(umengZID);
+    }else if ([@"getPlatformVersion" isEqualToString:call.method]) {
+        result([@"iOS " stringByAppendingString:[[UIDevice currentDevice] systemVersion]]);
+    } else {
+        result(FlutterMethodNotImplemented);
+    }
 }

 @end
--- a/ios/umeng_crash.podspec
+++ b/ios/umeng_crash.podspec
@@ -4,8 +4,8 @@
 #
 Pod::Spec.new do |s|
  s.name             = 'umeng_crash'
-  s.version          = '0.0.1'
-  s.summary          = 'A new flutter plugin project.'
+  s.version          = '1.0.0'
+  s.summary          = 'flutter umeng plugin project.'
  s.description      = <<-DESC
 A new flutter plugin project.
                       DESC
@@ -17,7 +17,11 @@ A new flutter plugin project.
  s.public_header_files = 'Classes/**/*.h'
  s.dependency 'Flutter'
  s.platform = :ios, '8.0'
-
+  s.dependency 'UMCommon'
+  s.dependency 'UMDevice'
+  s.dependency 'UMAPM'
+  s.libraries = 'z','sqlite3','c++'
+  s.frameworks = 'CoreTelephony','SystemConfiguration'
  # Flutter.framework does not contain a i386 slice.
  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
 end
--- a/pubspec.yaml
+++ b/pubspec.yaml
 name: umeng_crash
 description: 应用性能监控 SDK。
-version: 0.0.1
+version: 1.0.0
 homepage:

 environment: