Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/ScioLive into App-Store配置

张旭
2 parents 79e5a2cd 7fbda668
Showing 17 changed files with 87 additions and 1029 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/AppDelegate.m
CNLiveScioLive/Pages/Home/新闻详情/Controller/ArticleDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/Controller/VideoDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/SCIOSpecialViewController.m
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
CNLiveScioLive/Pages/Live/Controller/TopNoticeViewController.m
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
CNLiveScioLive/Pages/Newsound/OldController/VoiceViewController.m
CNLiveScioLive/Pages/Tools/ShareTool/TemplateShareButton.h
CNLiveScioLive/Pages/Tools/ShareTool/TemplateShareButton.m
CNLiveScioLive/Pages/Tools/ShareTool/TemplateShareManager.h
CNLiveScioLive/Pages/Tools/ShareTool/TemplateShareManager.m
CNLiveScioLive/Pages/Tools/ShareTool/XWShareView.h
CNLiveScioLive/Pages/Tools/ShareTool/XWShareView.m
@@ -7,15 +7,9 @@
 	objects = {
 /* Begin PBXBuildFile section */
-		080AB4C1217AD47D008BA78F /* TemplateShareButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 080AB4C0217AD47D008BA78F /* TemplateShareButton.m */; };
-		080AB4C2217AD47D008BA78F /* TemplateShareButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 080AB4C0217AD47D008BA78F /* TemplateShareButton.m */; };
-		080AB4C3217AD47D008BA78F /* TemplateShareButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 080AB4C0217AD47D008BA78F /* TemplateShareButton.m */; };
 		080AB4C6217AD4F4008BA78F /* TemplateShareManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 080AB4C5217AD4F4008BA78F /* TemplateShareManager.m */; };
 		080AB4C7217AD4F4008BA78F /* TemplateShareManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 080AB4C5217AD4F4008BA78F /* TemplateShareManager.m */; };
 		080AB4C8217AD4F4008BA78F /* TemplateShareManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 080AB4C5217AD4F4008BA78F /* TemplateShareManager.m */; };
-		080AB4CB217AD51A008BA78F /* XWShareView.m in Sources */ = {isa = PBXBuildFile; fileRef = 080AB4CA217AD51A008BA78F /* XWShareView.m */; };
-		080AB4CC217AD51A008BA78F /* XWShareView.m in Sources */ = {isa = PBXBuildFile; fileRef = 080AB4CA217AD51A008BA78F /* XWShareView.m */; };
-		080AB4CD217AD51A008BA78F /* XWShareView.m in Sources */ = {isa = PBXBuildFile; fileRef = 080AB4CA217AD51A008BA78F /* XWShareView.m */; };
 		083847E1215C5DDD00186618 /* VPImageCropperViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 083847E0215C5DDD00186618 /* VPImageCropperViewController.m */; };
 		083847E2215C5DDD00186618 /* VPImageCropperViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 083847E0215C5DDD00186618 /* VPImageCropperViewController.m */; };
 		083847E3215C5DDD00186618 /* VPImageCropperViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 083847E0215C5DDD00186618 /* VPImageCropperViewController.m */; };
@@ -782,12 +776,8 @@
 /* End PBXCopyFilesBuildPhase section */
 /* Begin PBXFileReference section */
-		080AB4BF217AD47D008BA78F /* TemplateShareButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TemplateShareButton.h; sourceTree = "<group>"; };
-		080AB4C0217AD47D008BA78F /* TemplateShareButton.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TemplateShareButton.m; sourceTree = "<group>"; };
 		080AB4C4217AD4F4008BA78F /* TemplateShareManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TemplateShareManager.h; sourceTree = "<group>"; };
 		080AB4C5217AD4F4008BA78F /* TemplateShareManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TemplateShareManager.m; sourceTree = "<group>"; };
-		080AB4C9217AD51A008BA78F /* XWShareView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XWShareView.h; sourceTree = "<group>"; };
-		080AB4CA217AD51A008BA78F /* XWShareView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XWShareView.m; sourceTree = "<group>"; };
 		083847DF215C5DDD00186618 /* VPImageCropperViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VPImageCropperViewController.h; sourceTree = "<group>"; };
 		083847E0215C5DDD00186618 /* VPImageCropperViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VPImageCropperViewController.m; sourceTree = "<group>"; };
 		0838483C215C838B00186618 /* CNLiveENTabBarController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveENTabBarController.h; sourceTree = "<group>"; };
@@ -1320,12 +1310,8 @@
 		080AB4BE217AD457008BA78F /* ShareTool */ = {
 			isa = PBXGroup;
 			children = (
-				080AB4BF217AD47D008BA78F /* TemplateShareButton.h */,
-				080AB4C0217AD47D008BA78F /* TemplateShareButton.m */,
 				080AB4C4217AD4F4008BA78F /* TemplateShareManager.h */,
 				080AB4C5217AD4F4008BA78F /* TemplateShareManager.m */,
-				080AB4C9217AD51A008BA78F /* XWShareView.h */,
-				080AB4CA217AD51A008BA78F /* XWShareView.m */,
 			);
 			path = ShareTool;
 			sourceTree = "<group>";
@@ -3065,7 +3051,6 @@
 				08C08FE3214FA01B00E23D16 /* CNLiveViewController.m in Sources */,
 				0838483E215C838B00186618 /* CNLiveENTabBarController.m in Sources */,
 				085D86C7215A20A50037D480 /* CNLiveUserSettingViewController.m in Sources */,
-				080AB4CB217AD51A008BA78F /* XWShareView.m in Sources */,
 				084ACE0F21547F9F0089E035 /* DBAction.m in Sources */,
 				08C0909C2150DCAC00E23D16 /* XWHTTPTool.m in Sources */,
 				08585D59215B4C7200FC2CA2 /* PGDatePickManager.m in Sources */,
@@ -3151,7 +3136,6 @@
 				08585DDA215B70DA00FC2CA2 /* JSONKit.m in Sources */,
 				084ACE1D2154895E0089E035 /* GCPlaceholderTextView.m in Sources */,
 				08940D882154F6FD00F85DB6 /* CNLiveNewsDetailModel.m in Sources */,
-				080AB4C1217AD47D008BA78F /* TemplateShareButton.m in Sources */,
 				084ACE0221547B4D0089E035 /* CNLiveMyCollectionViewController.m in Sources */,
 				084ACE1221547F9F0089E035 /* NoticeData.m in Sources */,
 				08C08F81214F997F00E23D16 /* main.m in Sources */,
@@ -3283,7 +3267,6 @@
 				08FB876A215DD1C200DA5423 /* VoiceViewController.m in Sources */,
 				08585D48215B4C7200FC2CA2 /* UIColor+PGHex.m in Sources */,
 				08C08F8B214F998000E23D16 /* CNLiveScioLiveTests.m in Sources */,
-				080AB4C2217AD47D008BA78F /* TemplateShareButton.m in Sources */,
 				08C090772150C79C00E23D16 /* ZXWSegment.m in Sources */,
 				085D869C2159CBBB0037D480 /* CNLivePlayerController.m in Sources */,
 				08585CE6215B302C00FC2CA2 /* CNLiveSearchViewController.m in Sources */,
@@ -3306,7 +3289,6 @@
 				08C0909D2150DCAC00E23D16 /* XWHTTPTool.m in Sources */,
 				C3E502DB2152432700DA4320 /* CNHomeRightTableViewCell.m in Sources */,
 				08585D6F215B4C7200FC2CA2 /* PGPickerView.m in Sources */,
-				080AB4CC217AD51A008BA78F /* XWShareView.m in Sources */,
 				08C090472150BC6500E23D16 /* CNMyTableViewHeaderView.m in Sources */,
 				08B5C56A215334CC00F5476E /* CNLiveSettingViewController.m in Sources */,
 				08C090B621510E4B00E23D16 /* CNLiveTableViewCell.m in Sources */,
@@ -3441,7 +3423,6 @@
 				08FB876B215DD1C200DA5423 /* VoiceViewController.m in Sources */,
 				08585D49215B4C7200FC2CA2 /* UIColor+PGHex.m in Sources */,
 				08C08F96214F998000E23D16 /* CNLiveScioLiveUITests.m in Sources */,
-				080AB4C3217AD47D008BA78F /* TemplateShareButton.m in Sources */,
 				08C090782150C79C00E23D16 /* ZXWSegment.m in Sources */,
 				085D869D2159CBBB0037D480 /* CNLivePlayerController.m in Sources */,
 				08585CE7215B302C00FC2CA2 /* CNLiveSearchViewController.m in Sources */,
@@ -3464,7 +3445,6 @@
 				08C0909E2150DCAC00E23D16 /* XWHTTPTool.m in Sources */,
 				C3E502DC2152432700DA4320 /* CNHomeRightTableViewCell.m in Sources */,
 				08585D70215B4C7200FC2CA2 /* PGPickerView.m in Sources */,
-				080AB4CD217AD51A008BA78F /* XWShareView.m in Sources */,
 				08C090482150BC6500E23D16 /* CNMyTableViewHeaderView.m in Sources */,
 				08B5C56B215334CC00F5476E /* CNLiveSettingViewController.m in Sources */,
 				08C090B721510E4B00E23D16 /* CNLiveTableViewCell.m in Sources */,
@@ -46,7 +46,7 @@
     [MobClick startWithAppkey:uMengKey reportPolicy:BATCH channelId:nil];
     [MobClick setLogEnabled:NO];
-    [[TemplateShareManager shareSingleton] shareConfig];
+    [[TemplateShareManager manager] shareConfig];
     //语言
     [self setApplicationLanguage];
@@ -239,52 +239,8 @@
                 break;
             case 1002://分享
             {
-                NSArray* imageArray = weakSelf.model.img?@[weakSelf.model.img]:@[[UIImage imageNamed:@"cnlive_zhouxin_icon"]];
-                if (imageArray) {
-                    NSString *text = [NSString stringWithFormat:@"%@",weakSelf.model.subTitle];
-                    if ([text isEqualToString:@"<null>"]) {
-                        text = weakSelf.model.title;
-                    }
-                    NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
-                    [shareParams SSDKSetupShareParamsByText:text images:imageArray url:[NSURL URLWithString:weakSelf.model.pageUrl] title:weakSelf.model.title type:SSDKContentTypeWebPage];
-                    NSArray *items = @[
-                                       @(SSDKPlatformTypeQQ),
-                                       @(SSDKPlatformSubTypeWechatTimeline),
-                                       @(SSDKPlatformSubTypeWechatSession),
-                                       @(SSDKPlatformTypeSinaWeibo)
-                                       ];
-                    [ShareSDK showShareActionSheet:nil items:items shareParams:shareParams onShareStateChanged:^(SSDKResponseState state, SSDKPlatformType platformType, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error, BOOL end) {
-                        NSLog(@"%lu",(unsigned long)state);
-                        switch (state) {
-                            case SSDKResponseStateSuccess:
-                            {
-                                UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareSuccess") message:nil preferredStyle:UIAlertControllerStyleAlert];
-                                UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                                    NSLog(@"点击了确定，进入确定的事件");
-                                    
-                                }];
-                                [alert addAction:action1];
-                                [weakSelf presentViewController:alert animated:YES completion:nil];
-                                break;
-                            }
-                            case SSDKResponseStateFail:
-                            {
-                                UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareFailure") message:nil preferredStyle:UIAlertControllerStyleAlert];
-                                UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                                    NSLog(@"点击了确定，进入确定的事件");
-                                    
-                                }];
-                                [alert addAction:action1];
-                                [weakSelf presentViewController:alert animated:YES completion:nil];
-                                break;
-                            }
-                            default:
-                                break;
-                        }
-                        
-                    }];
-                    
-                }
+                [[TemplateShareManager manager] shareImage:self.model.img title:self.model.title text:self.model.desc?self.model.desc:self.model.title url:self.model.pageUrl controller:self];
+                return;
             }
                 break;
