iOS Team / CNLiveMateCode · Commits

Commit 5619c3545a0993adbeee93512a7c5570810190d0

Authored by “张旭”
1 parent 577595cd

no message

Inline Side-by-side
Showing 4 changed files with 2 additions and 240 deletions
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebView.swift
  View file @5619c35
... ... @@ -179,9 +179,7 @@ class CNWebView:UIView,WKNavigationDelegate{
179 179 // 页面加载完成之后调用
180 180 func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
181 181 print("didFinish")
182   -// if (self.webControllerUpdateNavBlock?(true, "", false, "") != nil){
183 182 self.webControllerUpdateNavBlock?(true, webView.title!, false , "")
184   -// }
185 183 }
186 184 // 页面加载失败时调用
187 185 func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
... ... @@ -198,8 +196,6 @@ class CNWebView:UIView,WKNavigationDelegate{
198 196  
199 197 //允许跳转
200 198 decisionHandler(.allow)
201   - //不允许跳转
202   - // decisionHandler(.cancel)
203 199 }
204 200 // 在发送请求之前，决定是否跳转 -> 默认允许
205 201 func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
... ... @@ -208,16 +204,8 @@ class CNWebView:UIView,WKNavigationDelegate{
208 204 var urlStr = (navigationAction.request.url?.absoluteString)!
209 205  
210 206 if navigationAction.request.url?.host == WjjH5 {
211   -// if (self.webControllerUpdateNavBlock?(false, "", true, "") != nil){
212 207 self.webControllerUpdateNavBlock?(false, "", true , urlStr)
213   -// }
214   -// if urlStr.contains("&isWjjReport=true") || urlStr.contains("?isWjjReport=true"){
215   -// self.rightNavBtns = [self.moreNavBtn]
216   -// self.moreNavBtn.isHidden = false
217   -// }else{
218   -// self.moreNavBtn.isHidden = true
219   -// }
220   -
  208 +
221 209 urlStr = self.checkURLWithStr(urlStr: urlStr)
222 210 self.currentUrl = urlStr
223 211 }
... ...
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebViewController.swift
  View file @5619c35
... ... @@ -32,7 +32,6 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
32 32 configuration.preferences = preferences
33 33 configuration.userContentController = WKUserContentController()
34 34 let webView = CNWebView(frame: CGRectMake(0, 0, Width, Height), configuration: configuration, url: _url)
35   -// let webView = WKWebView(frame: CGRectMake(0, 0, Width, Height), configuration: configuration)
36 35 webView.cnWebView.scrollView.showsVerticalScrollIndicator = false
37 36 webView.cnWebView.scrollView.showsHorizontalScrollIndicator = false
38 37 webView.isCNWebController = true
... ... @@ -79,83 +78,13 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
79 78 make.top.equalTo(get_system_nav_height())
80 79 make.left.right.bottom.equalToSuperview()
81 80 }
82   -// webView.cnWebView.evaluateJavaScript("navigator.userAgent") { [self] result, error in
83   -// let userAgent = result as! String
84   -// if error == nil && userAgent.count > 0 {
85   -// if !userAgent.contains(CNLiveMCEnvironmentManager.shared.base_web_UA) {
86   -// let newUserAgent = userAgent + CNLiveMCEnvironmentManager.shared.base_web_UA
87   -// webView.cnWebView.customUserAgent = newUserAgent
88   -//
89   -// if (_url != nil){
90   -// let urlStr = self.checkURLWithStr(urlStr: _url!.absoluteString)
91   -// self.currentUrl = urlStr
92   -//
93   -// webView.cnWebView.load(URLRequest.init(url:URL(string: urlStr)!))
94   -// }
95   -// self.configBridge()
96   -// self.configBridgeRegister()
97   -// }
98   -// }
99   -// }
100 81 }
101 82  
102   -// func configBridge(){
103   -// WKWebViewJavascriptBridge.enableLogging()
104   -// self.bridge = WKWebViewJavascriptBridge(for: self.webView.cnWebView)
105   -// self.bridge?.setWebViewDelegate(self)
106   -// }
107   -//
108   -// func configBridgeRegister() -> Void {
109   -// //h5拉起原生分享 js call oc
110   -// self.bridge?.registerHandler("wjjylzgVideoShare", handler: { data, responseCallback in
111   -//// print("js call oc\(data)")
112   -// let dic = data as! Dictionary<String, String>
113   -// CNLiveShareManager.showShareViewWithParam(forShareTitle: dic["title"], shareUrl: dic["shareUrl"], shareDesc: dic["subTitle"], shareImage: dic["cover"], screenFull: false, hiddenWjj: true, hiddenQQ: false, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: true, formVC: self, topImage: [], topTitles: [], platformType: .all) { title in
114   -//
115   -// } completerBlock: { resultType, platformType, typeString in
116   -// if resultType == .succ{
117   -//
118   -// }
119   -// }
120   -//
121   -// })
122   -//
123   -// // 网页内容图片预览
124   -// self.bridge?.registerHandler("wjjPreviewImage", handler: { data, responseCallback in
125   -// // print("js call oc\(data)")
126   -// var images = [SKPhoto]()
127   -// let dic = data as! Dictionary<String, Any>
128   -// let index = (dic["index"] as! NSString).integerValue
129   -// let imageArray = dic["imgArr"] as! NSArray
130   -// var imgArray = NSMutableArray()
131   -// for dict in imageArray {
132   -// var imgUrl = ""
133   -// if let dictemp = dict as? String{
134   -// imgArray.add(dictemp)
135   -// imgUrl = dictemp
136   -// }else if let dictemp = dict as? Dictionary<String, Any>{
137   -// imgArray.add(dictemp["src"] ?? "")
138   -// imgUrl = dictemp["src"] as! String
139   -// }
140   -// let photo = SKPhoto.photoWithImageURL(imgUrl)
141   -// photo.shouldCachePhotoURLImage = false
142   -// photo.photoURL = imgUrl
143   -// images.append(photo)
144   -// }
145   -// let browser = SKPhotoBrowser(photos: images)
146   -// browser.initializePageIndex(index)
147   -// currentViewController()?.present(browser, animated: true)
148   -//
149   -// })
150   -// }
151   -
152 83 //点击...分享获取h5参数oc call js
153 84 func configBridgeCallHander() -> Void {
154 85 self.webView.bridge?.callHandler("wjjClientGetShareParaFromJS", data: ["":""], responseCallback: { data in
155 86 // print("js call oc\(data)")
156 87 let dic = data as! Dictionary<String, String>
157   -// let shareType = dic["shareType"]
158   -// let contentIdStr = dic["activityId"]
159 88 let title = dic["title"]
160 89 let desc = dic["desc"]
161 90 let shareImg = dic["shareImg"]
... ... @@ -181,62 +110,7 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
181 110 })
182 111 }
183 112  
184   -// func checkURLWithStr(urlStr:String) -> String{
185   -// if URL(string: urlStr)?.host != WjjH5 {
186   -// return urlStr//不是wjjh5不作处理
187   -// }
188   -// var str = urlStr
189   -// let date = Date()
190   -// let formatter = DateFormatter()
191   -// formatter.dateFormat = "yyyyMMdd"
192   -// let dateStr = formatter.string(from: date)
193   -// let sidStr = String(format: "%@%@", UserInfoManager.shared.userInfo.uid,dateStr)
194   -// let signStr = sidStr.crypt(operation: CCOperation(kCCEncrypt), key: CNLiveMCEnvironmentManager.shared.appKey)
195   -// //看是 appKey还是appKeywjj
196   -// let sidSignStr = (signStr ?? "").isEmpty ? "" : signStr
197   -// let sourceArray = str.components(separatedBy: "?")
198   -// let buildVersion = Bundle.main.infoDictionary!["CFBundleVersion"] as! String
199   -// let appVersion = Bundle.main.infoDictionary!["CFBundleShortVersionString"] as! String
200   -// let uuid = CNLiveBusinessTools.getUidForStat(Date())
201   -// if sourceArray.count == 1{
202   -// //是wjjh5且无参数
203   -// str = String(format: "%@?shareSid=%@&sid=%@&plat=i&ver=%@&version=%@&wjjFrom=apple&wjjUUID=%@&appId=%@&voteId=%@&wjjToken=%@", str,UserInfoManager.shared.userInfo.uid,UserInfoManager.shared.userInfo.uid,buildVersion,appVersion,uuid,CNLiveMCEnvironmentManager.shared.appId,sidSignStr!,UserInfoManager.shared.userInfo.token)
204   -// return str
205   -// }
206   -// //是wjjh5且有参数
207   -// let paraArr = NSMutableArray(array: ["shareSid=","sid=","plat=","ver=","version=","wjjFrom=","wjjUUID=","appId=","voteId=","wjjToken="])
208   -// let valueArr = NSMutableArray(array:[UserInfoManager.shared.userInfo.uid,UserInfoManager.shared.userInfo.uid,"i",buildVersion,appVersion,"apple",uuid,CNLiveMCEnvironmentManager.shared.appId,sidSignStr!,UserInfoManager.shared.userInfo.token])
209   -// var i = 0
210   -// for paraStr in paraArr{
211   -// let tempStr = paraStr as! String
212   -// let paramStr = "&".appending(tempStr)
213   -// let paramStr2 = "?".appending(tempStr)
214   -//
215   -// if str.contains(paramStr){
216   -// //包含则替换 &sid=
217   -// let lastStr = str.components(separatedBy: tempStr).last
218   -// let lastSeparatedStr = (lastStr?.components(separatedBy: "&").first)!
219   -// let oldStr = tempStr.appending(lastSeparatedStr)
220   -// let tempValueStr = tempStr.appending(valueArr[i] as! String)
221   -// str = str.replacingOccurrences(of: oldStr, with: tempValueStr)
222   -// }else if str.contains(paramStr2){
223   -// //包含则替换 &sid=
224   -// let lastStr = str.components(separatedBy: tempStr).last
225   -// let lastSeparatedStr = (lastStr?.components(separatedBy: "&").first)!
226   -// let oldStr = tempStr.appending(lastSeparatedStr)
227   -// let tempValueStr = tempStr.appending(valueArr[i] as! String)
228   -// str = str.replacingOccurrences(of: oldStr, with: tempValueStr)
229   -// }else{
230   -// //不包含则拼接
231   -// str = String(format: "%@&%@%@", str,tempStr,valueArr[i] as! String)
232   -// }
233   -// i = i + 1
234   -// }
235   -// return str
236   -// }
237   -
238   - // MARK: - BtnAction
239   - // 内部链接右上角···分享
  113 + // MARK: - 内部链接右上角···分享
