Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHLivePlayerViewController.swift

@@ -443,16 +443,14 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
         
         DispatchQueue.global().async {
             if let url = YHShareManager.shared.createMutilShareUrl(type: 1, param: ["LiveID":String(self.liveId)]) {
-                printLog(url) //for test hjl
+                let tmpT = url.base64Encoded ?? ""//对deepLink使用 base64编码
                 var oldUrl = liveModel.live_h5_url
                 if oldUrl.contains("?") {
-                    oldUrl = oldUrl + "&uid=\(YHLoginManager.shared.userModel?.id ?? "0")" + "&fromPlatform=iOS" + "&appDeepLink=\(url)"
+                    oldUrl = oldUrl + "&uid=\(YHLoginManager.shared.userModel?.id ?? "0")" + "&fromPlatform=iOS" + "&appDeepLink=\(tmpT)"
                 } else {
-                    oldUrl = oldUrl + "?uid=\(YHLoginManager.shared.userModel?.id ?? "0")" + "&fromPlatform=iOS" + "&appDeepLink=\(url)"
+                    oldUrl = oldUrl + "?uid=\(YHLoginManager.shared.userModel?.id ?? "0")" + "&fromPlatform=iOS" + "&appDeepLink=\(tmpT)"
                 }
                 
-                printLog(oldUrl)
-                
                 DispatchQueue.main.async {
                     YHShareAlertView.show(image: liveModel.live_image, title: "@" + liveModel.account, subMessage: liveModel.live_title, linkUrl: oldUrl, isLive: true, fromAiSale: true)
                 }

galaxy/galaxy/Classes/Tools/Analytics/YHShareManager.swift

@@ -291,8 +291,8 @@ extension YHShareManager {
         
         let arrKey = param.keys
         for (_,item) in arrKey.enumerated() {
-            if let value = param[item],!value.isEmpty,let value2 = YHURLEncodeHelper.urlEncodedString(value) {
-                linkUrl = linkUrl + "&" + item + "=" + value2
+            if let value = param[item],!value.isEmpty {
+                linkUrl = linkUrl + "&" + item + "=" + value
             }
             
         }
@@ -300,7 +300,7 @@ extension YHShareManager {
         
         components.deepLink = linkUrl
         components.iosBundleId = Bundle.main.bundleIdentifier
-        components.androidDeepLink = linkUrl//安卓平台调用不过 所以需要单独写出来
+        components.androidDeepLink = linkUrl //安卓平台调用不过 所以需要单独写出来
         components.androidPackageName = "com.galaxy.galaxyandroid"
         
         let url = components.buildLongLink()