Merge branch 'fix/ios_134_crash' into 'develop'

Fix/ios最新版本13.4会闪退的bug修复

See merge request o2oa/o2oa!159

o2ios/O2Platform.xcodeproj/project.pbxproj

@@ -6619,7 +6619,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 66;
+				CURRENT_PROJECT_VERSION = 67;
 				DEVELOPMENT_TEAM = NTDRU2P6T4;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6651,7 +6651,7 @@
 					"$(PROJECT_DIR)/O2Platform/framework/MegviiLicMgr-iOS-SDK",
 					"$(PROJECT_DIR)/O2Platform/framework/O2OA_Flutter_SDK",
 				);
-				MARKETING_VERSION = 5.0.6;
+				MARKETING_VERSION = 5.0.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -6733,7 +6733,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 66;
+				CURRENT_PROJECT_VERSION = 67;
 				DEVELOPMENT_TEAM = NTDRU2P6T4;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6765,7 +6765,7 @@
 					"$(PROJECT_DIR)/O2Platform/framework/MegviiLicMgr-iOS-SDK",
 					"$(PROJECT_DIR)/O2Platform/framework/O2OA_Flutter_SDK",
 				);
-				MARKETING_VERSION = 5.0.6;
+				MARKETING_VERSION = 5.0.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

o2ios/O2Platform/Framework/O2OA_Auth_SDK.framework/Headers/O2OA_Auth_SDK-Swift.h

@@ -1,6 +1,6 @@
 #if 0
 #elif defined(__arm64__) && __arm64__
-// Generated by Apple Swift version 5.1.2 effective-4.2 (swiftlang-1100.0.278 clang-1100.0.33.9)
+// Generated by Apple Swift version 5.2 (swiftlang-1103.0.32.1 clang-1103.0.32.29)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgcc-compat"
 
@@ -84,6 +84,11 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 #else
 # define SWIFT_NOESCAPE
 #endif
+#if __has_attribute(ns_consumed)
+# define SWIFT_RELEASES_ARGUMENT __attribute__((ns_consumed))
+#else
+# define SWIFT_RELEASES_ARGUMENT
+#endif
 #if __has_attribute(warn_unused_result)
 # define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
 #else
@@ -234,7 +239,7 @@ SWIFT_CLASS("_TtC13O2OA_Auth_SDK10O2AppModel")
 SWIFT_CLASS("_TtC13O2OA_Auth_SDK9O2AuthSDK")
 @interface O2AuthSDK : NSObject
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
-+ (nonnull instancetype)new SWIFT_DEPRECATED_MSG("-init is unavailable");
++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
 @end
 
 
@@ -412,7 +417,7 @@ SWIFT_CLASS("_TtC13O2OA_Auth_SDK16O2WebServerModel")
 #pragma clang diagnostic pop
 
 #elif defined(__ARM_ARCH_7A__) && __ARM_ARCH_7A__
-// Generated by Apple Swift version 5.1.2 effective-4.2 (swiftlang-1100.0.278 clang-1100.0.33.9)
+// Generated by Apple Swift version 5.2 (swiftlang-1103.0.32.1 clang-1103.0.32.29)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgcc-compat"
 
@@ -496,6 +501,11 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 #else
 # define SWIFT_NOESCAPE
 #endif
+#if __has_attribute(ns_consumed)
+# define SWIFT_RELEASES_ARGUMENT __attribute__((ns_consumed))
+#else
+# define SWIFT_RELEASES_ARGUMENT
+#endif
 #if __has_attribute(warn_unused_result)
 # define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
 #else
@@ -646,7 +656,7 @@ SWIFT_CLASS("_TtC13O2OA_Auth_SDK10O2AppModel")
 SWIFT_CLASS("_TtC13O2OA_Auth_SDK9O2AuthSDK")
 @interface O2AuthSDK : NSObject
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
-+ (nonnull instancetype)new SWIFT_DEPRECATED_MSG("-init is unavailable");
++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
 @end
 
 