240 114 @objc func moreNavBtnAction(){
241 115 self.configBridgeCallHander()
242 116 }
... ... @@ -247,77 +121,4 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
247 121 super.ClickBackBtn()
248 122 }
249 123 }
250   -
251   - // MARK: - WKWebViewDelegate
252   -// // 页面开始加载时调用
253   -// func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
254   -//// print("didStartProvisionalNavigation")
255   -// }
256   -// // 当内容开始返回时调用
257   -// func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) {
258   -//// print("didCommit")
259   -// }
260   -//
261   -// // 页面加载完成之后调用
262   -// func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
263   -//// print("didFinish")
264   -// titleName = webView.title!
265   -// }
266   -// // 页面加载失败时调用
267   -// func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
268   -//// print("didFailProvisionalNavigation")
269   -// }
270   -// // 接收到服务器跳转请求之后调用
271   -// func webView(_ webView: WKWebView, didReceiveServerRedirectForProvisionalNavigation navigation: WKNavigation!) {
272   -//// print("didReceiveServerRedirectForProvisionalNavigation")
273   -// }
274   -// // 在收到响应后，决定是否跳转 -> 默认允许
275   -// func webView(_ webView: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse, decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) {
276   -//
277   -//// print("decidePolicyFornavigationResponse")
278   -//
279   -// //允许跳转
280   -// decisionHandler(.allow)
281   -// //不允许跳转
282   -// // decisionHandler(.cancel)
283   -// }
284   -// // 在发送请求之前，决定是否跳转 -> 默认允许
285   -// func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
286   -//// print("decidePolicyFornavigationAction")
287   -//
288   -// var urlStr = (navigationAction.request.url?.absoluteString)!
289   -//
290   -// if navigationAction.request.url?.host == WjjH5 {
291   -//
292   -// if urlStr.contains("&isWjjReport=true") || urlStr.contains("?isWjjReport=true"){
293   -// self.rightNavBtns = [self.moreNavBtn]
294   -// self.moreNavBtn.isHidden = false
295   -// }else{
296   -// self.moreNavBtn.isHidden = true
297   -// }
298   -//
299   -// urlStr = self.checkURLWithStr(urlStr: urlStr)
300   -// self.currentUrl = urlStr
301   -// }
302   -//
303   -// if navigationAction.navigationType == .other{
304   -// //跳转Appstore
305   -// let url = URL(string: "https://apps.apple.com/cn/app/%E7%BD%91%E5%AE%B6%E5%AE%B6%E5%95%86%E5%AE%B6%E7%89%88/id1337575497")
306   -// if url == navigationAction.request.url {
307   -// if UIApplication.shared.canOpenURL(url!) { UIApplication.shared.open(url!, options: [:], completionHandler: nil)
308   -// }
309   -// }
310   -// }else if navigationAction.navigationType == .linkActivated{
311   -//
312   -// //以后可判断h5地址 ,可跳转原生页面或网页
313   -// //暂时只跳h5
314   -// let webVC = CNWebViewController()
315   -// webVC.url = URL(string: urlStr)
316   -// navigationViewController().pushViewController(webVC, animated: pushAnimated)
317   -// decisionHandler(.cancel)
318   -// return
319   -//
320   -// }
321   -// decisionHandler(.allow)
322   -// }
323 124 }
... ...
metaCode/Classes/Main/HomePage/View/VerticalViews/CNCustomIndexView.swift
  View file @5619c35
