分享相关功能，续播相关功能

liushiyu
1 parent 155c085f
Showing 9 changed files with 107 additions and 71 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Share/CNLiveShareView.swift
metaCode/Classes/Main/VideoPage/Controller/CNLiveShortVideoViewController.swift
metaCode/Classes/Other/AppDelegate.swift
metaCode/Info.plist
metaCode/Supporting Files/Assets.xcassets/AccentColor.colorset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shop/DS_coupon_edit_se.imageset/选中@2x.png
metaCode/Supporting Files/Assets.xcassets/Shop/DS_coupon_edit_se.imageset/选中@3x.png
@@ -52,7 +52,7 @@ target &#39;metaCode&#39; do
   pod 'ZFPlayer/AVPlayer', :git => 'https://gitee.com/mirrors/ZFPlayer.git'
   pod 'ZFPlayer/ijkplayer', :git => 'https://gitee.com/mirrors/ZFPlayer.git'
   #分享
-#  pod 'CNLiveShareToolKit'
+  pod 'CNLiveShareToolKit'
 #  pod 'CNLiveTencentopenapi'
 #  pod 'WechatOpenSDK'
   #网家家输入组件
@@ -206,6 +206,7 @@
 		79A212C22B0B5D0700BFA8E3 /* CNLiveShopBodyCouponManagerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79A212C12B0B5D0700BFA8E3 /* CNLiveShopBodyCouponManagerView.swift */; };
 		79A267832AF8D7BC0088D9F6 /* CNLiveShopBodyCustomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79A267822AF8D7BC0088D9F6 /* CNLiveShopBodyCustomView.swift */; };
 		79B2E3602AF39191002A8524 /* NSObject+CNLiveConfigModuleInline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79B2E35F2AF39191002A8524 /* NSObject+CNLiveConfigModuleInline.swift */; };
+		79B6CCD72B58C2630041B445 /* CNLiveShareView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79B6CCD62B58C2630041B445 /* CNLiveShareView.swift */; };
 		79BA085D2AB18E8300D01875 /* CNLiveSaveAuthDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDB.swift */; };
 		79BB1C142B05C51900C5720C /* CNLiveShopCouponViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BB1C132B05C51900C5720C /* CNLiveShopCouponViewController.swift */; };
 		79BB1C162B05C62900C5720C /* CNLiveShopBodyCouponView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BB1C152B05C62900C5720C /* CNLiveShopBodyCouponView.swift */; };
