Kaynağa Gözat

查看全部

张国栋 1 ay önce
ebeveyn
işleme
8a44d9d408

BIN
AICityProperty/AICity.xcworkspace/xcuserdata/zhangguodong.xcuserdatad/UserInterfaceState.xcuserstate


+ 0 - 46
AICityProperty/AICity.xcworkspace/xcuserdata/zhangguodong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -20,51 +20,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "C920EC78-1762-4F26-87AD-8C6CFFC287A0"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "AICity/JuXing/ViewControllers/JXShortDramaViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "667"
-            endingLineNumber = "667"
-            landmarkName = "-shortDramaCellDidTapDetail:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "C920EC78-1762-4F26-87AD-8C6CFFC287A0 - ebb9d4cca3fa53d2"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[JXShortDramaViewController shortDramaCellDidTapDetail:]"
-                  moduleName = "AICity"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/zhangguodong/playVideo_ios/AICityProperty/AICity/JuXing/ViewControllers/JXShortDramaViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "668"
-                  endingLineNumber = "668">
-               </Location>
-               <Location
-                  uuid = "C920EC78-1762-4F26-87AD-8C6CFFC287A0 - ebb9d4cca3fa53b3"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[JXShortDramaViewController shortDramaCellDidTapDetail:]"
-                  moduleName = "AICity"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/zhangguodong/playVideo_ios/AICityProperty/AICity/JuXing/ViewControllers/JXShortDramaViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "667"
-                  endingLineNumber = "667">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 22 - 0
AICityProperty/AICity/Assets.xcassets/查看全部 1.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "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
+  }
+}

BIN
AICityProperty/AICity/Assets.xcassets/查看全部 1.imageset/查看全部 1@2x.png


BIN
AICityProperty/AICity/Assets.xcassets/查看全部 1.imageset/查看全部 1@3x.png


+ 23 - 3
AICityProperty/AICity/JuXing/ViewControllers/JXDetailViewController.m

@@ -182,9 +182,7 @@
     playerContainer.backgroundColor = [UIColor blackColor];
     [cell.contentView addSubview:playerContainer];
     [cell.contentView sendSubviewToBack:playerContainer];
-    // 创建播放器
-    JXSuperPlayer *player = [[JXSuperPlayer alloc] initWithContainerView:playerContainer];
-    player.delegate = self;
+    
     // 右侧互动按钮
     [self setupInteractionButtonsForCell:cell];
     
@@ -253,6 +251,8 @@
         make.width.mas_equalTo(SCREEN_WIDTH - 90);
     }];
     
+ 
+    
 //    // 作者
 //    UILabel *authorLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, y, width - 32, 20)];
 //    authorLabel.font = [UIFont systemFontOfSize:13];
@@ -286,6 +286,9 @@
 //    episodeTitleLabel.numberOfLines = 2;
 //    [episodeInfoView addSubview:episodeTitleLabel];
     
+    // 创建播放器
+    JXSuperPlayer *player = [[JXSuperPlayer alloc] initWithContainerView:playerContainer];
+    player.delegate = self;
     // 播放视频
     [player playWithAppId:episode.appId fileId:episode.fileId psign:episode.psign];
     
@@ -368,6 +371,23 @@
     if (currentPage != self.currentEpisodeIndex) {
         self.currentEpisodeIndex = currentPage;
         NSLog(@"📺 滚动到第 %ld 集", (long)currentPage + 1);
+        
+//        UICollectionViewCell *cell = [self.episodeCollectionView cellForItemAtIndexPath:[NSIndexPath indexPathForItem:currentPage inSection:0]];
+//        // 创建播放器
+//        CGFloat width = cell.contentView.bounds.size.width;
+//        CGFloat height = cell.contentView.bounds.size.height;
+//        CGFloat playerHeight = height;
+//        UIView *playerContainer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, width, playerHeight)];
+//        playerContainer.backgroundColor = [UIColor blackColor];
+//        [cell.contentView addSubview:playerContainer];
+//        [cell.contentView sendSubviewToBack:playerContainer];
+//        JXEpisode *episode = self.episodes[currentPage];
+//        JXSuperPlayer *player = [[JXSuperPlayer alloc] initWithContainerView:playerContainer];
+//        player.delegate = self;
+//        // 播放视频
+//        [player playWithAppId:episode.appId fileId:episode.fileId psign:episode.psign];
+        
+        
     }
 }
 

+ 1 - 2
AICityProperty/AICity/JuXing/ViewControllers/JXShortDramaViewController.m

@@ -142,8 +142,7 @@ static NSString * const kDramaCellIdentifier = @"JXShortDramaCell";
     
     
     self.searchBar = [[SearchCommonBarView alloc] init];
-//    self.searchBar.bgView.backgroundColor = [UIColor clearColor];
-//    self.searchBar.searchBgView.backgroundColor = [UIColor clearColor];
+    
     self.searchBar.backgroundColor = [UIColor clearColor];
     __weak typeof(self) weakSelf = self;
     self.searchBar.searchAction = ^(NSString * _Nonnull text) {

+ 12 - 0
AICityProperty/AICity/JuXing/Views/JXShortDramaCell.m

@@ -96,6 +96,18 @@
             NSLog(@"[JXShortDramaCell]   [%lu] %@ - subviews: %lu", (unsigned long)i, [subview class], (unsigned long)subview.subviews.count);
         }
     }
+    
+    
+    UIButton *allBtn = [[UIButton alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-86)/2, (kScreenHeight-31)/2, 86, 31)];
+    [allBtn setImage:[UIImage imageNamed:@"查看全部 1"] forState:UIControlStateNormal];
+    [allBtn setTitle:@"查看全部" forState:UIControlStateNormal];
+    [self.contentView addSubview:allBtn];
+    allBtn.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightBold];
+    allBtn.backgroundColor = [UIColor colorWithRed:24/255.0 green:24/255.0 blue:24/255.0 alpha:1];
+    allBtn.layer.cornerRadius = 15.5;
+    allBtn.clipsToBounds = YES;
+    [allBtn addTarget:self action:@selector(handleDetailTap) forControlEvents:UIControlEventTouchUpInside];
+    
 }
 
 - (void)setupPlayerContainer {