@@ -242,52 +242,8 @@ static NSString *newsLeftPicTableViewCell = @&quot;CNLiveNewsLeftPicTableViewCell&quot;;
                 break;
             case 1002://分享
             {
-                NSArray* imageArray = weakSelf.model.img?@[weakSelf.model.img]:@[[UIImage imageNamed:@"cnlive_zhouxin_icon"]];
-                if (imageArray) {
-                    NSString *text = [NSString stringWithFormat:@"%@",weakSelf.model.subTitle];
-                    if ([text isEqualToString:@"<null>"]) {
-                        text = weakSelf.model.title;
-                    }
-                    NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
-                    [shareParams SSDKSetupShareParamsByText:text images:imageArray url:[NSURL URLWithString:weakSelf.model.pageUrl] title:weakSelf.model.title type:SSDKContentTypeWebPage];
-                    NSArray *items = @[
-                                       @(SSDKPlatformTypeQQ),
-                                       @(SSDKPlatformSubTypeWechatTimeline),
-                                       @(SSDKPlatformSubTypeWechatSession),
-                                       @(SSDKPlatformTypeSinaWeibo)
-                                       ];
-                    [ShareSDK showShareActionSheet:nil items:items shareParams:shareParams onShareStateChanged:^(SSDKResponseState state, SSDKPlatformType platformType, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error, BOOL end) {
-                           NSLog(@"%lu",(unsigned long)state);
-                           switch (state) {
-                               case SSDKResponseStateSuccess:
-                               {
-                                   UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareSuccess") message:nil preferredStyle:UIAlertControllerStyleAlert];
-                                   UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                                       NSLog(@"点击了确定，进入确定的事件");
-                                       
-                                   }];
-                                   [alert addAction:action1];
-                                   [weakSelf presentViewController:alert animated:YES completion:nil];
-                                   break;
-                               }
-                               case SSDKResponseStateFail:
-                               {
-                                   UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareFailure") message:nil preferredStyle:UIAlertControllerStyleAlert];
-                                   UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                                       NSLog(@"点击了确定，进入确定的事件");
-                                       
-                                   }];
-                                   [alert addAction:action1];
-                                   [weakSelf presentViewController:alert animated:YES completion:nil];
-                                   break;
-                               }
-                               default:
-                                   break;
-                           }
-                        
-                    }];
-            
-                }
+                [[TemplateShareManager manager] shareImage:self.model.img title:self.model.title text:self.model.desc?self.model.desc:self.model.title url:self.model.pageUrl controller:self];
+                return;
             }
                 break;
