diff --git a/README.md b/README.md index c358cfb8..0bdd1051 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,14 @@ -

Github 点个赞↑👍,感谢您的支持!

-
-

近期更新

- +

在武汉打算换工作啦, 有坑位推荐的朋友请加我微信~谢谢~

+
+

iOSProject

+
-

iOSProject

-
diff --git a/iOSProject/Podfile.lock b/iOSProject/Podfile.lock index 0623bbc3..9d9c96ef 100644 --- a/iOSProject/Podfile.lock +++ b/iOSProject/Podfile.lock @@ -1,18 +1,18 @@ PODS: - - AFNetworking (3.2.1): - - AFNetworking/NSURLSession (= 3.2.1) - - AFNetworking/Reachability (= 3.2.1) - - AFNetworking/Security (= 3.2.1) - - AFNetworking/Serialization (= 3.2.1) - - AFNetworking/UIKit (= 3.2.1) - - AFNetworking/NSURLSession (3.2.1): + - AFNetworking (4.0.1): + - AFNetworking/NSURLSession (= 4.0.1) + - AFNetworking/Reachability (= 4.0.1) + - AFNetworking/Security (= 4.0.1) + - AFNetworking/Serialization (= 4.0.1) + - AFNetworking/UIKit (= 4.0.1) + - AFNetworking/NSURLSession (4.0.1): - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/Reachability (3.2.1) - - AFNetworking/Security (3.2.1) - - AFNetworking/Serialization (3.2.1) - - AFNetworking/UIKit (3.2.1): + - AFNetworking/Reachability (4.0.1) + - AFNetworking/Security (4.0.1) + - AFNetworking/Serialization (4.0.1) + - AFNetworking/UIKit (4.0.1): - AFNetworking/NSURLSession - BaiduMapKit (4.1.1) - DWBubbleMenuButton (1.0.1) @@ -24,25 +24,25 @@ PODS: - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) - HMQRCodeScanner (1.0.6) - - IQKeyboardManager (6.2.0) + - IQKeyboardManager (6.5.6) - KILabel (1.0.1) - M13ProgressSuite (1.2.9) - Masonry (1.1.0) - - MBProgressHUD (1.1.0) - - MJExtension (3.0.15.1) - - MJRefresh (3.1.15.7) - - MOFSPickerManager (2.0.9) + - MBProgressHUD (1.2.0) + - MJExtension (3.2.2) + - MJRefresh (3.5.0) + - MOFSPickerManager (2.2.4) - Reachability (3.2) - SDCycleScrollView (1.75): - SDWebImage (>= 4.0.0) - - SDWebImage (4.4.2): - - SDWebImage/Core (= 4.4.2) - - SDWebImage/Core (4.4.2) - - SDWebImage/GIF (4.4.2): + - SDWebImage (4.4.8): + - SDWebImage/Core (= 4.4.8) + - SDWebImage/Core (4.4.8) + - SDWebImage/GIF (4.4.8): - FLAnimatedImage (~> 1.0) - SDWebImage/Core - Toast (4.0.0) - - TZImagePickerController (3.1.1) + - TZImagePickerController (3.4.2) - UICKeyChainStore (2.1.2) - UMengAnalytics (4.2.4) - UMengUShare/Core (6.4.8.2): @@ -142,7 +142,7 @@ SPEC REPOS: - ZJScrollPageView SPEC CHECKSUMS: - AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057 + AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce BaiduMapKit: 51bba432a28316680676b4d453a70e5031f3a7eb DWBubbleMenuButton: 4d9bdbb9d662bdf65c93ceb7fc65901871143d1e FCUUID: bb054fc90cd7cd99320f9f6ff8e130fe607fba05 @@ -150,19 +150,19 @@ SPEC CHECKSUMS: FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a HMQRCodeScanner: 8db2d317c0e5cbe3b4709fe2b9f26c107d66554e - IQKeyboardManager: 6194101620b73af5e67900b8f89707a99de0b804 + IQKeyboardManager: 2a6e97afdafc7becf0cb17a9a8d795e3a980717f KILabel: 4797807cdc0b4992dad8bf91175ddc973c3b569b M13ProgressSuite: ea9f7263e73e9215e6849dfa54e29ee0ad6a145c Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 - MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 - MJExtension: 19bc33ce2eee2d319760f5622562cf581a6ff756 - MJRefresh: 697f8ec75ebdbe9207767bb682cf0f51b0d8a41f - MOFSPickerManager: 1cda5d454cc0388b232ece06fb52d9d8e28464fc + MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 + MJExtension: d9b9c74cbdeb724c1e9ecbb157b318276e62e876 + MJRefresh: 6afc955813966afb08305477dd7a0d9ad5e79a16 + MOFSPickerManager: 24c0a437874696622f132c47a351b89df5030f19 Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 SDCycleScrollView: 884b88f0266dd4708a0e1934975c69cb971707b1 - SDWebImage: 624d6e296c69b244bcede364c72ae0430ac14681 + SDWebImage: 783af2c3fa36291a250030c4752ee370a9a51d13 Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 - TZImagePickerController: b33cb21ea66c1ed4c56443a0e8c84494c44be560 + TZImagePickerController: cc0b74d5f01ab4cddcc24dcdfc3c7d68e6261056 UICKeyChainStore: 85db518bb1d294366d15ec9b92a416c4e670518f UMengAnalytics: ef8d45f94c0e5771dc364cf6a5731d9d3b101da2 UMengUShare: 370d180101e13ee0227ae657ab119ba97243d2b3 @@ -175,4 +175,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: eb944b8090833ced99eac8c062404fd534cd2707 -COCOAPODS: 1.6.0.beta.2 +COCOAPODS: 1.7.1 diff --git a/iOSProject/iOSProject.xcodeproj/project.pbxproj b/iOSProject/iOSProject.xcodeproj/project.pbxproj index 4e1161d9..a83f82a6 100644 --- a/iOSProject/iOSProject.xcodeproj/project.pbxproj +++ b/iOSProject/iOSProject.xcodeproj/project.pbxproj @@ -2367,9 +2367,9 @@ "${PODS_ROOT}/Target Support Files/Pods-iOSProject/Pods-iOSProject-resources.sh", "${PODS_ROOT}/BaiduMapKit/BaiduMapKit/BaiduMapAPI_Map.framework/Resources/mapapi.bundle", "${PODS_ROOT}/HMQRCodeScanner/HMQRCodeScanner/QRCode/HMScanner.bundle", - "${PODS_ROOT}/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle", "${PODS_ROOT}/MJRefresh/MJRefresh/MJRefresh.bundle", "${PODS_ROOT}/MOFSPickerManager/MOFSPickerManagerDemo/MOFSPickerManager/province_data.xml", + "${PODS_ROOT}/MOFSPickerManager/MOFSPickerManagerDemo/MOFSPickerManager/province_data.json", "${PODS_ROOT}/TZImagePickerController/TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle", "${PODS_ROOT}/UMengUShare/UShareSDK/UMSocialSDK/UMSocialSDKPromptResources.bundle", "${PODS_ROOT}/UMengUShare/UShareSDK/SocialLibraries/QQ/QQSDK/TencentOpenApi_IOS_Bundle.bundle", @@ -2381,9 +2381,9 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mapapi.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/HMScanner.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/IQKeyboardManager.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MJRefresh.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/province_data.xml", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/province_data.json", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TZImagePickerController.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UMSocialSDKPromptResources.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TencentOpenApi_IOS_Bundle.bundle", diff --git a/iOSProject/iOSProject/Classes/LMJBase/BaseControllers/LMJNavUIBaseViewController.m b/iOSProject/iOSProject/Classes/LMJBase/BaseControllers/LMJNavUIBaseViewController.m index 2a67aa83..5fd1fdde 100644 --- a/iOSProject/iOSProject/Classes/LMJBase/BaseControllers/LMJNavUIBaseViewController.m +++ b/iOSProject/iOSProject/Classes/LMJBase/BaseControllers/LMJNavUIBaseViewController.m @@ -169,6 +169,17 @@ - (void)setTitle:(NSString *)title { self.lmj_navgationBar.title = [self changeTitle:title]; } +- (void)presentViewController:(UIViewController *)viewControllerToPresent animated:(BOOL)flag completion:(void (^)(void))completion +{ + if (@available(iOS 13.0, *)) { + if (viewControllerToPresent.modalPresentationStyle == UIModalPresentationPageSheet || viewControllerToPresent.modalPresentationStyle == UIModalPresentationAutomatic){ + viewControllerToPresent.modalPresentationStyle = UIModalPresentationFullScreen; + } + } else { + // Fallback on earlier versions + } + [super presentViewController:viewControllerToPresent animated:flag completion:completion]; +} @end diff --git a/iOSProject/iOSProject/Classes/LMJBase/BaseControllers/LMJNavigationController.m b/iOSProject/iOSProject/Classes/LMJBase/BaseControllers/LMJNavigationController.m index 3914957a..a38d5662 100644 --- a/iOSProject/iOSProject/Classes/LMJBase/BaseControllers/LMJNavigationController.m +++ b/iOSProject/iOSProject/Classes/LMJBase/BaseControllers/LMJNavigationController.m @@ -58,6 +58,19 @@ - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)ani [super pushViewController:viewController animated:animated]; } + +- (void)presentViewController:(UIViewController *)viewControllerToPresent animated:(BOOL)flag completion:(void (^)(void))completion +{ + if (@available(iOS 13.0, *)) { + if (viewControllerToPresent.modalPresentationStyle == UIModalPresentationPageSheet || viewControllerToPresent.modalPresentationStyle == UIModalPresentationAutomatic){ + viewControllerToPresent.modalPresentationStyle = UIModalPresentationFullScreen; + } + } else { + // Fallback on earlier versions + } + [super presentViewController:viewControllerToPresent animated:flag completion:completion]; +} + @end diff --git a/iOSProject/iOSProject/Classes/Main/LMJMessageViewController.m b/iOSProject/iOSProject/Classes/Main/LMJMessageViewController.m index db7771ba..c583a00b 100644 --- a/iOSProject/iOSProject/Classes/Main/LMJMessageViewController.m +++ b/iOSProject/iOSProject/Classes/Main/LMJMessageViewController.m @@ -16,7 +16,7 @@ @interface LMJMessageViewController () /** <#digest#> */ -@property (weak, nonatomic) UILabel *backBtn; +@property (strong, nonatomic) UILabel *backBtn; @end @implementation LMJMessageViewController @@ -81,6 +81,7 @@ - (void)viewDidAppear:(BOOL)animated { - (void)viewDidDisappear:(BOOL)animated { [super viewDidDisappear:animated]; self.backBtn.hidden = !self.presentedViewController; + [[UIApplication sharedApplication].keyWindow addSubview:self.backBtn]; } - (UILabel *)backBtn @@ -137,15 +138,9 @@ - (UILabel *)backBtn }]]; - - - [[UIApplication sharedApplication].keyWindow addSubview:btn]; - _backBtn = btn; } return _backBtn; } - - @end diff --git a/iOSProject/iOSProject/Classes/Network/LMJRequestManager.m b/iOSProject/iOSProject/Classes/Network/LMJRequestManager.m index a7b8e5b0..20833b7e 100644 --- a/iOSProject/iOSProject/Classes/Network/LMJRequestManager.m +++ b/iOSProject/iOSProject/Classes/Network/LMJRequestManager.m @@ -54,12 +54,12 @@ - (void)request:(NSString *)method URL:(NSString *)urlString parameters:(id)para if ([method isEqualToString:@"GET"]) { - [self GET:urlString parameters:parameters progress:nil success:success failure:failure]; + [self GET:urlString parameters:parameters headers:nil progress:nil success:success failure:failure]; } if ([method isEqualToString:@"POST"]) { - [self POST:urlString parameters:parameters progress:nil success:success failure:failure]; + [self POST:urlString parameters:parameters headers:nil progress:nil success:success failure:failure]; } } @@ -151,7 +151,7 @@ - (void)upload:(NSString *)urlString parameters:(id)parameters formDataBlock:(NS { static NSString *mineType = @"application/octet-stream"; - [self POST:urlString parameters:parameters constructingBodyWithBlock:^(id _Nonnull formData) { + [self POST:urlString parameters:parameters headers:nil constructingBodyWithBlock:^(id _Nonnull formData) { NSMutableDictionary *needFillDataDict = [NSMutableDictionary dictionary]; NSDictionary *datas = !formDataBlock ? nil : formDataBlock(formData, needFillDataDict); diff --git a/iOSProject/iOSProject/Classes/Preview3/LMJOfflineDownloadViewController.m b/iOSProject/iOSProject/Classes/Preview3/LMJOfflineDownloadViewController.m index 82cf6f14..537752a4 100644 --- a/iOSProject/iOSProject/Classes/Preview3/LMJOfflineDownloadViewController.m +++ b/iOSProject/iOSProject/Classes/Preview3/LMJOfflineDownloadViewController.m @@ -19,66 +19,79 @@ @implementation LMJOfflineDownloadViewController - (void)viewDidLoad { [super viewDidLoad]; + // 数据 NSArray *urls = @[ - @"http://120.25.226.186:32812/resources/videos/minion_01.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_02.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_03.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_04.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_05.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_06.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_07.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_08.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_09.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_10.mp4" + @"http://teaching.csse.uwa.edu.au/units/CITS4401/practicals/James1_files/SPMP1.pdf", + @"http://down.51rc.com/dwndoc/WrittenExamination/WrittenExperiences/dwn00006795.doc", + @"http://video1.remindchat.com/20190905/1gEji0Sv/mp4/1gEji0Sv.mp4", + @"https://www.sample-videos.com/video123/mp4/720/big_buck_bunny_720p_20mb.mp4", + @"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4", + @"http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4", ]; self.title = @"点击Cell开始/暂停下载"; LMJWeak(self); + // 遍历URL个数创建对应的模型数组 [urls enumerateObjectsUsingBlock:^(NSString * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + // 获取下载文件对象 MJDownloadInfo *info = [[MJDownloadManager defaultManager] downloadInfoForURL:obj]; NSString *subTitle = nil; + // 比对缓存是否下载完毕 if (info.state == MJDownloadStateCompleted) { subTitle = @"播放"; }else { + // 比对缓存进度 CGFloat progress = ((CGFloat)info.totalBytesWritten) / info.totalBytesExpectedToWrite * 100; subTitle = [NSString stringWithFormat:@"进度: %.2f%%, 点击开始", isnan(progress) ? 0 : progress]; } - self.addItem([LMJWordItem itemWithTitle:obj.lastPathComponent subTitle:subTitle itemOperation:^(NSIndexPath *indexPath) { + // 添加数据模型, 和 绑定点击事件; + // 考虑到cell的复用问题, 这个cell点击的时候, 调用了模型的itemOperation回调, + self.addItem([LMJWordItem itemWithTitle:[obj.lastPathComponent substringToIndex:5] subTitle:subTitle itemOperation:^(NSIndexPath *indexPath) { + // 文件下载状态: 下载中和在下载队列排队, 最大3个下载 if (info.state == MJDownloadStateResumed || info.state == MJDownloadStateWillResume) { - + + // 暂停 [[MJDownloadManager defaultManager] suspend:info.url]; + // 获取进度 CGFloat progress = ((CGFloat)info.totalBytesWritten) / info.totalBytesExpectedToWrite * 100; + // 刷新模型 weakself.sections.firstObject.items[indexPath.row].subTitle = [NSString stringWithFormat:@"暂停中..进度: %.2f%%", isnan(progress) ? 0 : progress]; + // 刷新UI, 获取不到就不刷新UI, 下次滚动cell赋值模型的时候, 还会刷新模型数据 ((LMJSettingCell *)[weakself.tableView cellForRowAtIndexPath:indexPath]).item = weakself.sections.firstObject.items[indexPath.row]; - } else if (info.state == MJDownloadStateSuspened || info.state == MJDownloadStateNone) { + } else if (info.state == MJDownloadStateSuspened || info.state == MJDownloadStateNone) { // 暂停中和无状态; 开始下载 + // 开始下载obj = Url [[MJDownloadManager defaultManager] download:obj progress:^(NSInteger bytesWritten, NSInteger totalBytesWritten, NSInteger totalBytesExpectedToWrite) { dispatch_async(dispatch_get_main_queue(), ^{ + // 更新模型 weakself.sections.firstObject.items[indexPath.row].subTitle = [NSString stringWithFormat:@"进度: %.2f%%", (CGFloat)totalBytesWritten / totalBytesExpectedToWrite * 100.0]; - + + // 更新视图; 获取不到cell就不刷新UI, 下次滚动cell然后赋值模型的时候, 还会刷新模型数据 ((LMJSettingCell *)[weakself.tableView cellForRowAtIndexPath:indexPath]).item = weakself.sections.firstObject.items[indexPath.row]; }); } state:^(MJDownloadState state, NSString *file, NSError *error) { + // 主线程刷新UI dispatch_async(dispatch_get_main_queue(), ^{ if (state == MJDownloadStateCompleted) { + // 更新模型 weakself.sections.firstObject.items[indexPath.row].subTitle = @"播放"; - + // 更新视图; 获取不到cell就不刷新UI, 下次滚动cell然后赋值模型的时候, 还会刷新模型数据 ((LMJSettingCell *)[weakself.tableView cellForRowAtIndexPath:indexPath]).item = weakself.sections.firstObject.items[indexPath.row]; } }); }]; - }else if (info.state == MJDownloadStateCompleted) { - + }else if (info.state == MJDownloadStateCompleted) { // 文件是下载完毕的状态 + // 跳转播放, 根据实际情况点击 VIDMoviePlayerViewController *playerVc = [[VIDMoviePlayerViewController alloc] init]; playerVc.videoURL = [NSString stringWithFormat:@"file://%@", info.file]; [weakself.navigationController pushViewController:playerVc animated:YES]; @@ -88,6 +101,7 @@ - (void)viewDidLoad { }]); }]; + // 添加2个操作模型, 绑定模型itemOperation操作 self.addItem([LMJWordItem itemWithTitle:@"全部开始" subTitle: nil itemOperation:^(NSIndexPath *indexPath) { [[MJDownloadManager defaultManager] resumeAll]; }]).addItem([LMJWordItem itemWithTitle:@"全部暂停" subTitle: nil itemOperation:^(NSIndexPath *indexPath) { diff --git a/iOSProject/iOSProject/Classes/Preview3/LMJRSAViewController.m b/iOSProject/iOSProject/Classes/Preview3/LMJRSAViewController.m index 0193325c..b25311bd 100644 --- a/iOSProject/iOSProject/Classes/Preview3/LMJRSAViewController.m +++ b/iOSProject/iOSProject/Classes/Preview3/LMJRSAViewController.m @@ -100,7 +100,7 @@ - (void)requestDataEncrypt //content DES3 pkey NSString *contentDES = [DES3Encryptor DES3EncryptString:content keyString:pkey ivString:@"01234567"]; - [self.manager POST:@"https://mob-test-tech.meme2c.com/ums/app/mmUserInfo" parameters:contentDES progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { + [self.manager POST:@"https://mob-test-tech.meme2c.com/ums/app/mmUserInfo" parameters:contentDES headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { NSLog(@"%@", responseObject); if (![responseObject isKindOfClass:[NSDictionary class]]) { return ; diff --git "a/iOSProject/iOSProject/Classes/\347\231\276\346\200\235\344\270\215\345\276\227\345\247\220/Controller/BSJMeViewController.m" "b/iOSProject/iOSProject/Classes/\347\231\276\346\200\235\344\270\215\345\276\227\345\247\220/Controller/BSJMeViewController.m" index 7239661d..537a5f40 100644 --- "a/iOSProject/iOSProject/Classes/\347\231\276\346\200\235\344\270\215\345\276\227\345\247\220/Controller/BSJMeViewController.m" +++ "b/iOSProject/iOSProject/Classes/\347\231\276\346\200\235\344\270\215\345\276\227\345\247\220/Controller/BSJMeViewController.m" @@ -51,7 +51,10 @@ - (void)getDatas [weakself.meSquares removeAllObjects]; [weakself.meSquares addObjectsFromArray:[BSJMeSquare mj_objectArrayWithKeyValuesArray:response.responseObject[@"square_list"]]]; - [self.collectionView reloadData]; + if ([weakself.meSquares.lastObject isKindOfClass:NSArray.class]) { + [weakself.meSquares removeLastObject]; + } + [weakself.collectionView reloadData]; }]; } diff --git "a/iOSProject/iOSProject/Classes/\347\231\276\346\200\235\344\270\215\345\276\227\345\247\220/View/BSJHlightedTextField.m" "b/iOSProject/iOSProject/Classes/\347\231\276\346\200\235\344\270\215\345\276\227\345\247\220/View/BSJHlightedTextField.m" index 58e70aed..c2d01abb 100644 --- "a/iOSProject/iOSProject/Classes/\347\231\276\346\200\235\344\270\215\345\276\227\345\247\220/View/BSJHlightedTextField.m" +++ "b/iOSProject/iOSProject/Classes/\347\231\276\346\200\235\344\270\215\345\276\227\345\247\220/View/BSJHlightedTextField.m" @@ -8,7 +8,7 @@ #import "BSJHlightedTextField.h" -static NSString *const BSJHlightTextFieldPlaceHolderColorKeyPath = @"_placeholderLabel.textColor"; +//static NSString *const BSJHlightTextFieldPlaceHolderColorKeyPath = @""; @interface BSJHlightedTextField () /** <#digest#> */ @@ -34,7 +34,7 @@ - (void)awakeFromNib - (void)setupUIOnce { - self.oriPlaceHolderColor = [self valueForKeyPath:BSJHlightTextFieldPlaceHolderColorKeyPath]; +// self.oriPlaceHolderColor = [self valueForKeyPath:BSJHlightTextFieldPlaceHolderColorKeyPath]; self.tintColor = self.textColor; self.leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 15, 20)]; self.leftViewMode = UITextFieldViewModeAlways; @@ -43,7 +43,7 @@ - (void)setupUIOnce - (BOOL)becomeFirstResponder { - [self setValue:self.textColor forKeyPath:BSJHlightTextFieldPlaceHolderColorKeyPath]; +// [self setValue:self.textColor forKeyPath:BSJHlightTextFieldPlaceHolderColorKeyPath]; return [super becomeFirstResponder]; } @@ -51,7 +51,7 @@ - (BOOL)becomeFirstResponder - (BOOL)resignFirstResponder { - [self setValue:self.oriPlaceHolderColor forKeyPath:BSJHlightTextFieldPlaceHolderColorKeyPath]; +// [self setValue:self.oriPlaceHolderColor forKeyPath:BSJHlightTextFieldPlaceHolderColorKeyPath]; return [super resignFirstResponder]; } diff --git "a/iOSProject/iOSProject/Classes/\350\247\206\351\242\221\346\222\255\346\224\276/Controller/VIDListViewController.m" "b/iOSProject/iOSProject/Classes/\350\247\206\351\242\221\346\222\255\346\224\276/Controller/VIDListViewController.m" index f1f42d24..8a5db4e9 100644 --- "a/iOSProject/iOSProject/Classes/\350\247\206\351\242\221\346\222\255\346\224\276/Controller/VIDListViewController.m" +++ "b/iOSProject/iOSProject/Classes/\350\247\206\351\242\221\346\222\255\346\224\276/Controller/VIDListViewController.m" @@ -19,15 +19,10 @@ @implementation VIDListViewController - (void)viewDidLoad { [super viewDidLoad]; - self.videoUrlStrs = @[ @"http://120.25.226.186:32812/resources/videos/minion_01.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_02.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_03.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_04.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_05.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_06.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_07.mp4", - @"http://120.25.226.186:32812/resources/videos/minion_08.mp4", - @"http://static.smartisanos.cn/common/video/proud-farmer.mp4"]; + self.videoUrlStrs = @[ @"http://video1.remindchat.com/20190905/1gEji0Sv/mp4/1gEji0Sv.mp4", + @"https://www.sample-videos.com/video123/mp4/720/big_buck_bunny_720p_20mb.mp4", + @"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4", + @"http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4"]; } - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { diff --git a/iOSProject/iOSProject/Info.plist b/iOSProject/iOSProject/Info.plist index f0142442..79fce959 100644 --- a/iOSProject/iOSProject/Info.plist +++ b/iOSProject/iOSProject/Info.plist @@ -22,6 +22,8 @@ $(PRODUCT_NAME) CFBundlePackageType APPL + UIUserInterfaceStyle + Light CFBundleShortVersionString 1.0.0 CFBundleURLTypes @@ -176,6 +178,11 @@ NSIncludesSubdomains + localhost + + NSTemporaryExceptionAllowsInsecureHTTPLoads + + fbcdn.net NSExceptionRequiresForwardSecrecy diff --git a/iOSProject/iOSProject/LMJAppDelegate.m b/iOSProject/iOSProject/LMJAppDelegate.m index 209ce2dd..b7481555 100644 --- a/iOSProject/iOSProject/LMJAppDelegate.m +++ b/iOSProject/iOSProject/LMJAppDelegate.m @@ -39,11 +39,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( [self.window addSubview:[[YYFPSLabel alloc] initWithFrame:CGRectMake(20, 70, 0, 0)]]; // 友盟统计 - [LMJUMengHelper UMAnalyticStart]; +// [LMJUMengHelper UMAnalyticStart]; // 友盟社交化 - [LMJUMengHelper UMSocialStart]; +// [LMJUMengHelper UMSocialStart]; // 友盟推送 - [LMJUMengHelper UMPushStart:launchOptions]; +// [LMJUMengHelper UMPushStart:launchOptions]; if (launchOptions) { [UIAlertController mj_showAlertWithTitle:@"有launchOptions!!" message:launchOptions.description appearanceProcess:^(JXTAlertController * _Nonnull alertMaker) { @@ -58,7 +58,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( #pragma mark -应用跳转 //Universal link -- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler +- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray> * _Nullable))restorationHandler { if (userActivity.webpageURL) { NSLog(@"%@", userActivity.webpageURL); diff --git a/images/wx_code.jpg b/images/wx_code.jpg new file mode 100644 index 00000000..4dd6ffb3 Binary files /dev/null and b/images/wx_code.jpg differ