fix

CodeAcmen · Jun 16, 2018 · 976fdee · 976fdee
1 parent e67f610
commit 976fdee
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 37 deletions.
diff --git a/iOSProject/Podfile b/iOSProject/Podfile
@@ -84,7 +84,7 @@ pod 'TZImagePickerController'
 pod 'ZJScrollPageView'
 
 # 列表视频
-pod 'ZFPlayer'
+pod 'ZFPlayer', '2.1.6'
 #pod 'ZFDownload'
 
 # mark- 好玩的

diff --git a/iOSProject/Podfile.lock b/iOSProject/Podfile.lock
@@ -70,9 +70,8 @@ PODS:
     - YYImage/Core (= 1.0.4)
   - YYImage/Core (1.0.4)
   - YYText (1.0.7)
-  - ZFPlayer (3.0.5):
-    - ZFPlayer/Core (= 3.0.5)
-  - ZFPlayer/Core (3.0.5)
+  - ZFPlayer (2.1.6):
+    - Masonry
   - ZJScrollPageView (0.4.0)
 
 DEPENDENCIES:
@@ -106,7 +105,7 @@ DEPENDENCIES:
   - YYCategories
   - YYImage
   - YYText
-  - ZFPlayer
+  - ZFPlayer (= 2.1.6)
   - ZJScrollPageView
 
 SPEC REPOS:
@@ -171,9 +170,9 @@ SPEC CHECKSUMS:
   YYCategories: 6bcd4314c6661a561410dce4a793379ebd306abd
   YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
-  ZFPlayer: d341db8f7a52d4a51a935af2ba54ac949fe1f2c6
+  ZFPlayer: 833cb3974b619bfd01a0ec1ebaabfe6f629e85b4
   ZJScrollPageView: dd8778909cb2413782616ab156e873956f6b0682
 
-PODFILE CHECKSUM: 8098fcd87cf3265de83fc8856e2f26d6a9e38e07
+PODFILE CHECKSUM: a1680f3db982cfafdcff1a6a67163cd27a34b5ce
 
 COCOAPODS: 1.5.3
diff --git a/iOSProject/iOSProject.xcodeproj/project.pbxproj b/iOSProject/iOSProject.xcodeproj/project.pbxproj
@@ -2375,6 +2375,7 @@
 				"${PODS_ROOT}/UMengUShare/UShareSDK/SocialLibraries/QQ/QQSDK/TencentOpenApi_IOS_Bundle.bundle",
 				"${PODS_ROOT}/UMengUShare/UShareSDK/SocialLibraries/Sina/SinaSDK/WeiboSDK.bundle",
 				"${PODS_ROOT}/UMengUShare/UShareSDK/UMSocialUI/UMSocialSDKResources.bundle",
+				"${PODS_ROOT}/ZFPlayer/ZFPlayer/ZFPlayer.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
@@ -2388,6 +2389,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TencentOpenApi_IOS_Bundle.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UMSocialSDKResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ZFPlayer.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -2821,7 +2823,6 @@
 					"-l\"MJExtension\"",
 					"-l\"MJRefresh\"",
 					"-l\"MOFSPickerManager\"",
-					"-l\"MagicWindowSDK\"",
 					"-l\"Masonry\"",
 					"-l\"Reachability\"",
 					"-l\"SDCycleScrollView\"",
@@ -2832,7 +2833,6 @@
 					"-l\"Toast\"",
 					"-l\"UICKeyChainStore\"",
 					"-l\"UMSocialLog\"",
-					"-l\"WeChatSDK\"",
 					"-l\"WeiboSDK\"",
 					"-l\"YYAsyncLayer\"",
 					"-l\"YYCategories\"",
@@ -2950,7 +2950,6 @@
 					"-l\"MJExtension\"",
 					"-l\"MJRefresh\"",
 					"-l\"MOFSPickerManager\"",
-					"-l\"MagicWindowSDK\"",
 					"-l\"Masonry\"",
 					"-l\"Reachability\"",
 					"-l\"SDCycleScrollView\"",
@@ -2961,7 +2960,6 @@
 					"-l\"Toast\"",
 					"-l\"UICKeyChainStore\"",
 					"-l\"UMSocialLog\"",
-					"-l\"WeChatSDK\"",
 					"-l\"WeiboSDK\"",
 					"-l\"YYAsyncLayer\"",
 					"-l\"YYCategories\"",