@@ -217,66 +217,13 @@
             }
         }
     } else if (30000 == btn.tag) {
-        __weak typeof(self) weakSelf = self;
         NSString *img = [NSString stringWithFormat:@"%@",_dictionary[@"img"]];
-        NSArray* imageArray = nil;
-        if (0 == [img length]) {
-            imageArray = @[[UIImage imageNamed:@"cnlive_zhouxin_icon"]];
-        } else {
-            imageArray = @[img];
-        }
-        if (imageArray) {
-            NSString *text = [NSString stringWithFormat:@"%@",_dictionary[@"desc"]];
-            if ([text isEqualToString:@"<null>"]||[text isEqualToString:@""]) {
-                text = _dictionary[@"title"];
-            }
-            NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
-            [shareParams SSDKSetupShareParamsByText:text
-                                             images:imageArray
-                                                url:[NSURL URLWithString:_dictionary[@"pageUrl"]]
-                                              title:_dictionary[@"title"]
-                                               type:SSDKContentTypeWebPage];
-            NSArray *items = @[
-                               @(SSDKPlatformTypeQQ),
-                               @(SSDKPlatformSubTypeWechatTimeline),
-                               @(SSDKPlatformSubTypeWechatSession),
-                               @(SSDKPlatformTypeSinaWeibo)
-                               ];
-            [ShareSDK showShareActionSheet:nil
-                                     items:items
-                               shareParams:shareParams
-                       onShareStateChanged:^(SSDKResponseState state, SSDKPlatformType platformType, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error, BOOL end) {
-                           NSLog(@"%lu",(unsigned long)state);
-                           switch (state) {
-                               case SSDKResponseStateSuccess:
-                               {
-                                   UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareSuccess") message:nil preferredStyle:UIAlertControllerStyleAlert];
-                                   UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                                       NSLog(@"点击了确定，进入确定的事件");
-                                       
-                                   }];
-                                   [alert addAction:action1];
-                                   [weakSelf presentViewController:alert animated:YES completion:nil];
-                                   break;
-                               }
-                               case SSDKResponseStateFail:
-                               {
-                                   UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareFailure") message:nil preferredStyle:UIAlertControllerStyleAlert];
-                                   UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                                       NSLog(@"点击了确定，进入确定的事件");
-                                       
-                                   }];
-                                   [alert addAction:action1];
-                                   [weakSelf presentViewController:alert animated:YES completion:nil];
-                                   break;
-                               }
-                               default:
-                                   break;
-                           }
-                       }
-             ];}
-        
+        NSString *title = [NSString stringWithFormat:@"%@",_dictionary[@"title"]];
+        NSString *text = [NSString stringWithFormat:@"%@",!_dictionary[@"desc"]||[_dictionary[@"desc"] isEqualToString:@""]?title:_dictionary[@"desc"]];
+        NSString *url = [NSString stringWithFormat:@"%@",_dictionary[@"pageUrl"]];
+        [[TemplateShareManager manager] shareImage:img title:title text:text url:url controller:self];
         return;
+        
     }
 }
 - (void)viewDidLoad {
@@ -159,63 +159,13 @@
             }
         }
     } else if (30000 == btn.tag) {
-        __weak typeof(self) weakSelf = self;
         NSString *img = [NSString stringWithFormat:@"%@",_dictionary[@"img"]];
-        NSArray* imageArray = nil;
-        if (0 == [img length]) {
-            imageArray = @[[UIImage imageNamed:@"cnlive_zhouxin_icon"]];
-        } else {
-            imageArray = @[img];
-        }
-        if (imageArray) {
-            NSString *text = [NSString stringWithFormat:@"%@",_dictionary[@"desc"]];
-            if ([text isEqualToString:@"<null>"]||[text isEqualToString:@""]) {
-                text = _dictionary[@"title"];
-            }
-            NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
-            [shareParams SSDKSetupShareParamsByText:text images:imageArray url:[NSURL URLWithString:_dictionary[@"pageUrl"]] title:_dictionary[@"title"] type:SSDKContentTypeWebPage];
-            //2、分享（可以弹出我们的分享菜单和编辑界面）
-            NSArray *items = @[
-                               @(SSDKPlatformTypeQQ),
-                               @(SSDKPlatformSubTypeWechatTimeline),
-                               @(SSDKPlatformSubTypeWechatSession),
-                               @(SSDKPlatformTypeSinaWeibo)
-                               ];
-            [ShareSDK showShareActionSheet:nil items:items shareParams:shareParams onShareStateChanged:^(SSDKResponseState state, SSDKPlatformType platformType, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error, BOOL end) {
-                           
-                   switch (state) {
-                       case SSDKResponseStateSuccess:
-                       {
-                           UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareSuccess") message:nil preferredStyle:UIAlertControllerStyleAlert];
-                           UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                               NSLog(@"点击了确定，进入确定的事件");
-                               
-                           }];
-                           [alert addAction:action1];
-                           [weakSelf presentViewController:alert animated:YES completion:nil];
-                           break;
-                       }
-                       case SSDKResponseStateFail:
-                       {
-                           UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareFailure") message:nil preferredStyle:UIAlertControllerStyleAlert];
-                           UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                               NSLog(@"点击了确定，进入确定的事件");
-                               
-                           }];
-                           [alert addAction:action1];
-                           [weakSelf presentViewController:alert animated:YES completion:nil];
-                           break;
-                       }
-                       default:
-                           break;
-                   }
-                
-            
-            }
-             
-             ];}
-        
+        NSString *title = [NSString stringWithFormat:@"%@",_dictionary[@"title"]];
+        NSString *text = [NSString stringWithFormat:@"%@",!_dictionary[@"desc"]||[_dictionary[@"desc"] isEqualToString:@""]?title:_dictionary[@"desc"]];
+        NSString *url = [NSString stringWithFormat:@"%@",_dictionary[@"pageUrl"]];
+        [[TemplateShareManager manager] shareImage:img title:title text:text url:url controller:self];
         return;
+
     }
 }
 - (void)viewWillAppear:(BOOL)animated {
@@ -122,67 +122,13 @@
             }
         }
     } else if (30000 == btn.tag) {
-        __weak typeof(self) weakSelf = self;
-
         NSString *img = [NSString stringWithFormat:@"%@",_dictionary[@"img"]];
-        NSArray* imageArray = nil;
-        if (0 == [img length]) {
-            imageArray = @[[UIImage imageNamed:@"cnlive_zhouxin_icon"]];
-        } else {
-            imageArray = @[img];
-        }
-        if (imageArray) {
-            NSString *text = [NSString stringWithFormat:@"%@",_dictionary[@"subTitle"]];
-            if ([text isEqualToString:@"<null>"]) {
-                text = _dictionary[@"title"];
-            }
-            NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
-            [shareParams SSDKSetupShareParamsByText:text
-                                             images:imageArray
-                                                url:[NSURL URLWithString:_dictionary[@"pageUrl"]]
-                                              title:_dictionary[@"title"]
-                                               type:SSDKContentTypeWebPage];
-            NSArray *items = @[
-                               @(SSDKPlatformTypeQQ),
-                               @(SSDKPlatformSubTypeWechatTimeline),
-                               @(SSDKPlatformSubTypeWechatSession),
-                               @(SSDKPlatformTypeSinaWeibo)
-                               ];
-            [ShareSDK showShareActionSheet:nil
-                                     items:items
-                               shareParams:shareParams
-                       onShareStateChanged:^(SSDKResponseState state, SSDKPlatformType platformType, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error, BOOL end) {
-                           NSLog(@"%lu",(unsigned long)state);
-                           switch (state) {
-                               case SSDKResponseStateSuccess:
-                               {
-                                   UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareSuccess") message:nil preferredStyle:UIAlertControllerStyleAlert];
-                                   UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                                       NSLog(@"点击了确定，进入确定的事件");
-                                       
-                                   }];
-                                   [alert addAction:action1];
-                                   [weakSelf presentViewController:alert animated:YES completion:nil];
-                                   break;
-                               }
-                               case SSDKResponseStateFail:
-                               {
-                                   UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareFailure") message:nil preferredStyle:UIAlertControllerStyleAlert];
-                                   UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                                       NSLog(@"点击了确定，进入确定的事件");
-                                       
-                                   }];
-                                   [alert addAction:action1];
-                                   [weakSelf presentViewController:alert animated:YES completion:nil];
-                                   break;
-                               }
-                               default:
-                                   break;
-                           }
-                       }
-             ];}
-        
+        NSString *title = [NSString stringWithFormat:@"%@",_dictionary[@"title"]];
+        NSString *text = [NSString stringWithFormat:@"%@",!_dictionary[@"desc"]||[_dictionary[@"desc"] isEqualToString:@""]?title:_dictionary[@"desc"]];
+        NSString *url = [NSString stringWithFormat:@"%@",_dictionary[@"pageUrl"]];
+        [[TemplateShareManager manager] shareImage:img title:title text:text url:url controller:self];
         return;
