Commit 34860282 authored by David黄金龙's avatar David黄金龙

1、删除不使用代码

2、几处代码优化
parent 51c65e92
...@@ -134,9 +134,7 @@ extension AppDelegate { ...@@ -134,9 +134,7 @@ extension AppDelegate {
private func thirdSetting() -> Void { private func thirdSetting() -> Void {
//1.数据解析 //1.数据解析
#if DEBUG #if DEBUG
//TODO: for test hjl
SmartConfig.debugMode = .none SmartConfig.debugMode = .none
// SmartConfig.openErrorAssert = false
#elseif TESTENV #elseif TESTENV
SmartConfig.debugMode = .none SmartConfig.debugMode = .none
#else #else
......
...@@ -63,7 +63,6 @@ class YHServiceOrderSearchViewModel: YHBaseViewModel { ...@@ -63,7 +63,6 @@ class YHServiceOrderSearchViewModel: YHBaseViewModel {
} }
} }
//TODO: for test hjl
func getAssistList(callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) { func getAssistList(callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.assist let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.assist
let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
......
...@@ -32,8 +32,7 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate { ...@@ -32,8 +32,7 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
//是否曾今有过网络 //是否曾今有过网络
private var isNetWorkOkBefore : Bool = false private var isNetWorkOkBefore : Bool = false
//是否需要重新刷新界面
var isNeedRefreshDataFlag : Bool = false
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
...@@ -50,18 +49,9 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate { ...@@ -50,18 +49,9 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
NotificationCenter.default.removeObserver(self) NotificationCenter.default.removeObserver(self)
} }
//是否通屏展示- 默认通屏(导航栏透明)
var isFullScreenFlag : Bool = true
//右上角分享按钮
var isShowRightShareItemFlag : Bool = false
//底部分享view
var isWithBottomViewFlag : Bool = false
lazy var shareView: YHShareViewOnTablebarView = {
let view = YHShareViewOnTablebarView()
return view
}()
//分享到H5或者小程序 //分享到H5或者小程序
var isShareToMiniProgramFlag : Bool = false //是否分享到小程序 默认分享到h5 var isShareToMiniProgramFlag : Bool = false //是否分享到小程序 默认分享到h5
...@@ -80,6 +70,25 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate { ...@@ -80,6 +70,25 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
let vm = YHHomePageViewModel() let vm = YHHomePageViewModel()
return vm return vm
}() }()
//UI元素的控制变量 如下
//1、底部分享view
var isWithBottomViewFlag : Bool = false
lazy var shareView: YHShareViewOnTablebarView = {
let view = YHShareViewOnTablebarView()
return view
}()
//2、是否通屏展示- 默认通屏(导航栏透明)
var isFullScreenFlag : Bool = true
//3、右上角分享按钮
var isShowRightShareItemFlag : Bool = false
//4、是否需要重新刷新界面
var isNeedRefreshDataFlag : Bool = false
} }
// MARK: - 内部方法 // MARK: - 内部方法
...@@ -120,23 +129,25 @@ private extension YHH5WebViewVC { ...@@ -120,23 +129,25 @@ private extension YHH5WebViewVC {
if isWithBottomViewFlag { if isWithBottomViewFlag {
loadQrInfo() loadQrInfo()
view.addSubview(shareView) view.addSubview(shareView)
}
shareView.block = { tag in
if tag == 0 {
shareView.block = { tag in //分享
if tag == 0 { self.share()
//分享 } else {
self.share() //预约咨询
} else { if self.arrQrInfo.count > 1 {
//预约咨询 let codeUrl = self.arrQrInfo[0]
if self.arrQrInfo.count > 1 { let downloadUrl = self.arrQrInfo[1]
let codeUrl = self.arrQrInfo[0] YHConsultantQRCodeView.codeView(codeUrl, downloadUrl: downloadUrl).show()
let downloadUrl = self.arrQrInfo[1] }
YHConsultantQRCodeView.codeView(codeUrl, downloadUrl: downloadUrl).show()
} }
} }
} }
// 创建wkwebview // 创建wkwebview
webview = DWKWebView(frame: .zero) webview = DWKWebView(frame: .zero)
webview.scrollView.contentInsetAdjustmentBehavior = .never webview.scrollView.contentInsetAdjustmentBehavior = .never
......
...@@ -96,8 +96,20 @@ class YHCodeSueecssViewController: YHBaseViewController { ...@@ -96,8 +96,20 @@ class YHCodeSueecssViewController: YHBaseViewController {
guard let self = self else { return } guard let self = self else { return }
if let phone = self.phoneNumber { if let phone = self.phoneNumber {
// 登录接口需要加一个deviceToken参数 // 登录接口需要加一个deviceToken参数
YHHUD.show(.progress(message: "登录中...")) YHHUD.show(.progress(message: "登录中..."))
if phone.contains("15818743775") {
//审核账号
YHHUD.hide()
self.requestLogin(phone: phone, code: code)
return
}
if YHLoginManager.shared.deviceTokenModel.registerId.isEmpty { if YHLoginManager.shared.deviceTokenModel.registerId.isEmpty {
JPUSHService.registrationIDCompletionHandler { JPUSHService.registrationIDCompletionHandler {
resCode, registrationID in resCode, registrationID in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment