banner H5跳转 支持分享H5分享功能

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -5800,7 +5800,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5826,7 +5826,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.9;
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -5942,7 +5942,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5968,7 +5968,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.9;
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -6147,7 +6147,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6173,7 +6173,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.9;
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -6194,7 +6194,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6220,7 +6220,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.9;
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

galaxy/galaxy/Classes/Modules/Home(首页)/M/YHBannerModel.swift

@@ -24,7 +24,7 @@ class YHBannerModel: SmartCodable {
     
     //分享相关参数
     var is_share_h5_flag : Bool = false
-    var addtition_param: YHBannerAdditionModel?
+    var addtition_param : YHBannerAdditionModel?
     
     required init() {
     }
@@ -41,9 +41,9 @@ class YHBannerModel: SmartCodable {
 
 
 class YHBannerAdditionModel : SmartCodable {
-    var shareH5Title : String = ""
-    var shareH5Describe : String = ""
-    var shareH5Url:String = ""
+    var ShareH5Title : String = ""
+    var ShareH5Describe : String = ""
+    var ShareH5Url:String = ""
     
     required init() {
     }

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift

@@ -154,11 +154,11 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
                 
                 if model.is_share_h5_flag {
                     if let tModel = model.addtition_param {
-                        if !tModel.shareH5Url.isEmpty {
+                        if !tModel.ShareH5Url.isEmpty {
                             vc.isShowRightShareItemFlag = true
-                            vc.shareH5Title = tModel.shareH5Title
-                            vc.shareH5Describe = tModel.shareH5Describe
-                            vc.shareUrlFromOutside = tModel.shareH5Title
+                            vc.shareH5Title = tModel.ShareH5Title
+                            vc.shareH5Describe = tModel.ShareH5Describe
+                            vc.shareUrlFromOutside = tModel.ShareH5Url
                         }
                     }
                 }

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift

@@ -185,7 +185,7 @@ extension YHHomePageViewModel {
     // type: 0 APP首页 1 香港身份 2香港生活
     func getHomeBanner(_ type: Int, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         let params: [String : Any] = ["type": type]
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.banner
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.bannerApi
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
             guard let self = self else { return }
             //1. json字符串 转 对象

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceBannerView.swift

@@ -123,16 +123,32 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
         if model.skip_url.isEmpty == false {
             switch model.skip_type {
             case 1: //跳转H5
+                var url = ""
+                if YHLoginManager.shared.isLogin() {
                     let token = YHLoginManager.shared.h5Token
-                var url = model.skip_url + "?param=" + token
+                    url = model.skip_url + "?param=" + token
                     let urlHasParam = String.hasQueryParameters(urlString: model.skip_url)
                     if urlHasParam {
                         url = model.skip_url + "&param=" + token
                     }
-                printLog("url: \(url)")
+                } else {
+                    url = model.skip_url
+                }
+                
                 let vc = YHH5WebViewVC()
                 vc.url = url
                 vc.isFullScreenFlag = false
+                
+                if model.is_share_h5_flag {
+                    if let tModel = model.addtition_param {
+                        if !tModel.ShareH5Url.isEmpty {
+                            vc.isShowRightShareItemFlag = true
+                            vc.shareH5Title = tModel.ShareH5Title
+                            vc.shareH5Describe = tModel.ShareH5Describe
+                            vc.shareUrlFromOutside = tModel.ShareH5Url
+                        }
+                    }
+                }
                 self.parentViewController?.navigationController?.pushViewController(vc)
             case 2: //跳转APP内Tab
                 goAppTab(tabBarName:model.skip_url)

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift

@@ -251,7 +251,7 @@ private extension YHH5WebViewVC {
             if !shareUrl.isEmpty &&
                !self.shareH5Title.isEmpty &&
                 !self.shareH5Describe.isEmpty {
-                YHShareManager.shared.sendLinkContent(self.shareH5Title, self.shareH5Describe, UIImage(named: "AppIcon") ?? UIImage(), link: shareUrl)
+                YHShareManager.shared.sendLinkContent(self.shareH5Title, self.shareH5Describe, UIImage(named: "shareIcon") ?? UIImage(), link: shareUrl)
             }
         }
     }

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -93,7 +93,7 @@ class YHAllApiName {
         //获取首页展示的资讯
         static let consultApi = "infoflow/home/consult"
         //获取首页展示的banner
-        static let banner = "infoflow/banner/list"
+        static let bannerApi = "infoflow/banner/list"
         //获取栏目
         static let classify = "infoflow/classify/list"
         //获取资讯

galaxy/galaxy/Res/Assets.xcassets/Other/Contents.json

+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/Other/shareIcon.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "shareIcon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "shareIcon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}