+        
     }
 }
 - (void)viewDidLoad {
@@ -191,67 +191,11 @@
 }
 - (void)shareButton:(UIButton *)btn{
-    NSString *text = [NSString stringWithFormat:@"%@",_dictionary[@"Description"]];
-    NSString *shareUrl = [NSString stringWithFormat:@"%@",_dictionary[@"shareUrl"]];
-    
     NSString *img = [NSString stringWithFormat:@"%@",_dictionary[@"poster"]];
-    NSArray* imageArray = nil;
-    if (0 == [img length]) {
-        imageArray = @[[UIImage imageNamed:@"cnlive_zhouxin_icon"]];
-    } else {
-        imageArray = @[img];
-    }
-    
-    if ([text isEqualToString:@"<null>"]) {
-        text = _dictionary[@"title"];
-    }
-    if ([shareUrl isEqualToString:@"<null>"]||[shareUrl isEqualToString:@"(null)"]) {
-        shareUrl = @"http://app.scio.gov.cn/gxbShare.html";
-    }
-    
-    NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
-    [shareParams SSDKSetupShareParamsByText:text
-                                     images:imageArray
-                                        url:[NSURL URLWithString:shareUrl]
-                                      title:_dictionary[@"title"]
-                                       type:SSDKContentTypeWebPage];
-    //2、分享（可以弹出我们的分享菜单和编辑界面）
-    //要显示菜单的视图, iPad版中此参数作为弹出菜单的参照视图，只有传这个才可以弹出我们的分享菜单，可以传分享的按钮对象或者自己创建小的view 对象，iPhone可以传nil不会影响
-    NSArray *items = @[
-                  @(SSDKPlatformTypeQQ),
-                  @(SSDKPlatformSubTypeWechatTimeline),
-                  @(SSDKPlatformSubTypeWechatSession),
-                  @(SSDKPlatformTypeSinaWeibo)
-                  ];
-    [ShareSDK showShareActionSheet:nil items:items shareParams:shareParams onShareStateChanged:^(SSDKResponseState state, SSDKPlatformType platformType, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error, BOOL end) {
-                   
-       switch (state) {
-           case SSDKResponseStateSuccess:
-           {
-               UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:CustomStr(@"ShareSuccess")
-                                                                   message:nil
-                                                                  delegate:nil
-                                                         cancelButtonTitle:CustomStr(@"Sure")
-                                                         otherButtonTitles:nil];
-               [alertView show];
-               break;
-           }
-           case SSDKResponseStateFail:
-           {
-               UIAlertView *alert = [[UIAlertView alloc] initWithTitle:CustomStr(@"ShareFailure")
-                                                               message:[NSString stringWithFormat:@"%@",error]
-                                                              delegate:nil
-                                                     cancelButtonTitle:CustomStr(@"Sure")
-                                                     otherButtonTitles:nil, nil];
-               [alert show];
-               break;
-           }
-           default:
-               break;
-      
-       }
-    
-    }];
+    NSString *title = [NSString stringWithFormat:@"%@",_dictionary[@"title"]];
+    NSString *text = [NSString stringWithFormat:@"%@",!_dictionary[@"Description"]||[_dictionary[@"Description"] isEqualToString:@""]?title:_dictionary[@"Description"]];
+    NSString *url = [NSString stringWithFormat:@"%@",_dictionary[@"shareUrl"]];
+    [[TemplateShareManager manager] shareImage:img title:title text:text url:url controller:self];
 }
@@ -217,65 +217,13 @@
             }
         }
     } else if (30000 == btn.tag) {
-        __weak typeof(self) weakSelf = self;
         NSString *img = [NSString stringWithFormat:@"%@",_dictionary[@"programs"][0][@"img"]];
-        NSArray* imageArray = nil;
-        if (!_dictionary[@"programs"][0][@"img"]||[img isEqualToString:@""]) {
-            imageArray = @[[UIImage imageNamed:@"cnlive_zhouxin_icon"]];
-        } else {
-            imageArray = @[img];
-        }
-        if (imageArray) {
-            NSString *text = [NSString stringWithFormat:@"%@",_dictionary[@"programs"][0][@"subTitle"]];
-            if (!_dictionary[@"programs"][0][@"subTitle"]||[text isEqualToString:@""]) {
-                text = _dictionary[@"programs"][0][@"title"];
-            }
-            NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
-            [shareParams SSDKSetupShareParamsByText:text
-                                             images:imageArray
-                                                url:[NSURL URLWithString:_dictionary[@"programs"][0][@"pageUrl"]]
-                                              title:_dictionary[@"programs"][0][@"title"]
-                                               type:SSDKContentTypeWebPage];
-            NSArray *items = @[
-                               @(SSDKPlatformTypeQQ),
-                               @(SSDKPlatformSubTypeWechatTimeline),
-                               @(SSDKPlatformSubTypeWechatSession),
-                               @(SSDKPlatformTypeSinaWeibo)
-                               ];
-            [ShareSDK showShareActionSheet:nil items:items shareParams:shareParams
-                       onShareStateChanged:^(SSDKResponseState state, SSDKPlatformType platformType, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error, BOOL end) {
-                           NSLog(@"%lu",(unsigned long)state);
-                           switch (state) {
-                               case SSDKResponseStateSuccess:
-                               {
-                                   UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareSuccess") message:nil preferredStyle:UIAlertControllerStyleAlert];
-                                   UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                                       NSLog(@"点击了确定，进入确定的事件");
-                                       
-                                   }];
-                                   [alert addAction:action1];
-                                   [weakSelf presentViewController:alert animated:YES completion:nil];
-                                   break;
-                               }
-                               case SSDKResponseStateFail:
-                               {
-                                   UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareFailure") message:nil preferredStyle:UIAlertControllerStyleAlert];
-                                   UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                                       NSLog(@"点击了确定，进入确定的事件");
-                                       
-                                   }];
-                                   [alert addAction:action1];
-                                   [weakSelf presentViewController:alert animated:YES completion:nil];
-                                   break;
-                               }
-                               default:
-                                   break;
-                           }
-                       }
-             ];
-            
-        }
+        NSString *title = [NSString stringWithFormat:@"%@",_dictionary[@"programs"][0][@"title"]];
+        NSString *text = [NSString stringWithFormat:@"%@",!_dictionary[@"programs"][0][@"desc"]||[_dictionary[@"programs"][0][@"desc"] isEqualToString:@""]?title:_dictionary[@"programs"][0][@"desc"]];
+        NSString *url = [NSString stringWithFormat:@"%@",_dictionary[@"programs"][0][@"pageUrl"]];
+        [[TemplateShareManager manager] shareImage:img title:title text:text url:url controller:self];
         return;
+
     }
 }
@@ -14,6 +14,8 @@
 @interface VideoPlayBackViewController ()<CNLivePlayerControllerDelegate> {
     BOOL isPlay;
+    UIButton *_shareButton;
+
 }
 @end
@@ -139,7 +141,7 @@
     [shareButton addTarget:self action:@selector(shareButtonTaped:) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:shareButton];
     [shareButton setTag:30000];
