yinmeng/yingmeng-ios-switf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增实名及修复bug

Browse Source
This commit is contained in:
liyuhua
2024-03-28 19:56:25 +08:00
parent f776893134
commit b53b5c8a6a
17 changed files with 281 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yinmeng-ios/Base/Request/YMNetworkHelper.swift
View File

@@ -22,7 +22,7 @@ class YMNetworkHelper: NSObject {
parameters["ispType"] = "1"
parameters["channel"] = APPUtils.currentChannle
parameters["netType"] = "2"
parameters["app"] = "yinmeng"
parameters["app"] = "mew"
parameters["appVersion"] = APPUtils.appVersion
parameters["deviceId"] = APPUtils.currentDeveiceId
return parameters

2
yinmeng-ios/Base/Utils/AppKeys.swift
View File

@@ -11,9 +11,11 @@ enum AppKeys {
static let nimAppid = "5d5a833a2d0ff1304a5d8bed53d2af5b"
static let api = "http://beta.api.ymlive.fun/"
static let agoraKey = "5b4d929b6c4e4af190550c4a2ec5cd4c"
static let H5_URL = "http://beta.api.ymlive.fun"
#else
static let nimAppid = "5e76ec47632d86c30ce18eabfa332b6a"
static let api = "https://api.ymlive.fun/"
static let agoraKey = "5b4d929b6c4e4af190550c4a2ec5cd4c"
static let H5_URL = "https://h5.ymlive.fun"
#endif
}

1
yinmeng-ios/Base/Utils/H5Utils.swift
View File

@@ -13,4 +13,5 @@ enum H5Utils:String {
case logoff = "modules/logout/index.html"
case pay = "mew/modules/rule/rechargeAgreement.html"
case rank = "modules/roomRank/index.html"
case autonym = "modules/identity/new.html"
}

2
yinmeng-ios/Base/Utils/Utils.swift
View File

@@ -21,7 +21,7 @@ let keyWindow = UIApplication.shared.windows.first!
let DesKey = "1ea53d260ecf11e7b56e00163e046a26"
let H5_URL = "http://beta.h5.ymlive.fun"

102
yinmeng-ios/Base/Web/WebViewController.swift
View File

@@ -7,12 +7,14 @@
import UIKit
import WebKit
import MJExtension
class WebViewWeakScriptMessage: NSObject, WKScriptMessageHandler {
private(set) weak var target: WKScriptMessageHandler?
required init(target: WKScriptMessageHandler?) {
self.target = target
}
@@ -30,8 +32,20 @@ class WebViewController: BaseViewController {
private(set) var progressView = UIProgressView()
private lazy var userContentController = WKUserContentController()
private lazy var userContentController:WKUserContentController = {
let scriptMessage = WebViewWeakScriptMessage(target: self);
let _userContentController = WKUserContentController()
_userContentController.add(self, name: "getUid")
_userContentController.add(self, name: "getDeviceId")
_userContentController.add(self, name: "getTicket")
_userContentController.add(self, name: "getDeviceInfo")
_userContentController.add(self, name: "initShowNav")
_userContentController.add(self, name: "closeWebView")
_userContentController.add(self, name: "cancelAccount")
return _userContentController
}()
private var callbacks: [String: [OnReceiveMessage]] = [:]
private(set) weak var navigationDelegate: WKNavigationDelegate?
@@ -47,7 +61,7 @@ class WebViewController: BaseViewController {
self.isHalf = isHalf
if var url = url {
if !url.hasPrefix("http") {
url = "\(H5_URL)/\(url)"
url = "\(AppKeys.H5_URL)/\(url)"
}
self.url = url
}
@@ -59,7 +73,9 @@ class WebViewController: BaseViewController {
loadSubViews()
loadWebView()
}
deinit{
print("1111")
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
addObserve()
@@ -157,8 +173,11 @@ class WebViewController: BaseViewController {
}
webview.load(URLRequest(url: theUrl))
}
func reloadWebViewWithUrl(_ url: String) {
self.url = url
loadWebView()
@@ -170,8 +189,18 @@ class WebViewController: BaseViewController {
configuration.allowsInlineMediaPlayback = true
configuration.allowsPictureInPictureMediaPlayback = true
configuration.selectionGranularity = .character
configuration.userContentController = userContentController
let cookie = "uid=\(AuthManager.userUid)"
let cookieScript = WKUserScript.init(source: "document.cookie = '\(cookie)';", injectionTime: .atDocumentStart, forMainFrameOnly: false)
self.userContentController.addUserScript(cookieScript)
let scale = "$('meta[name=description]').remove(); $('head').append( '<meta name=\"viewport\" content=\"width=device-width, initial-scale=1,user-scalable=no\">' );"
let scaleScript = WKUserScript.init(source: scale, injectionTime: .atDocumentEnd, forMainFrameOnly: false)
self.userContentController.addUserScript(scaleScript)
configuration.userContentController = self.userContentController
let preferences = WKPreferences()
if #available(iOS 14, *) {
let webpagePreferences = WKWebpagePreferences()
@@ -185,6 +214,18 @@ class WebViewController: BaseViewController {
configuration.preferences = preferences
let webview = WKWebView(frame: UIScreen.main.bounds, configuration: configuration)
webview.navigationDelegate = self
webview.evaluateJavaScript("navigator.userAgent") {[weak self] res, error in
guard let self = self else{return}
if let text = res as? NSString{
if !text.contains("tutuAppIos erbanAppIos"){
let newText = (text as String) + "tutuAppIos erbanAppIos"
let dic = ["UserAgent":newText]
UserDefaults.standard.register(defaults: dic)
UserDefaults.standard.synchronize()
self.webview.customUserAgent = newText
}
}
}
return webview
}
@@ -200,10 +241,54 @@ extension WebViewController: WKScriptMessageHandler {
func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
//TODO: 拦截一些h5的事件
webview.evaluateJavaScript("document.location.href") {[weak self] res, error in
guard let self = self else{return}
if let curUrl = res{
if message.name == "getUid"{
let uid = "getMessage(\"uid\",\(AuthManager.userUid))"
self.webview.evaluateJavaScript(uid) { other, error in
}
}else if message.name == "getTicket"{
let ticket = "getMessage(\"ticket\",\"\(AuthManager.ticket)\")"
self.webview.evaluateJavaScript(ticket) { other, error in
}
}else if message.name == "getDeviceId"{
let deviceId = "getMessage(\"deviceId\",\"\(APPUtils.currentDeveiceId)\")"
self.webview.evaluateJavaScript(deviceId) { other, error in
}
}else if message.name == "getDeviceInfo"{
let info = NSDictionary(dictionary: YMNetworkHelper.share.baseParameters)
if let infoText = info.mj_JSONString() {
let text = "getMessage(\"deviceInfo\",\(infoText))"
self.webview.evaluateJavaScript(text) { other, error in
}
}
}else if message.name == "initShowNav"{
if let body = message.body as? Int,body == 0{
if self.navigationController != nil{
self.navigationController?.setNavigationBarHidden(true, animated: false)
}
}
}else if message.name == "closeWebView"{
if let body = message.body as? Int,body == 0{
if self.navigationController != nil{
self.navigationController?.popViewController(animated: true)
}
}
}else if message.name == "cancelAccount"{
AuthViewModel.authVM.logout()
}
}
}
}
}
extension WebViewController: WKNavigationDelegate {
extension WebViewController: WKNavigationDelegate{
func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
progressView.alpha = 1
@@ -224,4 +309,5 @@ extension WebViewController: WKNavigationDelegate {
}
navigationDelegate?.webView?(webView, didFailProvisionalNavigation: navigation, withError: error)
}
}