@@ -469,6 +470,8 @@
 		79A267822AF8D7BC0088D9F6 /* CNLiveShopBodyCustomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopBodyCustomView.swift; sourceTree = "<group>"; };
 		79A68C512A26F59C00DC3B43 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = metaCode/Info.plist; sourceTree = "<group>"; };
 		79B2E35F2AF39191002A8524 /* NSObject+CNLiveConfigModuleInline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSObject+CNLiveConfigModuleInline.swift"; sourceTree = "<group>"; };
+		79B6CCD62B58C2630041B445 /* CNLiveShareView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShareView.swift; sourceTree = "<group>"; };
+		79B6CCD82B58C5B50041B445 /* WechatOpenSDK-XCFramework.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "WechatOpenSDK-XCFramework.xcframework"; path = "Pods/WechatOpenSDK-XCFramework/WechatOpenSDK-XCFramework.xcframework"; sourceTree = "<group>"; };
 		79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSaveAuthDB.swift; sourceTree = "<group>"; };
 		79BB1C132B05C51900C5720C /* CNLiveShopCouponViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopCouponViewController.swift; sourceTree = "<group>"; };
 		79BB1C152B05C62900C5720C /* CNLiveShopBodyCouponView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopBodyCouponView.swift; sourceTree = "<group>"; };
@@ -1121,6 +1124,7 @@
 		794294A82B4D3018008AAFA0 /* Share */ = {
 			isa = PBXGroup;
 			children = (
+				79B6CCD62B58C2630041B445 /* CNLiveShareView.swift */,
 			);
 			path = Share;
 			sourceTree = "<group>";
@@ -1203,6 +1207,7 @@
 		796398912A260C0100D045EB /* Common */ = {
 			isa = PBXGroup;
 			children = (
+				794294A82B4D3018008AAFA0 /* Share */,
 				792E57D52A3AA28E005834DB /* Util */,
 				7963989B2A260E6200D045EB /* Base */,
 			);
@@ -1212,7 +1217,6 @@
 		796398922A260C0100D045EB /* Config */ = {
 			isa = PBXGroup;
 			children = (
-				794294A82B4D3018008AAFA0 /* Share */,
 				79E496E42AB936E200127BF8 /* Tool */,
 				79579CAA2AAAE905006E5B38 /* Database */,
 				7CD675512A29C04B008354C1 /* CNLiveConfigstant.swift */,
@@ -1450,6 +1454,7 @@
 		83CDF822130E4A93D9977EBC /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				79B6CCD82B58C5B50041B445 /* WechatOpenSDK-XCFramework.xcframework */,
 				7963DEF32B5508540086037D /* CNLiveShareToolKit.framework */,
 				7963DEF12B5507830086037D /* libsqlite3.tbd */,
 				7963DEEF2B5507780086037D /* libc++.tbd */,
@@ -1783,6 +1788,7 @@
 				79B2E3602AF39191002A8524 /* NSObject+CNLiveConfigModuleInline.swift in Sources */,
 				79A212C02B0B5C5400BFA8E3 /* CNLiveShopCouponManagerViewController.swift in Sources */,
 				7C2703362A3AFD3A0061EC50 /* CNLiveEnvironment.swift in Sources */,
+				79B6CCD72B58C2630041B445 /* CNLiveShareView.swift in Sources */,
 				798A44FD2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift in Sources */,
 				79656E382AAEBA8E00119A61 /* CNLiveMineInputViewController.swift in Sources */,
 				19CC4D522ADD129800308E2A /* CNUpSlideAnimationTransition.swift in Sources */,
@@ -2073,7 +2079,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1.0.4.24.01.15.15;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
-				ENABLE_BITCODE = YES;
+				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2143,11 +2149,11 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
 					"-ObjC",
-					"-l\"WeChatSDK\"",
 					"-l\"bz2\"",
 					"-l\"c++\"",
 					"-l\"iconv\"",
@@ -2180,8 +2186,6 @@
 					"-framework",
 					"\"CNLiveBusinessTools\"",
 					"-framework",
-					"\"CNLiveCommonCategory\"",
-					"-framework",
 					"\"CNLiveCustomUI\"",
 					"-framework",
 					"\"CNLiveEnvironment\"",
@@ -2190,8 +2194,6 @@
 					"-framework",
 					"\"CNLiveRequestBastKit\"",
 					"-framework",
-					"\"CNLiveShareToolKit\"",
-					"-framework",
 					"\"CNLiveUserManagement\"",
 					"-framework",
 					"\"CoreAudio\"",
@@ -2262,8 +2264,6 @@
 					"-framework",
 					"\"QuartzCore\"",
 					"-framework",
-					"\"SDWebImage\"",
-					"-framework",
 					"\"SKPhotoBrowser\"",
 					"-framework",
 					"\"Security\"",
@@ -2305,9 +2305,7 @@
 					"\"Photos\"",
 					"-weak_framework",
 					"\"SwiftUI\"",
-					"-ld64",
 				);
-				MARKETING_VERSION = 1.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -2333,7 +2331,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1.0.4.24.01.15.15;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
-				ENABLE_BITCODE = YES;
+				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2403,11 +2401,11 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
 					"-ObjC",
-					"-l\"WeChatSDK\"",
 					"-l\"bz2\"",
 					"-l\"c++\"",
 					"-l\"iconv\"",
@@ -2440,8 +2438,6 @@
 					"-framework",
 					"\"CNLiveBusinessTools\"",
 					"-framework",
-					"\"CNLiveCommonCategory\"",
-					"-framework",
 					"\"CNLiveCustomUI\"",
 					"-framework",
 					"\"CNLiveEnvironment\"",
@@ -2450,8 +2446,6 @@
 					"-framework",
 					"\"CNLiveRequestBastKit\"",
 					"-framework",
-					"\"CNLiveShareToolKit\"",
-					"-framework",
 					"\"CNLiveUserManagement\"",
 					"-framework",
 					"\"CoreAudio\"",
@@ -2522,8 +2516,6 @@
 					"-framework",
 					"\"QuartzCore\"",
 					"-framework",
-					"\"SDWebImage\"",
-					"-framework",
 					"\"SKPhotoBrowser\"",
 					"-framework",
 					"\"Security\"",
@@ -2565,9 +2557,7 @@
 					"\"Photos\"",
 					"-weak_framework",
 					"\"SwiftUI\"",
-					"-ld64",
 				);
-				MARKETING_VERSION = 1.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+//
+//  CNLiveShareView.swift
+//  metaCode
+//
+//  Created by open on 2024/1/18.
+//
+
+import Foundation
+import UIKit
+
+class CNLiveShareView: UIView {
+    
+}
@@ -11,7 +11,7 @@ import APButton
 import EmptyDataSet_Swift
 import MJRefresh
 import CNLiveBusinessTools
-//import CNLiveShareToolKit
+import CNLiveShareToolKit
 class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, CNLiveShortVideoListTableViewCellDelegate, EmptyDataSetSource, EmptyDataSetDelegate {
@@ -104,6 +104,23 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         super.init(nibName:nil, bundle:nil)
     }
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        if self.dataArray.count == 0 {
+            self.playTheIndex(index: self.currentIndex)
+        }
+    }
+    
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        self.player.currentPlayerManager.play()
+    }
+    
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        self.player.currentPlayerManager.pause()
+    }
+    
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -114,7 +131,10 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         view.addSubview(tableView)
         view.addSubview(backBtn)