-    
+    _shareButton = shareButton;
 }
 - (void)shareButtonTaped:(id)sender {
     UIButton *btn = (UIButton *)sender;
@@ -168,62 +170,10 @@
         }
     } else if (30000 == btn.tag) {
         NSString *img = [NSString stringWithFormat:@"%@",_dictionary[@"img"]];
-        NSArray* imageArray = nil;
-        if (0 == [img length]) {
-            imageArray = @[[UIImage imageNamed:@"cnlive_zhouxin_icon"]];
-        } else {
-            imageArray = @[img];
-        }
-        if (imageArray) {
-            NSString *text = [NSString stringWithFormat:@"%@",_dictionary[@"desc"]];
-            if ([text isEqualToString:@"<null>"]||[text isEqualToString:@""]) {
-                text = _dictionary[@"title"];
-            }
-            NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
-            [shareParams SSDKSetupShareParamsByText:text
-                                             images:imageArray
-                                                url:[NSURL URLWithString:_dictionary[@"pageUrl"]]
-                                              title:_dictionary[@"title"]
-                                               type:SSDKContentTypeWebPage];
-            //2、分享（可以弹出我们的分享菜单和编辑界面）
-            //要显示菜单的视图, iPad版中此参数作为弹出菜单的参照视图，只有传这个才可以弹出我们的分享菜单，可以传分享的按钮对象或者自己创建小的view 对象，iPhone可以传nil不会影响
-            NSArray *items = @[
-                               @(SSDKPlatformTypeQQ),
-                               @(SSDKPlatformSubTypeWechatTimeline),
-                               @(SSDKPlatformSubTypeWechatSession),
-                               @(SSDKPlatformTypeSinaWeibo)
-                               ];
-            [ShareSDK showShareActionSheet:nil items:items shareParams:shareParams onShareStateChanged:^(SSDKResponseState state, SSDKPlatformType platformType, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error, BOOL end) {
-                           
-                   switch (state) {
-                       case SSDKResponseStateSuccess:
-                       {
-                           UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:CustomStr(@"ShareSuccess")
-                                                                               message:nil
-                                                                              delegate:nil
-                                                                     cancelButtonTitle:CustomStr(@"Sure")
-                                                                     otherButtonTitles:nil];
-                           [alertView show];
-                           break;
-                       }
-                       case SSDKResponseStateFail:
-                       {
-                           UIAlertView *alert = [[UIAlertView alloc] initWithTitle:CustomStr(@"ShareFailure")
-                                                                           message:[NSString stringWithFormat:@"%@",error]
-                                                                          delegate:nil
-                                                                 cancelButtonTitle:CustomStr(@"Sure")
-                                                                 otherButtonTitles:nil, nil];
-                           [alert show];
-                           break;
-                       }
-                       default:
-                           break;
-                   }
-               }
-             
-             ];
-        }
-        
+        NSString *title = [NSString stringWithFormat:@"%@",_dictionary[@"title"]];
+        NSString *text = [NSString stringWithFormat:@"%@",!_dictionary[@"desc"]||[_dictionary[@"desc"] isEqualToString:@""]?title:_dictionary[@"desc"]];
+        NSString *url = [NSString stringWithFormat:@"%@",_dictionary[@"pageUrl"]];
+        [[TemplateShareManager manager] shareImage:img title:title text:text url:url controller:self];
         return;
     }
 }
@@ -542,61 +492,7 @@
 }
 - (void)shareButtonCNLivePlayerController:(CNLivePlayerController *)view{
-    NSString *img = [NSString stringWithFormat:@"%@",_dictionary[@"img"]];
-    NSArray* imageArray = nil;
-    if (0 == [img length]) {
-        imageArray = @[[UIImage imageNamed:@"cnlive_zhouxin_icon"]];
-    } else {
-        imageArray = @[img];
-    }
-    if (imageArray) {
-        NSString *text = [NSString stringWithFormat:@"%@",_dictionary[@"desc"]];
-        if ([text isEqualToString:@"<null>"]||[text isEqualToString:@""]) {
-            text = _dictionary[@"title"];
-        }
-        NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
-        [shareParams SSDKSetupShareParamsByText:text
-                                         images:imageArray
-                                            url:[NSURL URLWithString:_dictionary[@"pageUrl"]]
-                                          title:_dictionary[@"title"]
-                                           type:SSDKContentTypeWebPage];
-        //2、分享（可以弹出我们的分享菜单和编辑界面）
-        //要显示菜单的视图, iPad版中此参数作为弹出菜单的参照视图，只有传这个才可以弹出我们的分享菜单，可以传分享的按钮对象或者自己创建小的view 对象，iPhone可以传nil不会影响
-        NSArray *items = @[
-                           @(SSDKPlatformTypeQQ),
-                           @(SSDKPlatformSubTypeWechatTimeline),
-                           @(SSDKPlatformSubTypeWechatSession),
-                           @(SSDKPlatformTypeSinaWeibo)
-                           ];
-        [ShareSDK showShareActionSheet:nil items:items shareParams:shareParams
-                   onShareStateChanged:^(SSDKResponseState state, SSDKPlatformType platformType, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error, BOOL end) {
-                       
-                       switch (state) {
-                           case SSDKResponseStateSuccess:
-                           {
-                               UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:CustomStr(@"ShareSuccess")
-                                                                                   message:nil
-                                                                                  delegate:nil
-                                                                         cancelButtonTitle:CustomStr(@"Sure")
-                                                                         otherButtonTitles:nil];
-                               [alertView show];
-                               break;
-                           }
-                           case SSDKResponseStateFail:
-                           {
-                               UIAlertView *alert = [[UIAlertView alloc] initWithTitle:CustomStr(@"ShareFailure")
-                                                                               message:[NSString stringWithFormat:@"%@",error]
-                                                                              delegate:nil
-                                                                     cancelButtonTitle:CustomStr(@"Sure")
-                                                                     otherButtonTitles:nil, nil];
-                               [alert show];
-                               break;
-                           }
-                           default:
-                               break;
-                       }
-                   }
-         ];}
+    [self shareButtonTaped:_shareButton];
 }
