Merge branch 'v1.0.5' of https://git.yishihui.com/iOS/MusicVideoPlus into v1.0.5

MusicVideoPlus.xcodeproj/project.pbxproj

@@ -470,7 +470,7 @@
 				418532292665342100DCA2C1 /* Frameworks */,
 				4185322A2665342100DCA2C1 /* Resources */,
 				3115904EEDD5A7932018A62B /* [CP] Embed Pods Frameworks */,
-				841DDB6421B4B6AA592FBDE5 /* [CP] Copy Pods Resources */,
+				83DDA0B0AE9DF86CF68C40B2 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -567,7 +567,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MusicVideoPlus/Pods-MusicVideoPlus-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		841DDB6421B4B6AA592FBDE5 /* [CP] Copy Pods Resources */ = {
+		83DDA0B0AE9DF86CF68C40B2 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (

MusicVideoPlus.xcodeproj/xcshareddata/xcschemes/MusicVideoPlus.xcscheme

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1230"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4185322B2665342100DCA2C1"
+               BuildableName = "MusicVideoPlus.app"
+               BlueprintName = "MusicVideoPlus"
+               ReferencedContainer = "container:MusicVideoPlus.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4185322B2665342100DCA2C1"
+            BuildableName = "MusicVideoPlus.app"
+            BlueprintName = "MusicVideoPlus"
+            ReferencedContainer = "container:MusicVideoPlus.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4185322B2665342100DCA2C1"
+            BuildableName = "MusicVideoPlus.app"
+            BlueprintName = "MusicVideoPlus"
+            ReferencedContainer = "container:MusicVideoPlus.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

MusicVideoPlus/Classes/Modules/Home/Controllers/MVHomeController.swift

@@ -257,8 +257,12 @@ class MVHomeController: MVBaseController {
     @objc func btnClick(sender: UIButton) {
         switch sender.tag {
         case 1000: // 个人中心
+            PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_clickButton_mineTab, pageSource: .sp_shanyinApp_main, extParams: nil, remindmsg: "")
+            
             jumpToDetailVc(type: 1)
         case 2000: // 系统相册
+            PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_clickButton_syncedUpMusic, pageSource: .sp_shanyinApp_main, extParams: nil, remindmsg: "")
+            
             jumpToDetailVc(type: 3)
         case 3000: // 设置
             navigationController?.pushViewController(MVSettingController(), animated: true)
@@ -359,6 +363,9 @@ class MVHomeController: MVBaseController {
         if mAllVideos.count > indexPath.row {
             isCreateVideo = true
             let videoListModel = mAllVideos[indexPath.row]
+            
+            PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_clickButton_syncedUpMusicRecreate, pageSource: .sp_shanyinApp_main, extParams: ["videoId":videoListModel.videoId], remindmsg: "")
+            
             jumpToDetailVc(type: 2, videoData: videoListModel)
         } else {
             BFLog(message: "数据出错越界！！！ mAllVideos.count: \(mAllVideos.count) indexPath.row: \(indexPath.row)")
@@ -399,6 +406,9 @@ extension MVHomeController {
                 let hotVideoIndex = self.mVideos.firstIndex(where: { (items) -> Bool in
                     items.categoryName == videoInfo.categoryName
                 })
+                
+                PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonView, objectType: .ot_shanyinApp_clickButton_syncedUpMusicRecreate, pageSource: .sp_shanyinApp_main, extParams: ["videoId":videoInfo.videoId], remindmsg: "")
+                
 
                 BFLog(message: "播放的视频分类为:\(String(describing: self.mVideos[hotVideoIndex ?? 0].categoryName)) hotVideoIndex :\(String(describing: hotVideoIndex)) page is \(page)")
                 // 设置选中状态

MusicVideoPlus/Classes/Modules/Mine/Controllers/MVMineProductController.swift

@@ -76,6 +76,8 @@ class MVMineProductController: PQBaseViewController {
                 self?.headInfoView.addData()
             }
         }
+        
+        PQEventTrackViewModel.baseReportUpload(businessType: .bt_pageView, objectType: .ot_shanyinApp_viewPage_mineTab, pageSource: .sp_shanyinApp_mine, extParams: nil, remindmsg: "")
     }
 
     /// 请求网络数据

Podfile

@@ -5,10 +5,10 @@ target 'MusicVideoPlus' do
   use_frameworks!
   source 'https://github.com/CocoaPods/Specs.git'
   #pod "BFFramework" ,:git => 'https://git.yishihui.com/iOS/BFFramework.git' , :tag => '0.1.1'
-#   pod "BFFramework" ,:git => 'https://git.yishihui.com/iOS/BFFramework.git'
+   pod "BFFramework" ,:git => 'https://git.yishihui.com/iOS/BFFramework.git'
   # 使用本地路径
   #pod 'BFFramework', :path => '/Users/ak/Desktop/BFFramework/'
-  pod 'BFFramework', :path => '/Users/sanw/Desktop/BytesFlow/Projects/BFFramework/'
+#  pod 'BFFramework', :path => '/Users/sanw/Desktop/BytesFlow/Projects/BFFramework/'
 
   pod 'JWTDecode','2.6.0' # Apple登陆校验库
   pod 'TYAttributedLabel','2.6.9' #  富文本