... ... @@ -131,20 +131,6 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
131 131  
132 132 }
133 133  
134   -// private(set) var userInfo: UserInfoModel {
135   -//
136   -// set {
137   -// _userInfo = newValue
138   -// }
139   -//
140   -// get {
141   -// if _userInfo != nil && (_userInfo?.uid.count)! > 0 {
142   -// return _userInfo!
143   -// }
144   -// return UserInfoManager.readUserInfo()
145   -// }
146   -// }
147   -
148 134 // MARK: - 懒加载
149 135  
150 136 ///颜色数据
... ... @@ -269,12 +255,6 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
269 255 self.baseScrollView.setContentOffset(CGPointMake(0, self.frame.size.height), animated: true)
270 256 }
271 257  
272   -// func addCustomGestureRecognizer(){
273   -// let singleTap: UITapGestureRecognizer = UITapGestureRecognizer.init(target: self, action: #selector(singleCellTapAction))
274   -//
275   -// self.addGestureRecognizer(singleTap)
276   -// }
277   -
278 258 // MARK: - 设置前置视图容器
279 259 func isHiddenMainFrontContentView(isHidden:Bool){
280 260 self.mainView.isHiddenMainFrontContentView(isHidden: isHidden)
... ...
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
  View file @5619c35
... ... @@ -943,13 +943,6 @@ class CNMainView : UIView{
943 943  
944 944  
945 945 self.backView.isHidden = true;
946   -
947   -// self.layer.cornerRadius = 20;
948   -// self.layer.shadowOpacity = 1;
949   -// self.layer.shadowColor = UIColor("#eeeeee")?.cgColor
950   -// self.layer.shadowOffset = CGSize(width: 10, height: 10)
951   -// self.layer.shadowRadius = 10;
952   -
953 946 }
954 947  
955 948 // MARK: -设置前置视图容器
... ...