浏览代码

fix detail

marinofaggiana 6 年之前
父节点
当前提交
31b4a93e8d
共有 3 个文件被更改,包括 23 次插入13 次删除
  1. 4 2
      iOSClient/Main/CCDetail.m
  2. 3 0
      iOSClient/Main/CCSplit.m
  3. 16 11
      iOSClient/Viewer/NCViewerImagemeter.swift

+ 4 - 2
iOSClient/Main/CCDetail.m

@@ -147,7 +147,7 @@
     [coordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
     [coordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
         
         
         if (self.imagemeter) {
         if (self.imagemeter) {
-//            [self.imagemeter audioImagemeter];
+            [self.imagemeter viewImagemeter];
         }
         }
     }];
     }];
 }
 }
@@ -164,8 +164,9 @@
 
 
 - (void)changeToDisplayMode
 - (void)changeToDisplayMode
 {
 {
-    if (_readerPDFViewController)
+    if (_readerPDFViewController) {
         [self.readerPDFViewController updateContentViews];
         [self.readerPDFViewController updateContentViews];
+    }
 }
 }
 
 
 #pragma --------------------------------------------------------------------------------------------
 #pragma --------------------------------------------------------------------------------------------
@@ -265,6 +266,7 @@
     if ([self.metadataDetail.typeFile isEqualToString: k_metadataTypeFile_imagemeter]) {
     if ([self.metadataDetail.typeFile isEqualToString: k_metadataTypeFile_imagemeter]) {
         
         
         self.imagemeter = [[NCViewerImagemeter alloc] initWithMetadata:self.metadataDetail detail:self];
         self.imagemeter = [[NCViewerImagemeter alloc] initWithMetadata:self.metadataDetail detail:self];
+        [self.imagemeter viewImagemeter];
         [self createToolbar];
         [self createToolbar];
     }
     }
 }
 }

+ 3 - 0
iOSClient/Main/CCSplit.m

@@ -55,6 +55,9 @@
 {
 {
     [super viewDidLoad];
     [super viewDidLoad];
 
 
+    // Delegate
+    self.splitViewController.delegate = self;
+
     // Display mode SPLIT
     // Display mode SPLIT
     self.preferredDisplayMode = UISplitViewControllerDisplayModeAllVisible;
     self.preferredDisplayMode = UISplitViewControllerDisplayModeAllVisible;
     //self.maximumPrimaryColumnWidth = 400;
     //self.maximumPrimaryColumnWidth = 400;

+ 16 - 11
iOSClient/Viewer/NCViewerImagemeter.swift

@@ -51,6 +51,9 @@ class NCViewerImagemeter: NSObject {
         
         
         self.metadata = metadata
         self.metadata = metadata
         self.detail = detail
         self.detail = detail
+    }
+    
+    @objc public func viewImagemeter() {
         
         
         guard let rootView = UIApplication.shared.keyWindow else {
         guard let rootView = UIApplication.shared.keyWindow else {
             return
             return
@@ -59,6 +62,12 @@ class NCViewerImagemeter: NSObject {
             safeAreaBottom = Int(rootView.safeAreaInsets.bottom)
             safeAreaBottom = Int(rootView.safeAreaInsets.bottom)
         }
         }
         
         
+        for view in self.detail.view.subviews {
+            if view is IMImagemeterView {
+                view.removeFromSuperview()
+            }
+        }
+        
         nameArchiveImagemeter = (metadata.fileNameView as NSString).deletingPathExtension
         nameArchiveImagemeter = (metadata.fileNameView as NSString).deletingPathExtension
         pathArchiveImagemeter = CCUtility.getDirectoryProviderStorageFileID(metadata.fileID) + "/" + nameArchiveImagemeter
         pathArchiveImagemeter = CCUtility.getDirectoryProviderStorageFileID(metadata.fileID) + "/" + nameArchiveImagemeter
         
         
@@ -86,11 +95,6 @@ class NCViewerImagemeter: NSObject {
         }
         }
     }
     }
 
 
-    @objc private func updateTimer() {
-        counterSecondPlayer += 1
-        imagemeterView.progressView.progress = Float(counterSecondPlayer / durationPlayer)
-    }
-    
     private func imageImagemeter() {
     private func imageImagemeter() {
         
         
         guard let annotation = self.annotation else {
         guard let annotation = self.annotation else {
@@ -107,16 +111,12 @@ class NCViewerImagemeter: NSObject {
         }
         }
     }
     }
     
     
-    @objc func audioImagemeter() {
+    private func audioImagemeter() {
         
         
         guard let annotation = self.annotation else {
         guard let annotation = self.annotation else {
             return
             return
         }
         }
         
         
-        for view in imagemeterView.image.subviews {
-            view.removeFromSuperview()
-        }
-        
         if annotation.elements != nil {
         if annotation.elements != nil {
             for element in annotation.elements! {
             for element in annotation.elements! {
                 
                 
@@ -144,7 +144,7 @@ class NCViewerImagemeter: NSObject {
         }
         }
     }
     }
     
     
-    func drawLineOnImage(startingImage: UIImage, x: CGFloat, y: CGFloat, endX:CGFloat, endY:CGFloat, color: UIColor, size: CGFloat) -> UIImage {
+    private func drawLineOnImage(startingImage: UIImage, x: CGFloat, y: CGFloat, endX:CGFloat, endY:CGFloat, color: UIColor, size: CGFloat) -> UIImage {
         
         
         // Create a context of the starting image size and set it as the current one
         // Create a context of the starting image size and set it as the current one
         UIGraphicsBeginImageContext(startingImage.size)
         UIGraphicsBeginImageContext(startingImage.size)
@@ -194,6 +194,11 @@ class NCViewerImagemeter: NSObject {
             }
             }
         }
         }
     }
     }
+    
+    @objc private func updateTimer() {
+        counterSecondPlayer += 1
+        imagemeterView.progressView.progress = Float(counterSecondPlayer / durationPlayer)
+    }
 }
 }
 
 
 extension NCViewerImagemeter: AVAudioPlayerDelegate {
 extension NCViewerImagemeter: AVAudioPlayerDelegate {