fancy пре 5 година
родитељ
комит
3b006c9c18
4 измењених фајлова са 10 додато и 10 уклоњено
  1. 4 4
      o2ios/O2Platform.xcodeproj/project.pbxproj
  2. 1 1
      o2ios/O2Platform/config/config.swift
  3. 1 1
      o2ios/Podfile
  4. 4 4
      o2ios/Podfile.lock

+ 4 - 4
o2ios/O2Platform.xcodeproj/project.pbxproj

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

+ 1 - 1
o2ios/O2Platform/config/config.swift

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

+ 1 - 1
o2ios/Podfile

@@ -58,7 +58,7 @@ target 'O2Platform' do
     pod 'SDWebImage', '~>4.0'
     pod 'SDWebImage', '~>4.0'
     
     
     pod 'BSImagePicker'
     pod 'BSImagePicker'
-    pod 'Eureka'
+    pod 'Eureka', '~> 5.2.1'
     pod 'SwiftyTimer'
     pod 'SwiftyTimer'
 
 
     pod 'Charts'
     pod 'Charts'

+ 4 - 4
o2ios/Podfile.lock

@@ -24,7 +24,7 @@ PODS:
   - CocoaLumberjack/Swift (3.5.3):
   - CocoaLumberjack/Swift (3.5.3):
     - CocoaLumberjack/Core
     - CocoaLumberjack/Core
   - EmptyDataSet-Swift (5.0.0)
   - EmptyDataSet-Swift (5.0.0)
-  - Eureka (4.3.0)
+  - Eureka (5.2.1)
   - FMDB (2.6.2):
   - FMDB (2.6.2):
     - FMDB/standard (= 2.6.2)
     - FMDB/standard (= 2.6.2)
   - FMDB/standard (2.6.2)
   - FMDB/standard (2.6.2)
@@ -92,7 +92,7 @@ DEPENDENCIES:
   - Chrysan
   - Chrysan
   - CocoaLumberjack/Swift (~> 3.5)
   - CocoaLumberjack/Swift (~> 3.5)
   - EmptyDataSet-Swift (~> 5.0.0)
   - EmptyDataSet-Swift (~> 5.0.0)
-  - Eureka
+  - Eureka (~> 5.2.1)
   - FMDB (~> 2.6.2)
   - FMDB (~> 2.6.2)
   - FSCalendar
   - FSCalendar
   - HandyJSON (~> 5.0.2-beta)
   - HandyJSON (~> 5.0.2-beta)
@@ -193,7 +193,7 @@ SPEC CHECKSUMS:
   Chrysan: 6bf6682adb2db76f7f5c103930a8c6670f54eebe
   Chrysan: 6bf6682adb2db76f7f5c103930a8c6670f54eebe
   CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
   CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
   EmptyDataSet-Swift: eb382c0c87a2d9c678077385a595cec52da38171
   EmptyDataSet-Swift: eb382c0c87a2d9c678077385a595cec52da38171
-  Eureka: 6d711cb30ca333b4bc893110285a722ae3840114
+  Eureka: c883105488e05bc65539f583246ecf9657cabbfe
   FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
   FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
   FSCalendar: 3a5ed3636e2ba1b83ebebfcf0c2603105a6f5efe
   FSCalendar: 3a5ed3636e2ba1b83ebebfcf0c2603105a6f5efe
   HandyJSON: e18b035d60cb4847c609a59bb831c5db8c549663
   HandyJSON: e18b035d60cb4847c609a59bb831c5db8c549663
@@ -224,6 +224,6 @@ SPEC CHECKSUMS:
   YHPhotoKit: e88368af1fca0a110d41b88417088f7e49876981
   YHPhotoKit: e88368af1fca0a110d41b88417088f7e49876981
   YHPopupView: 96d9c05c79a2a17cf69c3def09e5305cfae9e8e8
   YHPopupView: 96d9c05c79a2a17cf69c3def09e5305cfae9e8e8
 
 
-PODFILE CHECKSUM: 6d51640fea677ad9323a17f4b57b9a875165afcd
+PODFILE CHECKSUM: db8bd463f4a5f9d40d99734694cef3178373900d
 
 
 COCOAPODS: 1.8.4
 COCOAPODS: 1.8.4