Finish Release-5.4.3-20240827

lszzy · Aug 27, 2024 · b46db01 · b46db01
2 parents 9096b46 + 773d2e0
commit b46db01
Show file tree

Hide file tree

Showing 18 changed files with 1,543 additions and 1,525 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [5.4.3] - 2024-08-27
+
+### Added
+* Automatically implement UIViewController.injected method when InjectionIII is enabled
+
 ## [5.4.2] - 2024-08-12
 
 ### Added

diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
@@ -1,5 +1,10 @@
 # 更新日志
 
+## [5.4.3] - 2024-08-27
+
+### Added
+* 启用InjectionIII时自动实现UIViewController.injected方法
+
 ## [5.4.2] - 2024-08-12
 
 ### Added

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - FWDebug (5.4.1)
+  - FWDebug (5.4.3)
 
 DEPENDENCIES:
   - FWDebug (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  FWDebug: d5bcba51c03be836cd24c5f1a663a4aae43ab246
+  FWDebug: 09201e5ee86382268f0669970f96ed46cebbeefc
 
 PODFILE CHECKSUM: bfd25050ff2f8ce8d3b20e2e93e52d3045df26e7
 

diff --git a/Example/Pods/Local Podspecs/FWDebug.podspec.json b/Example/Pods/Local Podspecs/FWDebug.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Target Support Files/FWDebug/FWDebug-Info.plist b/Example/Pods/Target Support Files/FWDebug/FWDebug-Info.plist
diff --git a/FWDebug.podspec b/FWDebug.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = "FWDebug"
-  s.version             = "5.4.2"
+  s.version             = "5.4.3"
   s.summary             = "ios debug library"
   s.homepage            = "http://wuyong.site"
   s.license             = "MIT"

diff --git a/FWDebug/Classes/Private/FLEX/FWDebugAppConfig.m b/FWDebug/Classes/Private/FLEX/FWDebugAppConfig.m
@@ -68,6 +68,14 @@ + (void)fwDebugLoad
 #if TARGET_OS_SIMULATOR
         // https://itunes.apple.com/cn/app/injectioniii/id1380446739?mt=12
         [[NSBundle bundleWithPath:@"/Applications/InjectionIII.app/Contents/Resources/iOSInjection.bundle"] load];
+
+        #ifdef DEBUG
+        [FWDebugManager swizzleMethod:NSSelectorFromString(@"injected") in:[UIViewController class] withBlock:^id(__unsafe_unretained Class targetClass, SEL originalCMD, IMP (^originalIMP)(void)) {
+            return ^(__unsafe_unretained UIViewController *selfObject) {
+                [selfObject viewDidLoad];
+            };
+        }];
+        #endif
 #endif
     }
 
@@ -545,7 +553,7 @@ - (void)configSwitch:(UITableViewCell *)cell indexPath:(NSIndexPath *)indexPath
         cellSwitch.on = [self.class isSecretEnabled];
     } else if (indexPath.section == FWDebugAppConfigSectionApp && indexPath.row == FWDebugAppConfigSectionAppRowInjectionIII) {
         cell.textLabel.text = @"Load Simulator InjectionIII";
-        cell.detailTextLabel.text = nil;
+        cell.detailTextLabel.text = [self.class isInjectionEnabled] ? @"Implement UIViewController.injected" : nil;
         cellSwitch.on = [self.class isInjectionEnabled];
     }
 }

diff --git a/Framework/FWDebug.xcframework/Info.plist b/Framework/FWDebug.xcframework/Info.plist
@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>FWDebug.framework/FWDebug</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>FWDebug.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>FWDebug.framework/FWDebug</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>FWDebug.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/Framework/FWDebug.xcframework/ios-arm64/FWDebug.framework/FWDebug b/Framework/FWDebug.xcframework/ios-arm64/FWDebug.framework/FWDebug
diff --git a/Framework/FWDebug.xcframework/ios-arm64/FWDebug.framework/Info.plist b/Framework/FWDebug.xcframework/ios-arm64/FWDebug.framework/Info.plist