Merge branch 'ajp/dev' into 'master'

Ajp/dev

See merge request !10

GMShareSDK/Classes/Share/GMDiaryShareView.m

@@ -12,9 +12,6 @@
 #import "GMShareConstant.h"
 #import <MBProgressHUD/MBProgressHUD.h>
 
-#import <GMPhobos/Phobos.h>
-#import <GMPhobos/UIResponder+PhobosPV.h>
-
 #import <GMKit/UIColor+GMTheme.h>
 #import <GMKit/Constant.h>
 #import <GMKit/GMFont.h>
@@ -25,7 +22,7 @@
 #import <GMKit/UIView+SafeArea.h>
 #import <GMKit/GMSafeValue.h>
 #import <GMKit/UIView+Layout.h>
-
+@import GMPhobos;
 
 @interface GMDiaryShareView ()
 @property (nonatomic, strong) GMView *bgView;
@@ -183,13 +180,13 @@
 - (void)phobosClickShareWithType:(GMSharePlatform)type {
     if ([self.delegate isKindOfClass:[UIResponder class]]) {
         UIResponder *phobosView = (UIResponder *)self.delegate;
-        NSDictionary *dic = @{@"page_name": SafeValue(phobosView.pageName),
-                              @"business_id": SafeValue(phobosView.businessId),
-                              @"url": SafeValue(self.shareUrl),
-                              @"share_channel": _getGMShareChannelByType(type),
-                              @"task_type":@"diary",
-                              @"business":@"diary_id"};
-        [Phobos track:@"page_click_share_channel" attributes:dic];
+        
+        NSMutableDictionary *paramsM = [NSMutableDictionary dictionaryWithDictionary:[NSObject trackerPageParam:self]];
+        [paramsM addEntriesFromDictionary:@{@"url":SafeString(self.shareUrl),
+                                            @"share_channel":_getGMShareChannelByType(type),
+                                            @"task_type":@"diary",
+                                            @"business":@"diary_id"}];
+        [Phobos track:@"page_click_share_channel" attributes:paramsM];
     }
 }
 

GMShareSDK/Classes/Share/GMShareView.m

@@ -493,13 +493,14 @@ static NSString *shareCellIdentifier = @"shareCellIdentifier";
             // 配合使用主项目中的“synchronizePVData”可以同步埋点通用参数
             pageName = self.pageName;
         }
-        NSDictionary *dic = @{@"page_name": SafeString(pageName),
-                              @"business_id": SafeString(businessId),
-                              @"url": SafeString(self.shareUrl),
-//                              @"service_item_id": SafeString(phobosView.serviceItemId),
-                              
-        };
-        [Phobos track:@"page_click_share" attributes:dic];
+        NSMutableDictionary *paramsM = [NSMutableDictionary dictionaryWithDictionary:[NSObject trackerPageParam:self]];
+        [paramsM addEntriesFromDictionary:@{@"page_name": SafeString(pageName),
+                                            @"business_id": SafeString(businessId),
+                                            @"url": SafeString(self.shareUrl)}];
+        if ([self.extraParam isNonEmpty]) {
+            [paramsM addEntriesFromDictionary:[NSDictionary dictionaryWithJsonString:self.extraParam]];
+        }
+        [Phobos track:@"page_click_share" attributes:paramsM];
     }
 }
 
@@ -523,16 +524,15 @@ static NSString *shareCellIdentifier = @"shareCellIdentifier";
         }
 
         NSAssert([self.shareUrl isNonEmpty], @"shareView.shareUrl 不应该为空");
-        NSDictionary *dic = @{@"page_name": SafeString(pageName),
-                              @"business_id": SafeString(businessId),
-                              @"url": SafeString(self.shareUrl),
-                              @"share_channel": _getGMShareChannelByType(type),
-                              @"task_type":SafeString(self.taskType),
-                              @"business":@"channel",
-//                              @"service_item_id": SafeString(phobosView.serviceItemId),
-                              
-        };
-        [Phobos track:@"page_click_share_channel" attributes:dic];
+        NSMutableDictionary *paramsM = [NSMutableDictionary dictionaryWithDictionary:[NSObject trackerPageParam:self]];
+        [paramsM addEntriesFromDictionary:@{@"url": SafeString(self.shareUrl),
+                                            @"share_channel": _getGMShareChannelByType(type),
+                                            @"task_type":SafeString(self.taskType),
+                                            @"business":@"channel"}];
+        if ([self.extraParam isNonEmpty]) {
+            [paramsM addEntriesFromDictionary:[NSDictionary dictionaryWithJsonString:self.extraParam]];
+        }
+        [Phobos track:@"page_click_share_channel" attributes:paramsM];
     }
 }
 

GMShareSDK/Classes/ShareSDK/GMShareSDK.m

@@ -234,11 +234,13 @@
 
 - (void)QQFriendShareWithParameters: (NSDictionary *)parameters {
     UIImage * thumbImage  = parameters[ShareImage]?:[UIImage imageNamed:@"icon"];
+    NSURL* url = parameters[ShareUrl];// ShareUrl 传入的不一定是NSURL，有可能是NSString
+    if (![url isKindOfClass:[NSURL class]]) {
+        url = [NSURL URLWithString:url];
+    }
     
-    NSURL* url = parameters[ShareUrl];
     NSString *title = parameters[ShareTitle];
     NSString *description = parameters[ShareText];
-    
     QQApiNewsObject* img = [QQApiNewsObject objectWithURL:url title:title description:description previewImageData:UIImagePNGRepresentation(thumbImage)];
     SendMessageToQQReq* req = [SendMessageToQQReq reqWithContent:img];
     img.shareDestType = ShareDestTypeQQ;
@@ -257,7 +259,10 @@
     } else {
         previewImage = images;
     }
-    NSURL* url = parameters[ShareUrl];
+    NSURL* url = parameters[ShareUrl];// ShareUrl 传入的不一定是NSURL，有可能是NSString
+    if (![url isKindOfClass:[NSURL class]]) {
+        url = [NSURL URLWithString:url];
+    }
     NSString *title = parameters[ShareTitle];
     NSString *description = parameters[ShareText];
     NSData *data = UIImagePNGRepresentation(previewImage);
@@ -421,7 +426,13 @@
 - (void)wechatMiniProgramWithParameters: (NSDictionary *)parameters scene:(int)scene {
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
         WXMiniProgramObject *wxMiniObject = [WXMiniProgramObject object];
-        wxMiniObject.webpageUrl = parameters[ShareUrl];
+        
+        NSString *webpageUrl = parameters[ShareUrl];// ShareUrl 传入的不一定是NSURL，有可能是NSString
+        if ([webpageUrl isKindOfClass:[NSURL class]]) {
+            NSURL *url = (NSURL *)webpageUrl;
+            webpageUrl = url.absoluteString;
+        }
+        wxMiniObject.webpageUrl = webpageUrl;
         wxMiniObject.userName = parameters[ShareUserName];
         wxMiniObject.path = parameters[SharePath];
         // 压缩图片（不大于128K）