enable SUPPORTS_MACCATALYST, fix warning for implicit type conversion. (

#372)
Tencent · Oct 16, 2019 · 138e721 · 138e721
1 parent c33f826
commit 138e721
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/matrix/matrix-iOS/Matrix/Matrix.xcodeproj/project.pbxproj b/matrix/matrix-iOS/Matrix/Matrix.xcodeproj/project.pbxproj
@@ -1673,6 +1673,7 @@
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_STYLE = debugging;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
+				SUPPORTS_MACCATALYST = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALID_ARCHS = "";
 				"VALID_ARCHS[sdk=iphoneos*]" = "arm64 arm64e armv7 armv7s";
@@ -1725,6 +1726,7 @@
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_STYLE = debugging;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
+				SUPPORTS_MACCATALYST = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALID_ARCHS = "";
 				"VALID_ARCHS[sdk=iphoneos*]" = "arm64 arm64e armv7 armv7s";

diff --git a/...rashBlockMonitor/CrashBlockPlugin/Main/BlockMonitor/Report/WCGetCallStackReportHandler.mm b/...rashBlockMonitor/CrashBlockPlugin/Main/BlockMonitor/Report/WCGetCallStackReportHandler.mm
@@ -202,7 +202,7 @@ + (NSData *)getReportJsonDataWithPowerConsumeStack:(NSArray <NSDictionary *> *)P
                         forKey:@KSCrashField_System];
     NSDictionary *userDic = [[WCBlockMonitorMgr shareInstance] getUserInfoForCurrentDumpForDumpType:dumpType];
     [reportDictionary setValue:userDic forKey:@KSCrashExcType_User];
-    [reportDictionary setValue:[NSNumber numberWithInt:dumpType] forKey:@KSCrashField_DumpType];
+    [reportDictionary setValue:[NSNumber numberWithUnsignedInteger:dumpType] forKey:@KSCrashField_DumpType];
     [reportDictionary setValue:PowerConsumeStackArray forKey:@CustomStackString];
     NSData *jsonData = [WCCrashBlockJsonUtil jsonEncode:reportDictionary withError:nil];
     return jsonData;