diff --git a/iOSProject/iOSProject/Classes/Main/LMJNewViewController.m b/iOSProject/iOSProject/Classes/Main/LMJNewViewController.m
@@ -199,11 +199,7 @@ - (void)viewDidLoad {
     item41.destVc = [LMJUniversalLinkViewController class];
 
     LMJItemSection *section0;
-    if (!LMJNJIsInGod) {
-            section0 = [LMJItemSection sectionWithItems:@[item40, item41, item1, item2, item3, item4, item5, item6, item7, item8, item9, item10, item101, item11, item12, item121,item13, item29, item30, item15, item16, item17, item18, item19, item20, item201, item21, item22, item24, item25, item26, item27, item28] andHeaderTitle:@"静态单元格的头部标题" footerTitle:@"静态单元格的尾部标题"];
-    }else {
-            section0 = [LMJItemSection sectionWithItems:@[item40, item41, item1, item2, item3, item4, item5, item6, item7, item8, item9, item10, item101, item11, item12, item121,item13, item29, item30, item16, item17, item18, item19, item20, item201, item21, item22, item24, item25, item27, item28] andHeaderTitle:@"静态单元格的头部标题" footerTitle:@"静态单元格的尾部标题"];
-    }
+    section0 = [LMJItemSection sectionWithItems:@[item40, item41, item1, item2, item3, item4, item5, item6, item7, item8, item9, item10, item101, item11, item12, item121,item13, item29, item30, item15, item16, item17, item18, item19, item20, item201, item21, item22, item24, item25, item26, item27, item28] andHeaderTitle:@"静态单元格的头部标题" footerTitle:@"静态单元格的尾部标题"];
 //    [section0.items sortUsingComparator:^NSComparisonResult(LMJWordItem  *_Nonnull obj1, LMJWordItem  *_Nonnull obj2) {
 //
 //        return [NSString stringWithFormat:@"%@%@", obj2.title, obj2.subTitle].length > [NSString stringWithFormat:@"%@%@", obj1.title, obj1.subTitle].length;

diff --git a/iOSProject/iOSProject/Classes/Main/LMJTabBarController.m b/iOSProject/iOSProject/Classes/Main/LMJTabBarController.m
@@ -46,11 +46,7 @@ - (void)addChildViewControllers
 
     LMJNavigationController *five = [[LMJNavigationController alloc] initWithRootViewController:[[LMJCasesViewController alloc] init]];
 
-    if (!LMJNJIsInGod) {
-        self.viewControllers = @[two, one, three, five, four];
-    }else {
-        self.viewControllers = @[two, one];
-    }
+    self.viewControllers = @[two, one, three, five, four];
 
 }
 

diff --git a/iOSProject/iOSProject/LMJAppDelegate.m b/iOSProject/iOSProject/LMJAppDelegate.m
@@ -46,10 +46,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [LMJUMengHelper UMPushStart:launchOptions];
 
     if (launchOptions) {
-//        [UIAlertController mj_showAlertWithTitle:@"有launchOptions!!" message:launchOptions.description appearanceProcess:^(JXTAlertController * _Nonnull alertMaker) {
-//            alertMaker.addActionCancelTitle(@"cancel").addActionDestructiveTitle(@"按钮1");
-//        } actionsBlock:^(NSInteger buttonIndex, UIAlertAction * _Nonnull action, JXTAlertController * _Nonnull alertSelf) {
-//        }];
+        [UIAlertController mj_showAlertWithTitle:@"有launchOptions!!" message:launchOptions.description appearanceProcess:^(JXTAlertController * _Nonnull alertMaker) {
+            alertMaker.addActionCancelTitle(@"cancel").addActionDestructiveTitle(@"按钮1");
+        } actionsBlock:^(NSInteger buttonIndex, UIAlertAction * _Nonnull action, JXTAlertController * _Nonnull alertSelf) {
+        }];
     }
     return YES;
 }
@@ -73,6 +73,17 @@ - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserAct
     return YES;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-implementations"
+- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation {
+        BOOL result = [[UMSocialManager defaultManager] handleOpenURL:url sourceApplication:sourceApplication annotation:annotation];
+    if (!result) {
+        // 其他如支付等SDK的回调
+
+    }
+    return result;
+}
+#pragma clang diagnostic pop
 //iOS9+scheme跳转
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(nonnull NSDictionary *)options
 {
@@ -85,12 +96,12 @@ - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(nonnull N
 
     if (url) {
         NSLog(@"%@", url);
-//        [UIAlertController mj_showAlertWithTitle:@"iOS9+scheme跳转应用" message:url.description appearanceProcess:^(JXTAlertController * _Nonnull alertMaker) {
-//
-//            alertMaker.addActionDefaultTitle(@"确认");
-//        } actionsBlock:^(NSInteger buttonIndex, UIAlertAction * _Nonnull action, JXTAlertController * _Nonnull alertSelf) {
-//
-//        }];
+        [UIAlertController mj_showAlertWithTitle:@"iOS9+scheme跳转应用" message:url.description appearanceProcess:^(JXTAlertController * _Nonnull alertMaker) {
+
+            alertMaker.addActionDefaultTitle(@"确认");
+        } actionsBlock:^(NSInteger buttonIndex, UIAlertAction * _Nonnull action, JXTAlertController * _Nonnull alertSelf) {
+
+        }];
     }
 
     return result;
@@ -106,12 +117,12 @@ - (void)application:(UIApplication *)application didRegisterForRemoteNotificatio
 
     NSLog(@"%@", string);
 
-//    [UIAlertController mj_showAlertWithTitle:@"get deviceToken" message:string appearanceProcess:^(JXTAlertController * _Nonnull alertMaker) {
-//
-//        alertMaker.addActionDefaultTitle(@"确认");
-//    } actionsBlock:^(NSInteger buttonIndex, UIAlertAction * _Nonnull action, JXTAlertController * _Nonnull alertSelf) {
-//
-//    }];
+    [UIAlertController mj_showAlertWithTitle:@"get deviceToken" message:string appearanceProcess:^(JXTAlertController * _Nonnull alertMaker) {
+
+        alertMaker.addActionDefaultTitle(@"确认");
+    } actionsBlock:^(NSInteger buttonIndex, UIAlertAction * _Nonnull action, JXTAlertController * _Nonnull alertSelf) {
+
+    }];
 }