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

yanglingyu
1 parent 62b547b1
Showing 6 changed files with 36 additions and 57 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/AppDelegate.m
CNLiveScioLive/Info.plist
CNLiveScioLive/Pages/Header/PrefixHeader.pch
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
Podfile
@@ -2254,7 +2254,7 @@
 				08C08F6C214F997E00E23D16 /* Resources */,
 				3C412EE07D0846DBB3CA1DB7 /* [CP] Embed Pods Frameworks */,
 				085D86A72159D0160037D480 /* CopyFiles */,
-				39F5655E46FDB8E0CA721359 /* [CP] Copy Pods Resources */,
+				3FAD9C1F5C35891A7600DD15 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -2505,38 +2505,38 @@
 			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";
 			showEnvVarsInLog = 0;
 		};
-		39F5655E46FDB8E0CA721359 /* [CP] Copy Pods Resources */ = {
+		3C412EE07D0846DBB3CA1DB7 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-resources-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Copy Pods Resources";
+			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-resources-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		3C412EE07D0846DBB3CA1DB7 /* [CP] Embed Pods Frameworks */ = {
+		3FAD9C1F5C35891A7600DD15 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveScioLive/Pods-CNLiveScioLive-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -3170,7 +3170,7 @@
 				CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 403;
+				CURRENT_PROJECT_VERSION = 404;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3227,7 +3227,7 @@
 				CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 403;
+				CURRENT_PROJECT_VERSION = 404;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -39,8 +39,8 @@
     self.window.backgroundColor = [UIColor whiteColor];
     //推送
-    [self registerRemoteNotification];
-    [self registerNotification:launchOptions];
+//    [self registerRemoteNotification];
+//    [self registerNotification:launchOptions];
     [[BaiduMobStat defaultStat] startWithAppId:uBaiduMobStat];
@@ -294,14 +294,14 @@
     XGNotificationAction *action2 = [XGNotificationAction actionWithIdentifier:@"xgaction002" title:@"xgAction2" options:XGNotificationActionOptionDestructive];
     if (action1 && action2) {
         XGNotificationCategory *category = [XGNotificationCategory categoryWithIdentifier:@"xgCategory" actions:@[action1, action2] intentIdentifiers:@[] options:XGNotificationCategoryOptionNone];
-        
+
         XGNotificationConfigure *configure = [XGNotificationConfigure configureNotificationWithCategories:[NSSet setWithObject:category] types:XGUserNotificationTypeAlert|XGUserNotificationTypeBadge|XGUserNotificationTypeSound];
         if (configure) {
             [[XGPush defaultManager] setNotificationConfigure:configure];
         }
     }
-    
-    [[XGPush defaultManager] startXGWithAppID:2200300438 appKey:@"IF5M37BQ66BM" delegate:self];
+    [[XGPush defaultManager] startXGWithAccessID:1680006341
+ accessKey:@"IPO5NXGY4S6Y" delegate:self];
     [[XGPush defaultManager] setXgApplicationBadgeNumber:0];
     [[XGPush defaultManager] reportXGNotificationInfo:launchOptions];
@@ -469,12 +469,7 @@
     } else if ([response.actionIdentifier isEqualToString:@"xgaction002"]) {
         NSLog(@"click from Action2");
     }
-    
-    if (@available(iOS 10.0, *)) {
-        [[XGPush defaultManager] reportXGNotificationResponse:response];
-    } else {
-        // Fallback on earlier versions
-    }
+   
     completionHandler();
 }
@@ -490,8 +485,9 @@
 }
 #endif
 #pragma mark - XGPushDelegate