@@ -1060,66 +1060,12 @@ static const NSInteger margin = 34;
 }
 #pragma mark - Action
 - (void)shareBtnClicked:(id)sender {
-    __weak typeof(self) weakSelf = self;
     NSString *img = [NSString stringWithFormat:@"%@",_dictionary[@"img"]];
-    NSArray* imageArray = nil;
-    if (0 == [img length]) {
-        imageArray = @[[UIImage imageNamed:@"cnlive_zhouxin_icon"]];
-    } else {
-        imageArray = @[img];
-    }
-    if (imageArray) {
-        NSString *text = [NSString stringWithFormat:@"%@",_dictionary[@"subTitle"]];
-        if ([text isEqualToString:@"<null>"]) {
-            text = _dictionary[@"title"];
-        }
-        NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
-        [shareParams SSDKSetupShareParamsByText:text
-                                         images:imageArray
-                                            url:[NSURL URLWithString:_dictionary[@"pageUrl"]]
-                                          title:_dictionary[@"title"]
-                                           type:SSDKContentTypeWebPage];
-        //2、分享（可以弹出我们的分享菜单和编辑界面）
-        NSArray *items = @[
-                           @(SSDKPlatformTypeQQ),
-                           @(SSDKPlatformSubTypeWechatTimeline),
-                           @(SSDKPlatformSubTypeWechatSession),
-                           @(SSDKPlatformTypeSinaWeibo)
-                           ];
-        [ShareSDK showShareActionSheet:nil items:items shareParams:shareParams onShareStateChanged:^(SSDKResponseState state, SSDKPlatformType platformType, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error, BOOL end) {
-            
-            switch (state) {
-                case SSDKResponseStateSuccess:
-                {
-                    UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareSuccess") message:nil preferredStyle:UIAlertControllerStyleAlert];
-                    UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                        NSLog(@"点击了确定，进入确定的事件");
-                        
-                    }];
-                    [alert addAction:action1];
-                    [weakSelf presentViewController:alert animated:YES completion:nil];
-                    break;
-                }
-                case SSDKResponseStateFail:
-                {
-                    UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareFailure") message:nil preferredStyle:UIAlertControllerStyleAlert];
-                    UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                        NSLog(@"点击了确定，进入确定的事件");
-                        
-                    }];
-                    [alert addAction:action1];
-                    [weakSelf presentViewController:alert animated:YES completion:nil];
-                    break;
-                }
-                default:
-                    break;
-            }
-            
-        }];
-        
-    }
+    NSString *title = [NSString stringWithFormat:@"%@",_dictionary[@"title"]];
+    NSString *text = [NSString stringWithFormat:@"%@",!_dictionary[@"desc"]||[_dictionary[@"desc"] isEqualToString:@""]?title:_dictionary[@"desc"]];
+    NSString *url = [NSString stringWithFormat:@"%@",_dictionary[@"pageUrl"]];
+    [[TemplateShareManager manager] shareImage:img title:title text:text url:url controller:self];
-    return;
 }
 - (void)favoriteBtnClicked:(id)sender {
-//
-//  TemplateShareButton.h
-//  CNLiveScioLive
-//
-//  Created by CNLive-zxw on 2018/10/20.
-//  Copyright © 2018年 CNLive. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-typedef NS_ENUM(NSUInteger, TemplateShareButtonType) {
-    TemplateShareButtonTypeWeiBo = 0,//微博
-    TemplateShareButtonTypeWeiXin = 1,//微信好友
-    TemplateShareButtonTypePengYouQuan = 2,//微信朋友圈
-    TemplateShareButtonTypeQQ = 3,//QQ好友
-    TemplateShareButtonTypeQQZone = 4,//QQ空间
-    TemplateShareButtonTypeTXWeiBo = 5,//腾讯微博
-    TemplateShareButtonTypeXLWeiBo = 6,//新浪微博
-    TemplateShareButtonTypeRenRen = 7,//人人网
-    TemplateShareButtonTypeJuBao = 8//举报
-};
-
-@interface TemplateShareButton : UIButton
-
-/**
- *  分享的类型（新浪微博，微信，朋友圈，QQ，QQ空间，腾讯微博，人人，举报）
- */
-@property (nonatomic,assign) TemplateShareButtonType shareButtonType;
-
-/**
- *  各个渠道的title
- */
-@property (nonatomic,strong) NSString *title;
-
-/**
- *  各个渠道的图标
- */
-@property (nonatomic,strong) NSString *image;
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  TemplateShareButton.m
-//  CNLiveScioLive
-//
-//  Created by CNLive-zxw on 2018/10/20.
-//  Copyright © 2018年 CNLive. All rights reserved.
-//
-
-#import "TemplateShareButton.h"
-
-@implementation TemplateShareButton{
-    UILabel *_titleLabel;
-}
-
-- (id)initWithFrame:(CGRect)frame{
-    self = [super initWithFrame:frame];
-    if (self) {
-        self.imageEdgeInsets = UIEdgeInsetsMake(10.0f,10.0f, 10.0f, 10.0f);
-        _titleLabel = [[UILabel alloc]init];
-        _titleLabel.font = [UIFont fontWithName:@"SourceHanSansCN-Regular" size:12.f];
-        _titleLabel.textColor = [ UIColor colorWithRed:255.0 green:255.0 blue:255.0 alpha:1];
-        _titleLabel.textAlignment = NSTextAlignmentCenter;
-        [self addSubview:_titleLabel];
-        
-    }
-    return self;
-}
-
-#pragma mark -- Getter and Setter
-- (void)setTitle:(NSString *)title{
-    _title = title;
-    _titleLabel.text = _title;
-}
-
-- (void)setImage:(NSString *)image{
-    _image = image;
-    [self setImage:[UIImage imageNamed:image] forState:UIControlStateNormal];
-    
-}
-
-- (void)layoutSubviews{
-    [super layoutSubviews];
-    _titleLabel.frame = CGRectMake(0, self.frame.size.width, self.frame.size.width, 12.0f);
-    
-}
-
-@end
@@ -7,13 +7,12 @@
 //
 #import <Foundation/Foundation.h>
-#import "TemplateShareButton.h"
 NS_ASSUME_NONNULL_BEGIN
 @interface TemplateShareManager : NSObject
-+ (instancetype)shareSingleton;
++ (instancetype)manager;
 /**
  *  注册分享以及配置信息
@@ -23,12 +22,13 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  *  设置分享内容
  *
- *  @param type       分享渠道
- *  @param shareText  分享内嵌文字
- *  @param shareImage 分享内嵌图片,可以传入UIImage或者NSData类型
- *  @param shareUrl   分享消息url地址
+ *  @param title  分享内嵌文字
+ *  @param text  分享内嵌文字
+ *  @param image 分享内嵌图片,可以传入UIImage或者NSData类型
+ *  @param url   分享消息url地址
+ *  @param controller   控制器
  */
-- (void)shareType:(TemplateShareButtonType)type shareImage:(id)shareImage shareTitle:(NSString *)shareTitle shareText:(NSString *)shareText shareUrl:(NSString *)shareUrl;
+- (void)shareImage:(NSString *)image title:(NSString *)title text:(NSString *)text url:(NSString *)url controller:(UIViewController *)controller;
 @end
@@ -7,23 +7,21 @@
 //
 #import "TemplateShareManager.h"
-#import "TemplateShareButton.h"
 @implementation TemplateShareManager
