跳转修改提交

yanglingyu
1 parent 9fb0187b
Showing 4 changed files with 11 additions and 27 deletions
CNLiveBBASMModule.podspec
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNShare/CNBBASMShareImpl.m
Example/CNLiveBBASMModule/CNLIVEViewController.m
Example/Podfile.lock
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveBBASMModule'
-  s.version          = '0.0.14'
+  s.version          = '0.0.15'
   s.summary          = 'CNLive-iOS百度小程序接入'
 # This description is used to generate tags and improve search results.
@@ -30,9 +30,9 @@ RegisterBBASMAdapter()
     // 小程序页面链接
     NSString *path = content[@"linkUrl"];
     NSDictionary *appInfo = content[@"appInfo"];
+    NSString *contentPath = [content[@"path"] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-    path = [NSString stringWithFormat:@"%@/smartappLandingpage.html?title=%@&content=%@&imageUrl=%@&swanId=%@&type=smartapp",WjjH5_Host,title,sharecontent,iconUrl,[CNLiveEscpTools  esp:[NSString stringWithFormat:@"%@/%@",appInfo[@"appID"],content[@"path"]]]];
-
+    path = [NSString stringWithFormat:@"%@/smartappLandingpage.html?title=%@&content=%@&imageUrl=%@&swanId=%@&type=smartapp",WjjH5_Host,[title stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]],[sharecontent stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]],[iconUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]],[CNLiveEscpTools  esp:[NSString stringWithFormat:@"%@/%@",appInfo[@"appID"],contentPath]]];
     NSString *mediaType = content[@"mediaType"];
     NSDictionary *params = nil;
@@ -40,7 +40,7 @@ RegisterBBASMAdapter()
         params = @{
             @"title":title,
             @"shareDesc":sharecontent,
-            @"shareUrl":[path stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]],
+            @"shareUrl":path,
             @"shareImage":iconUrl,
             @"shareType":mediaType,
         };
@@ -48,7 +48,7 @@ RegisterBBASMAdapter()
         params = @{
             @"title":title,
             @"shareDesc":sharecontent,
-            @"shareUrl":[path stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]],
+            @"shareUrl":path,
             @"shareImage":iconUrl,
         };
     }
@@ -54,10 +54,10 @@
             break;
         case 2:
         {
-            NSString *urlStr = @"";
+            NSString *urlStr = @"http://wjjh5test.cnlive.com/smartappLandingpage.html?title=%E5%85%B3%E4%BA%8E%E5%8A%A8%E7%89%A9%E7%9A%84%E8%B6%A3%E5%91%B3%E4%BF%9A%E8%AF%AD%E8%A1%A8%E8%BE%BE%EF%BD%9E&content=%E6%B2%AA%E6%B1%9F%E8%8B%B1%E8%AF%AD%E6%8F%90%E4%BE%9B%E8%8B%B1%E8%AF%AD%E5%9B%9B%E5%85%AD%E7%BA%A7%E3%80%81%E5%90%AC%E8%AF%B4%E8%AF%BB%E5%86%99%E3%80%81%E5%BD%B1%E8%A7%86%E5%A8%B1%E4%B9%90%E3%80%81%E5%85%A5%E9%97%A8%E5%AD%A6%E4%B9%A0%E8%B5%84%E8%AE%AF&imageUrl=https://b.bdstatic.com/searchbox/mappconsole/image/20181105/1541398769-33490.png&swanId=lDvbSAZzaa8xPTQ8M0EquG1xos75HGvU%2F%2Fpages%2FaudioDetail%2FaudioDetail%3Fshare%3D1%26contentId%3D1279583%26rowId%3D1%26pubDate%3D2021%2D11%2D10%26assignTag%3D%E5%B0%8F%E8%AF%8D%E5%A4%A7%E7%94%A8&type=smartapp";
             NSURL *url = [NSURL URLWithString:urlStr];
             NSDictionary * paramDic = [self requestURLParameters:url];
-            [CNLiveBBASMModuleService openBBASMModule:[NSString stringWithFormat:@"cnlive://swan/%@",[CNLiveEscpTools unesp:paramDic[@"swanId"]]]];
+            [CNLiveBBASMModuleService openBBASMModule:[NSString stringWithFormat    :@"cnlive://swan/%@",[CNLiveEscpTools unesp:paramDic[@"swanId"]]]];
         }
             break;
         case 3:
@@ -94,21 +94,6 @@
 -(NSDictionary *)requestURLParameters:(NSURL *)urlStr
 {
     NSMutableDictionary *parm = [[NSMutableDictionary alloc]init];
-    
-    //回调遍历所有参数，添加入字典
-    if (@available(iOS 11.0, *)) {
-        //传入url创建url组件类
-        NSURLComponents *urlComponents = [[NSURLComponents alloc] initWithString:urlStr.absoluteString];
-        [urlComponents.percentEncodedQueryItems enumerateObjectsUsingBlock:^(NSURLQueryItem * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-            if (!CNLiveStringIsEmpty(obj.name) && !CNLiveStringIsEmpty(obj.value)) {
-                if ([obj.name isEqualToString:@"//type"]) {
-                    [parm setObject:obj.value forKey:@"type"];
-                }else{
-                    [parm setObject:obj.value forKey:obj.name];
-                }
-            }
-        }];
-    } else {
         // Fallback on earlier versions
         NSString * path = [urlStr.absoluteString componentsSeparatedByString:@"?"].lastObject;
         NSArray * paramArray = [path componentsSeparatedByString:@"&"];
@@ -120,7 +105,6 @@
                 [parm setObject:tempArray.lastObject forKey:tempArray.firstObject];
             }
         }];
-    }
     return parm;
 }
@@ -32,7 +32,7 @@ PODS:
     - YYCache
   - CNLiveBaseKit (0.1.23):
     - CNLiveNewTripartiteManagement/MJExtension
-  - CNLiveBBASMModule (0.0.13):
+  - CNLiveBBASMModule (0.0.14):
     - BBAMNPLib
     - CNLiveBeeHive
     - CNLiveBusinessTools
@@ -44,7 +44,7 @@ PODS:
     - SSDKLightLib
     - WechatOpenSDK
   - CNLiveBeeHive (0.1.9)
-  - CNLiveBusinessTools (0.1.28):
+  - CNLiveBusinessTools (0.1.29):
     - CNLiveBaseKit
     - CNLiveEnvironment
     - CNLiveNewTripartiteManagement/QMUIKit
@@ -548,9 +548,9 @@ SPEC CHECKSUMS:
   AlipaySDK-iOS: 8659cdb4403de7e5f26ad8b699864a9cbe53384c
   BBAMNPLib: 26e7e4a046d98755ef467a9f3fd8f5ff4fa5cef9
   CNLiveBaseKit: 44e5fc573cbca78a86b704cf77c886ef53889807
-  CNLiveBBASMModule: 0c69d6a52b4524b430d21c7e607a76736d07021f
+  CNLiveBBASMModule: 9ab1c4a0fcd4890ec5bdc784c57b8175c7054165
   CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4
-  CNLiveBusinessTools: 5e65e6ca66088a2be577bf9f5f579ff7dcd74787
+  CNLiveBusinessTools: fee9f935c2ef25ceeaa9605e8e0d490057906d0f
   CNLiveCommonCategory: 22c9842b31f2087803ae69e983b2c944fb80eae1
   CNLiveEnvironment: 48ba0f934399fd25fc54dc3239009754bcc1ddb3
   CNLiveNewTripartiteManagement: 29ddb2d23ee77bcd42ba5eaf5f1322ed37db5baa