-- (void)xgPushDidFinishStart:(BOOL)isSuccess error:(NSError *)error {
-    NSLog(@"%s, result %@, error %@", __FUNCTION__, isSuccess?@"OK":@"NO", error);
+-(void)xgPushDidRegisteredDeviceToken:(NSString *)deviceToken xgToken:(NSString *)xgToken error:(NSError *)error {
+    NSLog(@"token:%@",deviceToken);
+    NSLog(@"%s, result %@, error %@", __FUNCTION__, error?@"NO":@"OK", error);
     //    UIViewController *ctr = [self.window rootViewController];
     //    UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"" message:[NSString stringWithFormat:@"启动信鸽服务%@",isSuccess ? @"成功":@"失败"] delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil, nil];
     //    [alert show];
@@ -504,10 +500,6 @@
 }
-- (void)xgPushDidRegisteredDeviceToken:(NSString *)deviceToken error:(NSError *)error {
-    NSLog(@"token:%@",deviceToken);
-    NSLog(@"%s, result %@, error %@", __FUNCTION__, error?@"NO":@"OK", error);
-}
 #pragma mark - SDK Configuration
 - (void)initializeSDKConfiguration{
     //注册APP
@@ -52,6 +52,14 @@
 				<string>QQ41E36E86</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>CNLiveScioShareSchema</string>
+			</array>
+		</dict>
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
@@ -73,8 +73,8 @@
 #import <ShareSDKConnector/ShareSDKConnector.h>
 #import <ShareSDKUI/ShareSDK+SSUI.h>
 //腾讯开放平台（对应QQ和QQ空间）SDK头文件
-#import <TencentOpenAPI/TencentOAuth.h>
-#import <TencentOpenAPI/QQApiInterface.h>
+//#import <TencentOpenAPI/TencentOAuth.h>
+//#import <TencentOpenAPI/QQApiInterface.h>
 #import "WeiboSDK.h"
 #import "WXApi.h"
@@ -55,7 +55,6 @@
 - (void)loadData {
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
-        [self setUpUIWithTag:1000 Height:0];
         return;
     }
@@ -73,7 +72,6 @@
     } failure:^(NSURLSessionDataTask *task, NSError *error) {
         NSLog(@"%@",error);
-        [self setUpUIWithTag:1000 Height:0];
     }];
@@ -90,7 +88,6 @@
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
     [manager POST:tuwen(docId.intValue) parameters:nil headers:nil  progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
           [AlertViewTool hideHUDView];
-        [self setUpUIWithTag:1000 Height:40.0];
           // 请求成功，解析数据
           NSString * jsonString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
           NSArray *arr = [jsonString objectFromJSONString];
@@ -142,12 +139,6 @@
     backgroundView.bounces = NO;
     [self.view addSubview:backgroundView];
-   
-    
-//    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"]];
-//    NSString* htmlFooter = [[NSString alloc] initWithFormat:@"<div class=\"logo\" style=\"text-indent:2em\">%@</div></body></html>",[_dictionary objectForKey:@"Description"]];
-//    NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@",htmlHeader,htmlFooter];
-//    [relatedWebView loadHTMLString:strHtml baseURL:nil];
     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);";
@@ -190,19 +181,6 @@
         self.liveController = nil;
 }
 #pragma mark - UI
-//- (void)setNaviation{
-//    self.navigationController.navigationBar.translucent = NO;
-//    [self.navigationController.navigationBar setBarTintColor:HEXCOLOR(0x195ac9)];
-//    [self.navigationController.navigationBar setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIFont systemFontOfSize:20],NSFontAttributeName,[UIColor whiteColor],NSForegroundColorAttributeName,nil]];
-//    self.navigationController.title = @"发布会直播";
-//    UIButton *leftButton = [UIButton buttonWithType:UIButtonTypeCustom];
-//    [leftButton addTarget:self action:@selector(Pop:) forControlEvents:UIControlEventTouchUpInside];
-//    [leftButton setImage:[UIImage imageNamed:@"cnlive_white_back"] forState:UIControlStateNormal];
-//    [leftButton setFrame:CGRectMake(0, 0, 44, 44)];
-//    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:leftButton];
-//    self.navigationItem.hidesBackButton = YES;
-//    self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
-//}
 - (void)loadMovieView {
     [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"GraphicLive_DidLockScreen"];
     imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight)];
@@ -332,8 +310,9 @@
         relatedWebView.frame = frame;
         [webView evaluateJavaScript:@"document.body.scrollHeight"completionHandler:^(id _Nullable result,NSError * _Nullable error){
             NSLog(@"scrollHeight高度：%.2f",[result floatValue]);
-            descriptionHeight = [result floatValue];
-            [relatedWebView setFrame:CGRectMake(0, 0, MainScreenWidth, descriptionHeight)];
+            self->descriptionHeight = [result floatValue];
+            [self->relatedWebView setFrame:CGRectMake(0, 0, MainScreenWidth, self->descriptionHeight)];
+            [self setUpUIWithTag:1000 Height:40.0];
         }];
     }
     if (webView.tag==2000) {
@@ -41,7 +41,7 @@ target &#39;CNLiveScioLive&#39; do
     pod 'mob_sharesdk/ShareSDKPlatforms/SinaWeibo'
     pod 'mob_sharesdk/ShareSDKPlatforms/WeChat'
-    pod 'QQ_XGPush'
+    pod 'TPNS-iOS'
     #####zx改
     pod 'CNLiveSDK/CNLiveStat'
     pod 'CNLiveSDK/CNLiveUserSystemSDK'