o2ios/O2Platform/config/config.swift

@@ -10,7 +10,7 @@ import Foundation
 
 
 //是否连接到collect服务器 直连版本false 需要在Info.plist配置服务器信息
-let O2IsConnect2Collect = false
+let O2IsConnect2Collect = true
 
 //一些常量
 //bugly

o2ios/Podfile

@@ -46,7 +46,7 @@ target 'O2Platform' do
     # UserDefaults加强
     pod 'SwiftyUserDefaults', '~>3.0'
     # json
-    pod 'HandyJSON', '~> 5.0.0'
+    pod 'HandyJSON', '~> 5.0.2-beta'
     pod 'SwiftyJSON', '~>3.1'
     # reactive
     pod 'ReactiveSwift', '~> 5.0'
@@ -58,7 +58,7 @@ target 'O2Platform' do
     pod 'SDWebImage', '~>4.0'
     
     pod 'BSImagePicker'
-    pod 'Eureka'
+    pod 'Eureka', '~> 5.2.1'
     pod 'SwiftyTimer'
 
     pod 'Charts'

o2ios/Podfile.lock

@@ -24,12 +24,12 @@ PODS:
   - CocoaLumberjack/Swift (3.5.3):
     - CocoaLumberjack/Core
   - EmptyDataSet-Swift (5.0.0)
-  - Eureka (4.3.0)
+  - Eureka (5.2.1)
   - FMDB (2.6.2):
     - FMDB/standard (= 2.6.2)
   - FMDB/standard (2.6.2)
   - FSCalendar (2.8.0)
-  - HandyJSON (5.0.0)
+  - HandyJSON (5.0.2-beta)
   - ImageSlideshow (1.7.0):
     - ImageSlideshow/Core (= 1.7.0)
   - ImageSlideshow/Alamofire (1.7.0):
@@ -92,10 +92,10 @@ DEPENDENCIES:
   - Chrysan
   - CocoaLumberjack/Swift (~> 3.5)
   - EmptyDataSet-Swift (~> 5.0.0)
-  - Eureka
+  - Eureka (~> 5.2.1)
   - FMDB (~> 2.6.2)
   - FSCalendar
-  - HandyJSON (~> 5.0.0)
+  - HandyJSON (~> 5.0.2-beta)
   - ImageSlideshow (~> 1.5)
   - ImageSlideshow/Alamofire
   - IQKeyboardManagerSwift
@@ -193,10 +193,10 @@ SPEC CHECKSUMS:
   Chrysan: 6bf6682adb2db76f7f5c103930a8c6670f54eebe
   CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
   EmptyDataSet-Swift: eb382c0c87a2d9c678077385a595cec52da38171
-  Eureka: 6d711cb30ca333b4bc893110285a722ae3840114
+  Eureka: c883105488e05bc65539f583246ecf9657cabbfe
   FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
   FSCalendar: 3a5ed3636e2ba1b83ebebfcf0c2603105a6f5efe
-  HandyJSON: 992f2d661716d6a91de82d0056927bc7813b5770
+  HandyJSON: e18b035d60cb4847c609a59bb831c5db8c549663
   ImageSlideshow: f8eec5e37a980f60923b585ff23b0e140fd24018
   IQKeyboardManagerSwift: b07ccf9d8cafe993dcd6cb794eb4ba34611a0c4e
   JCore: 1a426120b510cdebfd67b82bfb9483238ee09413
@@ -224,6 +224,6 @@ SPEC CHECKSUMS:
   YHPhotoKit: e88368af1fca0a110d41b88417088f7e49876981
   YHPopupView: 96d9c05c79a2a17cf69c3def09e5305cfae9e8e8
 
-PODFILE CHECKSUM: d1360080e7994d58c830e43b2e9d56aa35f3e3e6
+PODFILE CHECKSUM: db8bd463f4a5f9d40d99734694cef3178373900d
 
 COCOAPODS: 1.8.4