+static TemplateShareManager *shareManager = nil;
-static TemplateShareManager *shareManaager = nil;
-+ (TemplateShareManager *)shareSingleton{
++ (TemplateShareManager *)manager{
     @synchronized(self){
-        if (shareManaager == nil) {
-            shareManaager = [[TemplateShareManager alloc] init];
+        if (shareManager == nil) {
+            shareManager = [[TemplateShareManager alloc] init];
         }
     }
-    return shareManaager;
+    return shareManager;
 }
-#pragma mark 注册友盟分享以及配置信息
-- (void)shareConfig
-{
+#pragma mark 注册ShareSDK分享以及配置信息
+- (void)shareConfig {
     [ShareSDK registPlatforms:^(SSDKRegister *platformsRegister) {
         //QQ
         [platformsRegister setupQQWithAppId:@"1105424006" appkey:@"EneqtYjiKSswk05g"];
@@ -36,108 +34,54 @@ static TemplateShareManager *shareManaager = nil;
     }];
-//    [ShareSDK registerApp:@"134f952a9e004" activePlatforms:@[@(SSDKPlatformTypeSinaWeibo),
-//                                                             @(SSDKPlatformSubTypeWechatSession),
-//                                                             @(SSDKPlatformSubTypeWechatTimeline),
-//                                                             @(SSDKPlatformTypeQQ)]
-//                 onImport:^(SSDKPlatformType platformType)
-//     {
-//         switch (platformType)
-//         {
-//             case SSDKPlatformTypeWechat:
-//                 [ShareSDKConnector connectWeChat:[WXApi class]];
-//                 break;
-//             case SSDKPlatformTypeQQ:
-//                 [ShareSDKConnector connectQQ:[QQApiInterface class] tencentOAuthClass:[TencentOAuth class]];
-//                 break;
-//             case SSDKPlatformTypeSinaWeibo:
-//                 [ShareSDKConnector connectWeibo:[WeiboSDK class]];
-//                 break;
-//             default:
-//                 break;
-//         }
-//     }
-//          onConfiguration:^(SSDKPlatformType platformType, NSMutableDictionary *appInfo)
-//     {
-//
-//         switch (platformType)
-//         {
-//             case SSDKPlatformTypeSinaWeibo:
-//                 //设置新浪微博应用信息,其中authType设置为使用SSO＋Web形式授权
-//                 [appInfo SSDKSetupSinaWeiboByAppKey:@"604714517"
-//                                           appSecret:@"542573f3d166742a230634d5c2576157"
-//                                         redirectUri:@"https://api.weibo.com/oauth2/default.html"
-//                                            authType:SSDKAuthTypeBoth];
-//                 break;
-//             case SSDKPlatformTypeWechat:
-//                 [appInfo SSDKSetupWeChatByAppId:@"wx1eb184b8425c2503"
-//                                       appSecret:@"4d250e1ef3b7f5f1bc3579237fd4ee62"];
-//                 break;
-//             case SSDKPlatformTypeQQ:
-//                 [appInfo SSDKSetupQQByAppId:@"1105424006"
-//                                      appKey:@"EneqtYjiKSswk05g"
-//                                    authType:SSDKAuthTypeBoth];
-//                 break;
-//             default:
-//                 break;
-//         }
-//     }];
-    
 }
-- (void)shareType:(TemplateShareButtonType)type shareImage:(id)shareImage shareTitle:(NSString *)shareTitle shareText:(NSString *)shareText shareUrl:(NSString *)shareUrl{
-
-    //1、创建分享参数
-    NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
-    [shareParams SSDKSetupShareParamsByText:shareText images:shareImage url:[NSURL URLWithString:shareUrl] title:shareTitle type:SSDKContentTypeWebPage];
-    
-    //2、分享
-    if (type == TemplateShareButtonTypeWeiXin){
-        //微信
-        [self startSharePlatform:SSDKPlatformTypeWechat parameters:shareParams];
-        
-    }
-    else if (type == TemplateShareButtonTypePengYouQuan) {
-        //朋友圈
-        [self startSharePlatform:SSDKPlatformSubTypeWechatTimeline parameters:shareParams];
+- (void)shareImage:(NSString *)image title:(NSString *)title text:(NSString *)text url:(NSString *)url controller:(UIViewController *)controller {
+    NSArray *imageArray = nil;
+    if (!image||[image isEqualToString:@""]) {
+        imageArray = @[[UIImage imageNamed:@"cnlive_zhouxin_icon"]];
+    } else {
+        imageArray = @[image];
     }
-    else if (type == TemplateShareButtonTypeXLWeiBo){
-        //新浪微博
-        [self startSharePlatform:SSDKPlatformTypeSinaWeibo parameters:shareParams];
-        
-    }
-    else if (type == TemplateShareButtonTypeQQ){
-        //qq
-        [self startSharePlatform:SSDKPlatformTypeQQ parameters:shareParams];
-        
-    }
-    else if (type == TemplateShareButtonTypeQQZone){
-        //qq空间
-        [self startSharePlatform:SSDKPlatformSubTypeQZone parameters:shareParams];
-        
-    }
-    
-}
-- (void)startSharePlatform:(SSDKPlatformType)platform parameters:(NSMutableDictionary *)parameters{
+    NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
+    [shareParams SSDKSetupShareParamsByText:text images:imageArray url:[NSURL URLWithString:url?url:@"http://app.scio.gov.cn/gxbShare.html"] title:title type:SSDKContentTypeWebPage];
+    NSArray *items = @[
+                       @(SSDKPlatformSubTypeWechatSession),
+                       @(SSDKPlatformSubTypeWechatTimeline),
+                       @(SSDKPlatformTypeQQ),
+                       @(SSDKPlatformTypeSinaWeibo)
+                       ];
-    [ShareSDK share:platform parameters:parameters onStateChanged:^(SSDKResponseState state, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error) {
-        
+    [ShareSDK showShareActionSheet:nil customItems:items shareParams:shareParams sheetConfiguration:nil onStateChanged:^(SSDKResponseState state, SSDKPlatformType platformType, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error, BOOL end) {
         switch (state) {
             case SSDKResponseStateSuccess:
             {
-                UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:CustomStr(@"ShareSuccess") message:nil  delegate:nil cancelButtonTitle:CustomStr(@"Sure") otherButtonTitles:nil];
-                [alertView show];
+                UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareSuccess") message:nil preferredStyle:UIAlertControllerStyleAlert];
+                UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+                    NSLog(@"点击了确定，进入确定的事件");
+                    
+                }];
+                [alert addAction:action1];
+                [controller presentViewController:alert animated:YES completion:nil];
                 break;
             }
             case SSDKResponseStateFail:
             {
-                UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:CustomStr(@"ShareFailure") message:[NSString stringWithFormat:@"%@",error] delegate:nil cancelButtonTitle:CustomStr(@"Sure") otherButtonTitles:nil];
-                [alertView show];
+                UIAlertController *alert = [UIAlertController alertControllerWithTitle:CustomStr(@"ShareFailure") message:nil preferredStyle:UIAlertControllerStyleAlert];
+                UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Sure") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+                    NSLog(@"点击了确定，进入确定的事件");
+                    
+                }];
+                [alert addAction:action1];
+                [controller presentViewController:alert animated:YES completion:nil];
                 break;
             }
             default:
                 break;
         }
+        
     }];
+    
 }
+
 @end
-//
-//  XWShareView.h
-//  CNLiveScioLive
-//
-//  Created by CNLive-zxw on 2018/10/20.
-//  Copyright © 2018年 CNLive. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "TemplateShareButton.h"
-
-NS_ASSUME_NONNULL_BEGIN
-@protocol XWShareViewDelegate <NSObject>
-
-@required
-
-- (void)shareBtnClickWithType:(TemplateShareButtonType)type andShareVC:(UIViewController *)shareVC;
-
-@end
-@interface XWShareView : UIView
-
-
-@property (nonatomic,weak) id<XWShareViewDelegate> shareDelegate;
-
-/**
- *  自定义初始化方法
- *
- *  @param frame  frame
- *  @param shareTitle reportButton是否隐藏
- *  @param shareText reportButton是否隐藏
- *  @param shareImg reportButton是否隐藏
- *  @param shareUrl reportButton是否隐藏
- *
- *  @return 返回一个XWShareView对象
- */
-
-
-- (instancetype)initWithFrame:(CGRect)frame ShareImg:(NSString *)shareImg ShareTitle:(NSString *)shareTitle ShareText:(NSString *)shareText ShareUrl:(NSString *)shareUrl;
-
-- (void)show;
-
-- (void)configibutton;
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  XWShareView.m
-//  CNLiveScioLive
-//
-//  Created by CNLive-zxw on 2018/10/20.
-//  Copyright © 2018年 CNLive. All rights reserved.
-//
-
-#import "XWShareView.h"
-#import "TemplateShareManager.h"
-
-
-@interface XWShareView (){
-    UIToolbar              *_toolBar;
-    
-    UIView                     *_contentView;
-    TemplateShareButton        *_weiboButton;
-    TemplateShareButton        *_weixinButton;
-    TemplateShareButton        *_pengyouquanButton;
-    TemplateShareButton        *_qqButton;
-    TemplateShareButton        *_qqZoneButton;
-    TemplateShareButton        *_txweiboButton;
-    TemplateShareButton        *_xlweiboButton;
-    TemplateShareButton        *_renrenButton;
-    TemplateShareButton        *_reportButton;
-    
-    NSString                   *_title;
-    NSString                   *_shareText;
-    NSString                   *_shareImg;
-    NSString                   *_shareUrl;
-    BOOL                        _isShowing;
-    
-}
-
-@end
-
-@implementation XWShareView
-
-- (instancetype)initWithFrame:(CGRect)frame ShareImg:(NSString *)shareImg ShareTitle:(NSString *)shareTitle ShareText:(NSString *)shareText ShareUrl:(NSString *)shareUrl{
-
-    self = [super initWithFrame:frame];
-    if (self) {
-        _isShowing = YES;
-        _title = shareTitle;
-        _shareText = [self getZZwithString:shareText];
-        _shareImg = shareImg;
-        _shareUrl = shareUrl;
-
-    }
-    return self;
-    
-}
-
-- (void)dealloc{
-    NSLog(@"%s DESTROYED-----------",__func__);
-    
-}
-
-- (void)layoutSubviews{
-    [super layoutSubviews];
-    
-}
-
-#pragma mark -- Show Method
-- (void)show{
-    UIWindow *window = [UIApplication sharedApplication].keyWindow;
-    [window addSubview:self];
-    [self mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.equalTo(window);
-    }];
-    
-    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(btnCancel)];
-    [self addGestureRecognizer:tap];
-    [self configibutton];
-    
-}
-#pragma mark -- UI
-- (void)configibutton{
-    
-    self.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.3];
-    
-    _contentView = [[UIView alloc]initWithFrame:CGRectMake(0, MainScreenHeight - 200, MainScreenWidth, 200)];
-    _contentView.backgroundColor = [UIColor whiteColor];
-    [self addSubview:_contentView];
-    
-    UILabel *title = [[UILabel alloc]initWithFrame:CGRectMake(100, 15, MainScreenWidth - 200, 22)];
-    title.textAlignment = NSTextAlignmentCenter;
-    title.text = @"分享到"; //@"分享到";
-    title.font = Font(16);
-    [_contentView addSubview:title];
-    
-    UIButton *close = [[UIButton alloc]initWithFrame:CGRectMake(MainScreenWidth - 44, 0, 44, 44)];
-    [close setImage:[UIImage imageNamed:@"cnlive_icon"] forState:UIControlStateNormal];
-    [close addTarget:self action:@selector(dismiss) forControlEvents:UIControlEventTouchUpInside];
-    [_contentView addSubview:close];
-    
-    CGFloat shareWH = 80, shareMarginS = (MainScreenWidth - 3 * shareWH)/4.0;
-    
-    //朋友圈
-    _pengyouquanButton = [TemplateShareButton buttonWithType:UIButtonTypeCustom];
-    _pengyouquanButton.frame = CGRectMake(shareMarginS, 80, 80, 80);
-    _pengyouquanButton.shareButtonType = TemplateShareButtonTypePengYouQuan;
-    _pengyouquanButton.image = @"朋友圈";//@"朋友圈";
-    [_pengyouquanButton addTarget:self action:@selector(didClickShareButtonAction:) forControlEvents:UIControlEventTouchUpInside];
-    [_contentView addSubview:_pengyouquanButton];
-    
-    //微信
-    _weixinButton = [TemplateShareButton buttonWithType:UIButtonTypeCustom];
-    _weixinButton.frame = CGRectMake(2 * shareMarginS + shareWH, 80, 80, 80);
-    _weixinButton.shareButtonType = TemplateShareButtonTypeWeiXin;
-    _weixinButton.image = @"微信";//@"微信";
-    [_weixinButton addTarget:self action:@selector(didClickShareButtonAction:) forControlEvents:UIControlEventTouchUpInside];
-    [_contentView addSubview:_weixinButton];
-    
-    //新浪微博
-    _xlweiboButton = [TemplateShareButton buttonWithType:UIButtonTypeCustom];
-    _xlweiboButton.frame = CGRectMake(3 * shareMarginS + 2 * shareWH, 80, 80, 80);
-    _xlweiboButton.shareButtonType = TemplateShareButtonTypeXLWeiBo;
-//    _xlweiboButton.image = CustomStr(@"Weibo");//@"新浪微博";
-    _xlweiboButton.image = @"新浪微博";//@"新浪微博";
-    [_xlweiboButton addTarget:self action:@selector(didClickShareButtonAction:) forControlEvents:UIControlEventTouchUpInside];
-    [_contentView addSubview:_xlweiboButton];
-    
-}
-
-//取消分享
-- (void)dismiss{
-    [self removeFromSuperview];
-}
-
-#pragma mark -- Event Response
-//取消分享
-- (void)btnCancel{
-    [self removeFromSuperview];
-    
-}
-- (void)didClickShareButtonAction:(TemplateShareButton *)button{
-    [self dismiss];
-    switch (button.shareButtonType) {
-            
-        case TemplateShareButtonTypePengYouQuan:case TemplateShareButtonTypeWeiXin:
-            if ([WXApi isWXAppInstalled] && [WXApi isWXAppSupportApi]){
-                TemplateShareManager *manger = [TemplateShareManager shareSingleton];
-                [manger shareType:button.shareButtonType shareImage:_shareImg shareTitle:_title shareText:_shareText shareUrl:_shareUrl];
-                
-            }
-            else{
-                //未安装微信
-
-            }
-            
-            break;
-        case TemplateShareButtonTypeXLWeiBo:
-            
-            if ([WeiboSDK isCanShareInWeiboAPP] || [WeiboSDK isCanSSOInWeiboApp]){
-                TemplateShareManager *manger = [TemplateShareManager shareSingleton];
-                [manger shareType:button.shareButtonType shareImage:_shareImg shareTitle:_title shareText:_shareText shareUrl:_shareUrl];
-                
-            }
-            else{
-                //未安装新浪微博
-
-            }
-            break;
-            
-        case TemplateShareButtonTypeQQ:case TemplateShareButtonTypeQQZone:
-            
-            if ([QQApiInterface isQQInstalled]){
-                TemplateShareManager *manger = [TemplateShareManager shareSingleton];
-                [manger shareType:button.shareButtonType shareImage:_shareImg shareTitle:_title shareText:_shareText shareUrl:_shareUrl];
-                
-            }
-            else{
-                //未安装qq
-            }
-            break;
-            
-        default:
-            break;
-    }
-    
-}
-#pragma mark - 去标签Tool
-- (NSString *)getZZwithString:(NSString *)string{
-    
-    if (!string || [string isEqualToString:@""] || [(NSNull *)string isEqual:[NSNull null]]) {
-        return @"";
-    }
-    
-    
-    NSRegularExpression *regularScriptExpretion=[NSRegularExpression regularExpressionWithPattern:@"<script[^>]*?>[\\s\\S]*?<\\/script>"
-                                                                                          options:0
-                                                                                            error:nil];
-    
-    string=[regularScriptExpretion stringByReplacingMatchesInString:string options:NSMatchingReportProgress range:NSMakeRange(0, string.length) withTemplate:@""];
-    
-    
-    
-    NSRegularExpression *regularExpretion=[NSRegularExpression regularExpressionWithPattern:@"<style[^>]*?>[\\s\\S]*?<\\/style>"
-                                                                                    options:0
-                                                                                      error:nil];
-    string=[regularExpretion stringByReplacingMatchesInString:string options:NSMatchingReportProgress range:NSMakeRange(0, string.length) withTemplate:@""];
-    
-    
-    
-    
-    NSRegularExpression *regularHtmlExpretion=[NSRegularExpression regularExpressionWithPattern:@"<[^>]+>"
-                                                                                        options:0
-                                                                                          error:nil];
-    string=[regularHtmlExpretion stringByReplacingMatchesInString:string options:NSMatchingReportProgress range:NSMakeRange(0, string.length) withTemplate:@""];
-    
-    
-    
-    string = [string stringByReplacingOccurrencesOfString:@"&nbsp;" withString:@""];  // 过滤&nbsp等标签
-    
-    return string;
-}
-
-@end