From 5fcfa84766bcc11c714529c167b33ad7b09014b7 Mon Sep 17 00:00:00 2001
From: TrueZhuanjia <veimin@foxmail.com>
Date: Sun, 27 Jul 2025 01:12:07 +0800
Subject: [PATCH] try to fix aboutView ok button

---
 VoidLink/AboutView.swift                           | 14 ++++++++++++--
 VoidLink/AboutViewController.swift                 |  6 +++---
 VoidLink/Input/CustomOSC/OSCProfilesManager.m      |  2 +-
 VoidLink/Input/OnScreenWidgetView.swift            |  4 ++--
 VoidLink/ViewControllers/MainFrameViewController.m |  2 +-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/VoidLink/AboutView.swift b/VoidLink/AboutView.swift
index 2a6cd445..116b1ff8 100644
--- a/VoidLink/AboutView.swift
+++ b/VoidLink/AboutView.swift
@@ -10,8 +10,10 @@
 import SwiftUI
 
 @available(iOS 13.0, *)
+
 public struct AboutView: View {
     @Environment(\.presentationMode) var presentationMode
+    public var aboutVC:UIViewController
 
     public var body: some View {
         VStack(spacing: 10) {
@@ -62,13 +64,12 @@ public struct AboutView: View {
                 Spacer()
                 // OK 按钮
                 Button(SwiftLocalizationHelper.localizedString(forKey: "OK")) {
-                    presentationMode.wrappedValue.dismiss()
+                    aboutVC.dismiss(animated:true)
                 }
                 .padding()
                 .background(Color.blue)
                 .foregroundColor(.white)
                 .frame(height: 46)
-                //.frame(width: 100)
                 .cornerRadius(12)
             } else {
                 HStack(spacing: 20) {
@@ -94,6 +95,14 @@ public struct AboutView: View {
                     .cornerRadius(12)
                     .frame(height: 33)
                     .frame(minWidth: 100)*/
+                    Button(SwiftLocalizationHelper.localizedString(forKey: "OK")) {
+                        aboutVC.dismiss(animated:true)
+                    }
+                    .padding()
+                    .background(Color.blue)
+                    .foregroundColor(.white)
+                    .cornerRadius(12)
+                    .frame(height: 33)
                 }
                 .padding(.top, 10)
             }
@@ -101,3 +110,4 @@ public struct AboutView: View {
         .padding()
     }
 }
+
diff --git a/VoidLink/AboutViewController.swift b/VoidLink/AboutViewController.swift
index be751ec2..ea1fdcb6 100644
--- a/VoidLink/AboutViewController.swift
+++ b/VoidLink/AboutViewController.swift
@@ -13,8 +13,9 @@ import SwiftUI
 @objc class AboutViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
-
-        let hostingVC = UIHostingController(rootView: AboutView())
+        
+        let hostingVC = UIHostingController(rootView: AboutView( aboutVC: self))
+        
         addChild(hostingVC)
         hostingVC.view.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(hostingVC.view)
@@ -29,7 +30,6 @@ import SwiftUI
 
         // 🎯 设置弹窗大小
         preferredContentSize = CGSize(width: 530, height: 450)
-        //preferredContentSize = CGSize(width:150, height:120 )
 
         // ⚠️ 一定要设置以下样式才会生效 preferredContentSize
         modalPresentationStyle = .formSheet
diff --git a/VoidLink/Input/CustomOSC/OSCProfilesManager.m b/VoidLink/Input/CustomOSC/OSCProfilesManager.m
index 53fe86c7..ab8fd1fa 100644
--- a/VoidLink/Input/CustomOSC/OSCProfilesManager.m
+++ b/VoidLink/Input/CustomOSC/OSCProfilesManager.m
@@ -26,7 +26,7 @@ static CGRect layoutViewBounds;
     static OSCProfilesManager *_sharedManager = nil;
     static dispatch_once_t onceToken;
     layoutViewBounds = viewBounds;
-    NSLog(@"bounds width: %f, height: %f", layoutViewBounds.size.width, layoutViewBounds.size.height);
+    // NSLog(@"bounds width: %f, height: %f", layoutViewBounds.size.width, layoutViewBounds.size.height);
     dispatch_once(&onceToken, ^{
         _sharedManager = [[self alloc] init];
     });
diff --git a/VoidLink/Input/OnScreenWidgetView.swift b/VoidLink/Input/OnScreenWidgetView.swift
index 59f8f46f..48bf2aac 100644
--- a/VoidLink/Input/OnScreenWidgetView.swift
+++ b/VoidLink/Input/OnScreenWidgetView.swift
@@ -472,7 +472,7 @@ import UIKit
         if vibrationOn {
             vibrationGenerator.prepare()
             vibrationGenerator.impactOccurred()
-            print("vibrationInstance: \(vibrationGenerator)")
+            // print("vibrationInstance: \(vibrationGenerator)")
         }
 
         return indicatorBorder
@@ -864,7 +864,7 @@ import UIKit
         if vibrationOn {
             vibrationGenerator.prepare()
             vibrationGenerator.impactOccurred()
-            print("vibrationInstance: \(vibrationGenerator)")
+            // print("vibrationInstance: \(vibrationGenerator)")
         }
         CATransaction.commit()
     }
diff --git a/VoidLink/ViewControllers/MainFrameViewController.m b/VoidLink/ViewControllers/MainFrameViewController.m
index 51cf0ebb..ecb98c1e 100644
--- a/VoidLink/ViewControllers/MainFrameViewController.m
+++ b/VoidLink/ViewControllers/MainFrameViewController.m
@@ -1941,7 +1941,7 @@ static NSMutableSet* hostList;
 // This function forces immediate decoding of the UIImage, rather
 // than the default lazy decoding that results in janky scrolling.
 -(void)deviceOrientationDidChange{
-    if(self.collectionView.superview == nil) return;
+    if(self.revealViewController.isStreaming || self.collectionView.superview == nil) return;
     [NSLayoutConstraint activateConstraints:@[
         [self.collectionView.topAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.topAnchor],
         [self.collectionView.bottomAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.bottomAnchor],