-        requestData {}
+        if self.dataArray.count == 0 {
+            requestData {}
+        }
+
         addRefreshView()
         player = ZFPlayerController(scrollView: tableView, playerManager: playerManager, containerViewTag: 100)
@@ -154,6 +174,8 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
             }
             self.playVideo(at: indexPath)
         }
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(removePlayerAction), name: Notification.Name.PlayerManage.kPlayerDestroyNotification, object: nil)
     }
     func addRefreshView() {
@@ -173,6 +195,16 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         self.requestData {}
     }
+    @objc func removePlayerAction() {
+        controlView.removeFromSuperview()
+        if player != nil {
+            player.stopCurrentPlayingCell()
+        }
+        if (playerManager.player != nil) {
+            playerManager.player.stop()
+        }
+    }
+    
     override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
         self.backBtn.frame = CGRectMake(15, CGRectGetMaxY(UIApplication.shared.statusBarFrame), 45, 45)
@@ -268,6 +300,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
     }
     deinit {
+        NotificationCenter.default.removeObserver(self)
         tableView.delegate = nil
         tableView.dataSource = nil
         controlView.removeFromSuperview()
@@ -300,10 +333,10 @@ extension CNLiveShortVideoViewController {
         })
     }
     func shareActionMethod(viewcell: CNLiveShortVideoListTableViewCell, button: UIButton) {
-//        CNLiveShareManager.showShareViewWithParam(forShareTitle: viewcell.homeModel.title, shareUrl: viewcell.homeModel.shareUrl, shareDesc: viewcell.homeModel.subTitle, shareImage: viewcell.homeModel.poster, screenFull: false, hiddenWjj: true, hiddenQQ: false, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: true, formVC: self, topImage: [], topTitles: [], platformType: .all) { title in} completerBlock: {[weak self] resultType, platformType, typeString in
-//            guard let self = self else { return }
-//
-//        }
+        CNLiveShareManager.showShareViewWithParam(forShareTitle: viewcell.homeModel.title, shareUrl: viewcell.homeModel.shareUrl, shareDesc: viewcell.homeModel.subTitle, shareImage: viewcell.homeModel.poster, screenFull: false, hiddenWjj: true, hiddenQQ: false, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: true, formVC: self, topImage: [], topTitles: [], platformType: .all) { title in} completerBlock: {[weak self] resultType, platformType, typeString in
+            guard let self = self else { return }
+
+        }
     }
     func iconActionMethod(viewcell: CNLiveShortVideoListTableViewCell, button: UIButton) {
         self.navigationController?.pushViewController(CNLivePlayletHomePageController(aid: aid), animated: true)
@@ -8,7 +8,7 @@
 import UIKit
 import CNLiveRequestBastKit
 import IQKeyboardManagerSwift
-//import CNLiveShareToolKit
+import CNLiveShareToolKit
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -19,7 +19,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Override point for customization after application launch.
         //tencentAppId  wxAppId
-//        CNLiveShareManager.registeredShareView(whenDidFinishLaunch: universalLinkURL, appId: APPId, tencentAppId: "", wxAppId: "", wxSecret: "", weiBoAppId: "")
+        CNLiveShareManager.registeredShareView(whenDidFinishLaunch: universalLinkURL, appId: APPId, tencentAppId: tencentAppId, wxAppId: wxAppId, wxSecret: "", weiBoAppId: "")
         CNLiveNetworking.networkStatus { status in
@@ -83,14 +83,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         CNLiveNetworking.setupBaseURL(APPLoginHost)
     }
-//    func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
-//        CNLiveShareManager.handleOpenUniversalLink(userActivity)
-//        return true
-//    }
-//
-//    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
-//        CNLiveShareManager.handleOpen(url)
-//        return true
-//    }
+    func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
+        CNLiveShareManager.handleOpenUniversalLink(userActivity)
+        return true
+    }
+
+    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
+        CNLiveShareManager.handleOpen(url)
+        return true
+    }
 }
