Explorar o código

MKRAVplayer 添加即将切换播放资源代理方法

yyqxiaoyin %!s(int64=4) %!d(string=hai) anos
pai
achega
30d88c7648

+ 2 - 0
Example/MKRRadioManager.xcodeproj/project.pbxproj

@@ -532,6 +532,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WSH9723Y7V;
 				ENABLE_BITCODE = YES;
+				EXCLUDED_ARCHS = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "MKRRadioManager/MKRRadioManager-Prefix.pch";
 				INFOPLIST_FILE = "MKRRadioManager/MKRRadioManager-Info.plist";
@@ -553,6 +554,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WSH9723Y7V;
 				ENABLE_BITCODE = YES;
+				EXCLUDED_ARCHS = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "MKRRadioManager/MKRRadioManager-Prefix.pch";
 				INFOPLIST_FILE = "MKRRadioManager/MKRRadioManager-Info.plist";

+ 0 - 1
Example/MKRRadioManager/MKRViewController.m

@@ -44,7 +44,6 @@
     [_MKRWIFIDeviceManager searchDeviceWithSearchTime:20 timeBlock:^(NSInteger time) {
         [self.tableView reloadData];
     }];
-    
 }
 
 - (void)viewDidLoad

+ 1 - 1
Example/Podfile.lock

@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  MKRRadioManager: 80a67b10a144134e599acc0a8ef26e71ec234271
+  MKRRadioManager: 0b489e0b3d21748cca03f5ff658bc015668768c0
   YYCategory: d85135b05d2806c90930a5bbadfc1501396a3db9
 
 PODFILE CHECKSUM: f65396e8a7f07654404054ab9d38dc4b7b6f8818

+ 4 - 1
Example/Pods/Local Podspecs/MKRRadioManager.podspec.json

@@ -16,10 +16,13 @@
     "tag": "0.0.3"
   },
   "platforms": {
-    "ios": "8.0"
+    "ios": "9.3"
   },
   "source_files": "MKRRadioManager/Classes/MKRRadioManager/**/*",
   "ios": {
     "vendored_frameworks": "libs/*.framework"
+  },
+  "pod_target_xcconfig": {
+    "VALID_ARCHS": "armv7 arm64 x86_64"
   }
 }

+ 1 - 1
Example/Pods/Manifest.lock

@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  MKRRadioManager: 80a67b10a144134e599acc0a8ef26e71ec234271
+  MKRRadioManager: 0b489e0b3d21748cca03f5ff658bc015668768c0
   YYCategory: d85135b05d2806c90930a5bbadfc1501396a3db9
 
 PODFILE CHECKSUM: f65396e8a7f07654404054ab9d38dc4b7b6f8818

+ 49 - 49
Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -636,6 +636,29 @@
 			};
 			name = Release;
 		};
+		2D25049FCF3FAC88FFBD2651EAAC38E6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = A26B77F91ECB3BD7C7FA66128982C3FF /* MKRRadioManager.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				GCC_PREFIX_HEADER = "Target Support Files/MKRRadioManager/MKRRadioManager-prefix.pch";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PRIVATE_HEADERS_FOLDER_PATH = "";
+				PRODUCT_MODULE_NAME = MKRRadioManager;
+				PRODUCT_NAME = MKRRadioManager;
+				PUBLIC_HEADERS_FOLDER_PATH = "";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
 		39769C66FA8FB99B807E0CA1F02C1A39 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -747,53 +770,6 @@
 			};
 			name = Release;
 		};
-		912315DE0C97AAA5B9F8EE73E2B78D35 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = A26B77F91ECB3BD7C7FA66128982C3FF /* MKRRadioManager.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				GCC_PREFIX_HEADER = "Target Support Files/MKRRadioManager/MKRRadioManager-prefix.pch";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PRIVATE_HEADERS_FOLDER_PATH = "";
-				PRODUCT_MODULE_NAME = MKRRadioManager;
-				PRODUCT_NAME = MKRRadioManager;
-				PUBLIC_HEADERS_FOLDER_PATH = "";
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		AC667AB90BDB0DA4EF6E3D976F07AD99 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = A26B77F91ECB3BD7C7FA66128982C3FF /* MKRRadioManager.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				GCC_PREFIX_HEADER = "Target Support Files/MKRRadioManager/MKRRadioManager-prefix.pch";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PRIVATE_HEADERS_FOLDER_PATH = "";
-				PRODUCT_MODULE_NAME = MKRRadioManager;
-				PRODUCT_NAME = MKRRadioManager;
-				PUBLIC_HEADERS_FOLDER_PATH = "";
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
 		BAF14824E77A349FB18D2A8D3A8A2472 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FE9441B2BC00597A4F90F43AB9E188A9 /* Pods-MKRRadioManager_Tests.debug.xcconfig */;
