Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -8026,7 +8026,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8172,7 +8172,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8380,7 +8380,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8428,7 +8428,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/AppDelegate.swift

@@ -144,12 +144,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
             let vc = UIViewController.current ?? UIViewController()
             if vc.isKind(of: YHLivePlayerViewController.self) {
                 if let vc2 = vc as? YHLivePlayerViewController,vc2.canDoRotateFunc() {
-                    print(" 可旋转")
+                    printLog(" 可旋转")
                     return [.portrait, .landscapeRight]
                 }
             }
-            
-            print("不 可旋转")
+            printLog("不 可旋转")
             return .portrait
         }
     

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift

@@ -688,4 +688,18 @@ extension YHJsApi {
             }
         }
     }
+    
+    @objc func goPreviewFile(_ url: String) {
+        DispatchQueue.main.async {
+            let viewModel = YHBaseViewModel()
+            viewModel.getPublicImageUrl(url) { success, error in
+                YHHUD.hide()
+                if let success = success {
+                    let tool = YHFilePreviewTool(targetVC: UIViewController.current)
+                    tool.openXLSXRemoteFile(urlString: success, fileName: "")
+                }
+            }
+            
+        }
+    }
 }

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHLivePlayerViewController.swift

@@ -128,8 +128,8 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
         button.addTarget(self, action: #selector(playeButtonClicked), for: .touchUpInside)
         return button
     }()
+    
     // MARK: - Initialization
-
     init(id: Int, url: String? = nil, title: String? = nil, roomId: String? = nil) {
         liveId = id
         self.roomId = roomId
@@ -417,6 +417,7 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
     
     //是否可旋转
     func canDoRotateFunc() -> Bool {
+        return true //直播暂停时有其他问题 先放开
         if let model = viewModel.liveDetailModel {
             if model.status == 1 {
                 if model.stream_status == 1 || model.stream_status == 2 {
@@ -962,12 +963,14 @@ extension YHLivePlayerViewController {
             messageListStateButton.isHidden = false
             closeButton.isHidden = false
             topBarView.isHidden = false
+            self.playButton.setImage(UIImage(named: "live_play_interface_orientatio"), for: .normal)
         } else {
             bottomInputBar.isHidden = true
             messageListView.isHidden = true
             messageListStateButton.isHidden = true
             closeButton.isHidden = true
             topBarView.isHidden = true
+            self.playButton.setImage(UIImage(named: "live_play_interface_orientatio_up"), for: .normal)
         }
         
         if #available(iOS 16.0, *) {
@@ -990,6 +993,7 @@ extension YHLivePlayerViewController {
         messageListStateButton.isHidden = false
         closeButton.isHidden = false
         topBarView.isHidden = false
+        self.playButton.setImage(UIImage(named: "live_play_interface_orientatio"), for: .normal)
     }
     
     func changeLandscape() {
@@ -1004,6 +1008,7 @@ extension YHLivePlayerViewController {
         messageListStateButton.isHidden = true
         closeButton.isHidden = true
         topBarView.isHidden = true
+        self.playButton.setImage(UIImage(named: "live_play_interface_orientatio_up"), for: .normal)
     }
     
     @objc func orientationDidChange() {

galaxy/galaxy/Res/Assets.xcassets/YinHeLive/live_play_interface_orientatio_up.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "横屏1@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "横屏1@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}