@@ -40,25 +40,22 @@
 				<string>QQ424ce8ca</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>元码</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>CNLiveMateCodeSchems</string>
+			</array>
+		</dict>
 	</array>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
-	<key>PHPhotoLibraryPreventAutomaticLimitedAccessAlert</key>
-	<true/>
-	<key>UIApplicationSceneManifest</key>
-	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<false/>
-	</dict>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>
 		<string>weixin</string>
 		<string>weixinULAPI</string>
-        
 		<string>mqqOpensdkSSoLogin</string>
 		<string>mqqopensdkapiV2</string>
 		<string>mqqopensdkapiV3</string>
@@ -69,15 +66,29 @@
 		<string>mqqopensdkminiapp</string>
 		<string>mqqopensdknopasteboard</string>
 		<string>mqqopensdkapiV4</string>
+		<string>mqzoneopensdk</string>
+		<string>mqzoneopensdkapi</string>
+		<string>mqzoneopensdkapi19</string>
+		<string>mqzoneopensdkapiV2</string>
+		<string>mqqOpensdkSSoLogin</string>
+		<string>mqqwpa</string>
+		<string>mqzone</string>
+		<string>mqqopensdkminiapp</string>
-        <string>mqzoneopensdk</string>
-        <string>mqzoneopensdkapi</string>
-        <string>mqzoneopensdkapi19</string>
-        <string>mqzoneopensdkapiV2</string>
-        <string>mqqOpensdkSSoLogin</string>
-        <string>mqqwpa</string>
-        <string>mqzone</string>
-        <string>mqqopensdkminiapp</string>
+<!--        <string>sinaweibo</string>-->
+<!--        <string>sinaweibohd</string>-->
 	</array>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>PHPhotoLibraryPreventAutomaticLimitedAccessAlert</key>
+	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+	</dict>
 </dict>
 </plist>
-{
-  "colors" : [
-    {
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}