@@ -918,6 +894,30 @@
 			};
 			name = Release;
 		};
+		E95B9D20187E1A854E2EEE4F0CADB89E /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = A26B77F91ECB3BD7C7FA66128982C3FF /* MKRRadioManager.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				GCC_PREFIX_HEADER = "Target Support Files/MKRRadioManager/MKRRadioManager-prefix.pch";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PRIVATE_HEADERS_FOLDER_PATH = "";
+				PRODUCT_MODULE_NAME = MKRRadioManager;
+				PRODUCT_NAME = MKRRadioManager;
+				PUBLIC_HEADERS_FOLDER_PATH = "";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -933,8 +933,8 @@
 		2C2D2B1157D3743E37794EF220CC23D1 /* Build configuration list for PBXNativeTarget "MKRRadioManager" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				AC667AB90BDB0DA4EF6E3D976F07AD99 /* Debug */,
-				912315DE0C97AAA5B9F8EE73E2B78D35 /* Release */,
+				2D25049FCF3FAC88FFBD2651EAAC38E6 /* Debug */,
+				E95B9D20187E1A854E2EEE4F0CADB89E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;

+ 1 - 0
Example/Pods/Target Support Files/MKRRadioManager/MKRRadioManager.xcconfig

@@ -8,3 +8,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/../..
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+VALID_ARCHS = armv7 arm64 x86_64

+ 4 - 1
MKRRadioManager.podspec

@@ -28,11 +28,14 @@ TODO: Add long description of the pod here.
   s.source           = { :git => 'http://60.205.190.38:9000/iOS/MKRRadioManager.git', :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
 
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.3'
 
   s.source_files = 'MKRRadioManager/Classes/MKRRadioManager/**/*'
   s.ios.vendored_frameworks = 'libs/*.framework'
   
+#  s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
+  s.pod_target_xcconfig = {'VALID_ARCHS'=>'armv7 arm64 x86_64'}
+  
   # s.resource_bundles = {
   #   'MKRRadioManager' => ['MKRRadioManager/Assets/*.png']
   # }

+ 2 - 0
MKRRadioManager/Classes/MKRRadioManager/MKRWIFIDeviceManager/MKRWIFIDeviceManager.m

@@ -481,6 +481,7 @@ static inline void wd_playControl_queue(void (^block)(void)){
     MKRM3UListModel *m3uModel = [MKRM3UListModel tempChannelM3UModelWithSongs:songs startIndex:index];
     m3uModel.userID = self.userID;
     m3uModel.playModeString = [self playModeStringWithPlayMode:playMode];
+    [MKRWIFIDeviceManager shareManager].currentTempM3UListModel = m3uModel;
     wd_playControl_queue(^{
         [[MKRWIFIDeviceManager shareManager] setM3UList:m3uModel];
         id <MKRRadioResorce> song = songs[index];
@@ -504,6 +505,7 @@ static inline void wd_playControl_queue(void (^block)(void)){
     MKRM3UListModel *m3uModel = [MKRM3UListModel tempChannelM3UModelWithSongs:songs startIndex:index];
     m3uModel.userID = self.userID;
     m3uModel.playModeString = [self playModeStringWithPlayMode:playMode];
+    [MKRWIFIDeviceManager shareManager].currentTempM3UListModel = m3uModel;
     wd_playControl_queue(^{
         [[MKRWIFIDeviceManager shareManager] setM3UList:m3uModel];
         id <MKRRadioResorce> song = songs[0];