Merge pull request answer-huang#56 from liunianhuaguoyanxi/master

优化代码，快速根据友盟反馈定位崩溃信息
longshanzhiyu · Mar 3, 2020 · 98d63f5 · 98d63f5
2 parents bdff0d1 + cf9712a
commit 98d63f5
Show file tree

Hide file tree

Showing 54 changed files with 137 additions and 32 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Objective-C/.DS_Store b/Objective-C/.DS_Store
diff --git a/Objective-C/DSYMTools.xcodeproj/project.pbxproj b/Objective-C/DSYMTools.xcodeproj/project.pbxproj
@@ -159,7 +159,7 @@
 		80817F1F1D45F4D500CD2A11 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0810;
+				LastUpgradeCheck = 1130;
 				ORGANIZATIONNAME = answer;
 				TargetAttributes = {
 					80817F261D45F4D500CD2A11 = {
@@ -174,7 +174,7 @@
 			};
 			buildConfigurationList = 80817F221D45F4D500CD2A11 /* Build configuration list for PBXProject "DSYMTools" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -238,19 +238,28 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -284,19 +293,28 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -323,6 +341,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = DSYMTools/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
@@ -335,6 +354,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = DSYMTools/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";

diff --git a/Objective-C/DSYMTools.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Objective-C/DSYMTools.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Objective-C/DSYMTools.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Objective-C/DSYMTools.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/...s.xcodeproj/project.xcworkspace/xcuserdata/Don.xcuserdatad/UserInterfaceState.xcuserstate b/...s.xcodeproj/project.xcworkspace/xcuserdata/Don.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...codeproj/project.xcworkspace/xcuserdata/answer.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/answer.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...proj/project.xcworkspace/xcuserdata/answer.xcuserdatad/xcschemes/xcschememanagement.plist b/...proj/project.xcworkspace/xcuserdata/answer.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/...ject.xcworkspace/xcuserdata/liunianhuaguoyanxi.xcuserdatad/UserInterfaceState.xcuserstate b/...ject.xcworkspace/xcuserdata/liunianhuaguoyanxi.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...-C/DSYMTools.xcodeproj/xcuserdata/answer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...-C/DSYMTools.xcodeproj/xcuserdata/answer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
diff --git a/Objective-C/DSYMTools.xcodeproj/xcuserdata/answer.xcuserdatad/xcschemes/DSYMTools.xcscheme b/Objective-C/DSYMTools.xcodeproj/xcuserdata/answer.xcuserdatad/xcschemes/DSYMTools.xcscheme
diff --git a/...ve-C/DSYMTools.xcodeproj/xcuserdata/answer.xcuserdatad/xcschemes/xcschememanagement.plist b/...ve-C/DSYMTools.xcodeproj/xcuserdata/answer.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/....xcodeproj/xcuserdata/liunianhuaguoyanxi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/....xcodeproj/xcuserdata/liunianhuaguoyanxi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "A878E84D-C36E-4741-A5BF-E5A69609249A"
+   type = "1"
+   version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "D7E03E71-0E0B-4312-813B-2A1F4D82D950"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "DSYMTools/Controller/MainWindowViewController.m"
+            timestampString = "593408618.510036"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "367"
+            endingLineNumber = "367"
+            landmarkName = "-analyse:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "4ACB85F9-5B89-414E-818D-BDF93533EDAA"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "DSYMTools/Controller/MainWindowViewController.m"
+            timestampString = "593408618.510618"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "371"
+            endingLineNumber = "371"
+            landmarkName = "-analyse:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
+</Bucket>
diff --git a/...ls.xcodeproj/xcuserdata/liunianhuaguoyanxi.xcuserdatad/xcschemes/xcschememanagement.plist b/...ls.xcodeproj/xcuserdata/liunianhuaguoyanxi.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>DSYMTools.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/Objective-C/DSYMTools/AppDelegate.h b/Objective-C/DSYMTools/AppDelegate.h
diff --git a/Objective-C/DSYMTools/AppDelegate.m b/Objective-C/DSYMTools/AppDelegate.m
diff --git a/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/Contents.json b/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon1024.png b/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon1024.png
diff --git a/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon128.png b/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon128.png
diff --git a/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon16.png b/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon16.png
diff --git a/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon256-1.png b/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon256-1.png
diff --git a/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon256.png b/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon256.png
diff --git a/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon32-1.png b/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon32-1.png
diff --git a/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon32.png b/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon32.png
diff --git a/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon512-1.png b/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon512-1.png
diff --git a/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon512.png b/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon512.png
diff --git a/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon64.png b/Objective-C/DSYMTools/Assets.xcassets/AppIcon.appiconset/icon64.png
diff --git a/Objective-C/DSYMTools/Assets.xcassets/Contents.json b/Objective-C/DSYMTools/Assets.xcassets/Contents.json
diff --git a/Objective-C/DSYMTools/Assets.xcassets/about.imageset/Contents.json b/Objective-C/DSYMTools/Assets.xcassets/about.imageset/Contents.json
diff --git a/Objective-C/DSYMTools/Assets.xcassets/about.imageset/about.png b/Objective-C/DSYMTools/Assets.xcassets/about.imageset/about.png
diff --git a/Objective-C/DSYMTools/Assets.xcassets/avatar.imageset/Contents.json b/Objective-C/DSYMTools/Assets.xcassets/avatar.imageset/Contents.json
diff --git a/Objective-C/DSYMTools/Assets.xcassets/avatar.imageset/avatar.jpg b/Objective-C/DSYMTools/Assets.xcassets/avatar.imageset/avatar.jpg
diff --git a/Objective-C/DSYMTools/Assets.xcassets/export.imageset/Contents.json b/Objective-C/DSYMTools/Assets.xcassets/export.imageset/Contents.json
diff --git a/Objective-C/DSYMTools/Assets.xcassets/export.imageset/export.png b/Objective-C/DSYMTools/Assets.xcassets/export.imageset/export.png
diff --git a/Objective-C/DSYMTools/Base.lproj/MainMenu.xib b/Objective-C/DSYMTools/Base.lproj/MainMenu.xib
diff --git a/Objective-C/DSYMTools/Controller/AboutWindowController.h b/Objective-C/DSYMTools/Controller/AboutWindowController.h
diff --git a/Objective-C/DSYMTools/Controller/AboutWindowController.m b/Objective-C/DSYMTools/Controller/AboutWindowController.m
diff --git a/Objective-C/DSYMTools/Controller/AboutWindowController.xib b/Objective-C/DSYMTools/Controller/AboutWindowController.xib
diff --git a/Objective-C/DSYMTools/Controller/MainWindowViewController.m b/Objective-C/DSYMTools/Controller/MainWindowViewController.m
@@ -63,6 +63,7 @@ @interface MainWindowViewController ()<NSTableViewDelegate, NSTableViewDataSourc
  */
 @property (unsafe_unretained) IBOutlet NSTextView *errorMessageView;
 
+@property (weak) IBOutlet NSTextField *errorTextField;
 
 
 @property (weak) IBOutlet ArchiveFilesScrollView *archiveFilesScrollView;
@@ -391,7 +392,11 @@ - (IBAction)analyse:(id)sender {
             result = [self runCommand:commandString];
 
         }else{
-            NSString *commandString = [NSString stringWithFormat:@"xcrun atos -arch %@ -o \"%@\" -l %@ %@", self.selectedUUIDInfo.arch, self.selectedUUIDInfo.executableFilePath, self.defaultSlideAddressLabel.stringValue, self.errorMemoryAddressLabel.stringValue];
+            NSString *memoryAddressToTen = [self sixtyToTen:self.errorMemoryAddressLabel.stringValue];
+            NSInteger memoryAddressTenInt = memoryAddressToTen.integerValue + self.errorTextField.stringValue.integerValue;
+            NSString *slideAddressSixTyStr = [self tenToSixTy:memoryAddressTenInt];
+
+            NSString *commandString = [NSString stringWithFormat:@"xcrun atos -arch %@ -o \"%@\" -l %@ %@", self.selectedUUIDInfo.arch, self.selectedUUIDInfo.executableFilePath, self.defaultSlideAddressLabel.stringValue, slideAddressSixTyStr];
             result = [self runCommand:commandString];
         }
     }