iOS Team / ScioLive · Commits

Commit e2ad1b6be638486ba481d504799b980659968df6

Authored by yanglingyu
1 parent 62b547b1

修改导入信鸽推送，直播折叠问题

Inline Side-by-side
Showing 6 changed files with 36 additions and 57 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @e2ad1b6
... ... @@ -2254,7 +2254,7 @@
2254 2254 08C08F6C214F997E00E23D16 /* Resources */,
2255 2255 3C412EE07D0846DBB3CA1DB7 /* [CP] Embed Pods Frameworks */,
2256 2256 085D86A72159D0160037D480 /* CopyFiles */,
2257   - 39F5655E46FDB8E0CA721359 /* [CP] Copy Pods Resources */,
  2257 + 3FAD9C1F5C35891A7600DD15 /* [CP] Copy Pods Resources */,
2258 2258 );
2259 2259 buildRules = (
2260 2260 );
... ... @@ -2505,38 +2505,38 @@
2505 2505 shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
2506 2506 showEnvVarsInLog = 0;
2507 2507 };
2508   - 39F5655E46FDB8E0CA721359 /* [CP] Copy Pods Resources */ = {
  2508 + 3C412EE07D0846DBB3CA1DB7 /* [CP] Embed Pods Frameworks */ = {
2509 2509 isa = PBXShellScriptBuildPhase;
2510 2510 buildActionMask = 2147483647;
2511 2511 files = (
2512 2512 );
2513 2513 inputFileListPaths = (
2514   - "${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-resources-${CONFIGURATION}-input-files.xcfilelist",
  2514 + "${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-frameworks-${CONFIGURATION}-input-files.xcfilelist",
2515 2515 );
2516   - name = "[CP] Copy Pods Resources";
  2516 + name = "[CP] Embed Pods Frameworks";
2517 2517 outputFileListPaths = (
2518   - "${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-resources-${CONFIGURATION}-output-files.xcfilelist",
  2518 + "${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-frameworks-${CONFIGURATION}-output-files.xcfilelist",
2519 2519 );
2520 2520 runOnlyForDeploymentPostprocessing = 0;
2521 2521 shellPath = /bin/sh;
2522   - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-resources.sh\"\n";
  2522 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-frameworks.sh\"\n";
2523 2523 showEnvVarsInLog = 0;
2524 2524 };
2525   - 3C412EE07D0846DBB3CA1DB7 /* [CP] Embed Pods Frameworks */ = {
  2525 + 3FAD9C1F5C35891A7600DD15 /* [CP] Copy Pods Resources */ = {
2526 2526 isa = PBXShellScriptBuildPhase;
2527 2527 buildActionMask = 2147483647;
2528 2528 files = (
2529 2529 );
2530 2530 inputFileListPaths = (
2531   - "${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-frameworks-${CONFIGURATION}-input-files.xcfilelist",
  2531 + "${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-resources-${CONFIGURATION}-input-files.xcfilelist",
2532 2532 );
2533   - name = "[CP] Embed Pods Frameworks";
  2533 + name = "[CP] Copy Pods Resources";
2534 2534 outputFileListPaths = (
2535   - "${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-frameworks-${CONFIGURATION}-output-files.xcfilelist",
  2535 + "${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-resources-${CONFIGURATION}-output-files.xcfilelist",
2536 2536 );
2537 2537 runOnlyForDeploymentPostprocessing = 0;
2538 2538 shellPath = /bin/sh;
2539   - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-frameworks.sh\"\n";
  2539 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-resources.sh\"\n";
2540 2540 showEnvVarsInLog = 0;
2541 2541 };
2542 2542 /* End PBXShellScriptBuildPhase section */
... ... @@ -3170,7 +3170,7 @@
3170 3170 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3171 3171 CODE_SIGN_IDENTITY = "Apple Development";
3172 3172 CODE_SIGN_STYLE = Automatic;
3173   - CURRENT_PROJECT_VERSION = 403;
  3173 + CURRENT_PROJECT_VERSION = 404;
3174 3174 DEVELOPMENT_TEAM = 94X49GG3ZW;
3175 3175 ENABLE_BITCODE = NO;
3176 3176 FRAMEWORK_SEARCH_PATHS = (
... ... @@ -3227,7 +3227,7 @@
3227 3227 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3228 3228 CODE_SIGN_IDENTITY = "Apple Development";
3229 3229 CODE_SIGN_STYLE = Automatic;
3230   - CURRENT_PROJECT_VERSION = 403;
  3230 + CURRENT_PROJECT_VERSION = 404;
3231 3231 DEVELOPMENT_TEAM = 94X49GG3ZW;
3232 3232 ENABLE_BITCODE = NO;
3233 3233 FRAMEWORK_SEARCH_PATHS = (
... ...
CNLiveScioLive/AppDelegate.m
  View file @e2ad1b6
... ... @@ -39,8 +39,8 @@
39 39 self.window.backgroundColor = [UIColor whiteColor];
40 40  
41 41 //推送
42   - [self registerRemoteNotification];
43   - [self registerNotification:launchOptions];
  42 +// [self registerRemoteNotification];
  43 +// [self registerNotification:launchOptions];
44 44  
45 45 [[BaiduMobStat defaultStat] startWithAppId:uBaiduMobStat];
46 46  
... ... @@ -294,14 +294,14 @@
294 294 XGNotificationAction *action2 = [XGNotificationAction actionWithIdentifier:@"xgaction002" title:@"xgAction2" options:XGNotificationActionOptionDestructive];
295 295 if (action1 && action2) {
296 296 XGNotificationCategory *category = [XGNotificationCategory categoryWithIdentifier:@"xgCategory" actions:@[action1, action2] intentIdentifiers:@[] options:XGNotificationCategoryOptionNone];
297   -
  297 +
298 298 XGNotificationConfigure *configure = [XGNotificationConfigure configureNotificationWithCategories:[NSSet setWithObject:category] types:XGUserNotificationTypeAlert|XGUserNotificationTypeBadge|XGUserNotificationTypeSound];
299 299 if (configure) {
300 300 [[XGPush defaultManager] setNotificationConfigure:configure];
301 301 }
302 302 }
303   -
304   - [[XGPush defaultManager] startXGWithAppID:2200300438 appKey:@"IF5M37BQ66BM" delegate:self];
  303 + [[XGPush defaultManager] startXGWithAccessID:1680006341
  304 + accessKey:@"IPO5NXGY4S6Y" delegate:self];
305 305 [[XGPush defaultManager] setXgApplicationBadgeNumber:0];
306 306 [[XGPush defaultManager] reportXGNotificationInfo:launchOptions];
307 307  
... ... @@ -469,12 +469,7 @@
469 469 } else if ([response.actionIdentifier isEqualToString:@"xgaction002"]) {
470 470 NSLog(@"click from Action2");
471 471 }
472   -
473   - if (@available(iOS 10.0, *)) {
474   - [[XGPush defaultManager] reportXGNotificationResponse:response];
475   - } else {
476   - // Fallback on earlier versions
477   - }
  472 +
478 473  
479 474 completionHandler();
480 475 }
... ... @@ -490,8 +485,9 @@
490 485 }
491 486 #endif
492 487 #pragma mark - XGPushDelegate
493   -- (void)xgPushDidFinishStart:(BOOL)isSuccess error:(NSError *)error {
494   - NSLog(@"%s, result %@, error %@", __FUNCTION__, isSuccess?@"OK":@"NO", error);
  488 +-(void)xgPushDidRegisteredDeviceToken:(NSString *)deviceToken xgToken:(NSString *)xgToken error:(NSError *)error {
  489 + NSLog(@"token:%@",deviceToken);
  490 + NSLog(@"%s, result %@, error %@", __FUNCTION__, error?@"NO":@"OK", error);
495 491 // UIViewController *ctr = [self.window rootViewController];
496 492 // UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"" message:[NSString stringWithFormat:@"启动信鸽服务%@",isSuccess ? @"成功":@"失败"] delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil, nil];
497 493 // [alert show];
... ... @@ -504,10 +500,6 @@
504 500  
505 501 }
506 502  
507   -- (void)xgPushDidRegisteredDeviceToken:(NSString *)deviceToken error:(NSError *)error {
508   - NSLog(@"token:%@",deviceToken);
509   - NSLog(@"%s, result %@, error %@", __FUNCTION__, error?@"NO":@"OK", error);
510   -}
511 503 #pragma mark - SDK Configuration
512 504 - (void)initializeSDKConfiguration{
513 505 //注册APP
... ...
CNLiveScioLive/Info.plist
  View file @e2ad1b6
... ... @@ -52,6 +52,14 @@
52 52 <string>QQ41E36E86</string>
53 53 </array>
54 54 </dict>
  55 + <dict>
  56 + <key>CFBundleTypeRole</key>
  57 + <string>Editor</string>
  58 + <key>CFBundleURLSchemes</key>
  59 + <array>
  60 + <string>CNLiveScioShareSchema</string>
  61 + </array>
  62 + </dict>
55 63 </array>
56 64 <key>CFBundleVersion</key>
57 65 <string>$(CURRENT_PROJECT_VERSION)</string>
... ...
CNLiveScioLive/Pages/Header/PrefixHeader.pch
  View file @e2ad1b6
... ... @@ -73,8 +73,8 @@
73 73 #import <ShareSDKConnector/ShareSDKConnector.h>
74 74 #import <ShareSDKUI/ShareSDK+SSUI.h>
75 75 //腾讯开放平台（对应QQ和QQ空间）SDK头文件
76   -#import <TencentOpenAPI/TencentOAuth.h>
77   -#import <TencentOpenAPI/QQApiInterface.h>
  76 +//#import <TencentOpenAPI/TencentOAuth.h>
  77 +//#import <TencentOpenAPI/QQApiInterface.h>
78 78 #import "WeiboSDK.h"
79 79 #import "WXApi.h"
80 80  
... ...
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
  View file @e2ad1b6
... ... @@ -55,7 +55,6 @@
55 55  
56 56 - (void)loadData {
57 57 if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
58   - [self setUpUIWithTag:1000 Height:0];
59 58 return;
60 59 }
61 60  
... ... @@ -73,7 +72,6 @@
73 72  
74 73 } failure:^(NSURLSessionDataTask *task, NSError *error) {
75 74 NSLog(@"%@",error);
76   - [self setUpUIWithTag:1000 Height:0];
77 75  
78 76 }];
79 77  
... ... @@ -90,7 +88,6 @@
90 88 manager.responseSerializer = [AFHTTPResponseSerializer serializer];
91 89 [manager POST:tuwen(docId.intValue) parameters:nil headers:nil progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
92 90 [AlertViewTool hideHUDView];
93   - [self setUpUIWithTag:1000 Height:40.0];
94 91 // 请求成功，解析数据
95 92 NSString * jsonString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
96 93 NSArray *arr = [jsonString objectFromJSONString];
... ... @@ -142,12 +139,6 @@
142 139  
143 140 backgroundView.bounces = NO;
144 141 [self.view addSubview:backgroundView];
145   -
146   -
147   -// NSString* htmlHeader = [[NSString alloc] initWithFormat:@"<html><font style=\"font-size:20px;\"><strong>%@</strong></font><br><p>%@</p><p>来源 : 国新网</p><body>",[_dictionary objectForKey:@"title"],[_dictionary objectForKey:@"liveStartDateTime"]];
148   -// NSString* htmlFooter = [[NSString alloc] initWithFormat:@"<div class=\"logo\" style=\"text-indent:2em\">%@</div></body></html>",[_dictionary objectForKey:@"Description"]];
149   -// NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@",htmlHeader,htmlFooter];
150   -// [relatedWebView loadHTMLString:strHtml baseURL:nil];
151 142  
152 143 NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width, user-scalable=no'); document.getElementsByTagName('head')[0].appendChild(meta);";
153 144  
... ... @@ -190,19 +181,6 @@
190 181 self.liveController = nil;
191 182 }
192 183 #pragma mark - UI
193   -//- (void)setNaviation{
194   -// self.navigationController.navigationBar.translucent = NO;
195   -// [self.navigationController.navigationBar setBarTintColor:HEXCOLOR(0x195ac9)];
196   -// [self.navigationController.navigationBar setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIFont systemFontOfSize:20],NSFontAttributeName,[UIColor whiteColor],NSForegroundColorAttributeName,nil]];
197   -// self.navigationController.title = @"发布会直播";
198   -// UIButton *leftButton = [UIButton buttonWithType:UIButtonTypeCustom];
199   -// [leftButton addTarget:self action:@selector(Pop:) forControlEvents:UIControlEventTouchUpInside];
200   -// [leftButton setImage:[UIImage imageNamed:@"cnlive_white_back"] forState:UIControlStateNormal];
201   -// [leftButton setFrame:CGRectMake(0, 0, 44, 44)];
202   -// self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:leftButton];
203   -// self.navigationItem.hidesBackButton = YES;
204   -// self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
205   -//}
206 184 - (void)loadMovieView {
207 185 [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"GraphicLive_DidLockScreen"];
208 186 imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight)];
... ... @@ -332,8 +310,9 @@
332 310 relatedWebView.frame = frame;
333 311 [webView evaluateJavaScript:@"document.body.scrollHeight"completionHandler:^(id _Nullable result,NSError * _Nullable error){
334 312 NSLog(@"scrollHeight高度：%.2f",[result floatValue]);
335   - descriptionHeight = [result floatValue];
336   - [relatedWebView setFrame:CGRectMake(0, 0, MainScreenWidth, descriptionHeight)];
  313 + self->descriptionHeight = [result floatValue];
  314 + [self->relatedWebView setFrame:CGRectMake(0, 0, MainScreenWidth, self->descriptionHeight)];
  315 + [self setUpUIWithTag:1000 Height:40.0];
337 316 }];
338 317 }
339 318 if (webView.tag==2000) {
... ...
... ... @@ -41,7 +41,7 @@ target &#39;CNLiveScioLive&#39; do
41 41 pod 'mob_sharesdk/ShareSDKPlatforms/SinaWeibo'
42 42 pod 'mob_sharesdk/ShareSDKPlatforms/WeChat'
43 43  
44   - pod 'QQ_XGPush'
  44 + pod 'TPNS-iOS'
45 45 #####zx改
46 46 pod 'CNLiveSDK/CNLiveStat'
47 47 pod 'CNLiveSDK/CNLiveUserSystemSDK'
... ...