Skip to content

G
galaxy-iOS
Commit c2707391 authored by Alex朱枝文's avatar Alex朱枝文
Browse files
Options

银河管家消息跳转bug修复

parent 43d2a99d
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 32 deletions
galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/YHButlerServiceManager.swift
View file @ c2707391
......@@ -98,7 +98,6 @@ class YHButlerServiceManager: NSObject {
self.curentPresentedVC = nav
UIViewController.current?.present(nav, animated: true, completion: nil)
} else {
sessionViewController.hidesBottomBarWhenPushed = true
navigationController?.pushViewController(sessionViewController)
}
}
......@@ -130,7 +129,7 @@ extension YHButlerServiceManager {
do {
if let jsonObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
// 转换成功，jsonObject 是一个字典
print("JSON字符串转换为字典成功: \(jsonObject)")
printLog("JSON字符串转换为字典成功: \(jsonObject)")
/*
"{\"order_id\":151824,\"type\":27}"
*/
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift
View file @ c2707391
......@@ -241,6 +241,18 @@ class YHServiceOrderListView: YHBaseViewController {
vc.orderId = orderId
vc.batchId = stepId
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 101 {
//身份续签指引
gotoResignGuideVC()
} else if type == 102 {
//我的续签方案
gotoResignMethod(orderID: orderId, stepID: stepId)
} else if type == 103 {
//添加在港记录
gotoHKImmigrationRecordsVC(orderID: orderId)
} else if type == 104 {
//续签证件管理
gotoResignCertificateListVC(orderID: orderId)
}
}
}
......@@ -337,6 +349,47 @@ extension YHServiceOrderListView {
// 本地没有红点记录存储则必展示红点
return true
}
static func gotoResignGuideVC() {
if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/guide/identity"
// var url = "http://192.168.23.35:10300/" + "superAppBridge.html#/guide/identity"
url = url + "?param=" + YHLoginManager.shared.h5Token
let vc = YHH5WebViewVC()
vc.navTitle = "身份续签指引"
vc.url = url
vc.isFullScreenFlag = false
vc.isNeedRefreshDataFlag = true
vc.isSupportWebviewInterBackFlag = true
UIViewController.current?.navigationController?.pushViewController(vc)
}
}
static func gotoResignMethod(orderID: Int, stepID: Int) {
if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
printLog(param)
var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/report/program"
// var url = "http://192.168.23.75:10301/" + "superAppBridge.html#/report/program"
url = url + "?param=" + YHLoginManager.shared.h5Token + "&batchID=\(stepID)" + "&order_id=\(orderID)"
let vc = YHH5WebViewVC()
vc.navTitle = "我的续签方案"
vc.url = url
vc.isSupportWebviewInterBackFlag = true
UIViewController.current?.navigationController?.pushViewController(vc)
}
}
static func gotoHKImmigrationRecordsVC(orderID: Int) {
let vc = YHHKImmigrationRecordsVC(orderId: orderID)
UIViewController.current?.navigationController?.pushViewController(vc)
}
static func gotoResignCertificateListVC(orderID: Int) {
let vc = YHResignCertificateListViewController()
vc.orderId = orderID
UIViewController.current?.navigationController?.pushViewController(vc)
}
}
extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
......@@ -365,43 +418,18 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
if tag == 1 {
//身份续签指引
printLog("身份续签指引")
if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/guide/identity"
// var url = "http://192.168.23.35:10300/" + "superAppBridge.html#/guide/identity"
url = url + "?param=" + YHLoginManager.shared.h5Token
let vc = YHH5WebViewVC()
vc.navTitle = "身份续签指引"
vc.url = url
vc.isFullScreenFlag = false
vc.isNeedRefreshDataFlag = true
vc.isSupportWebviewInterBackFlag = true
UIViewController.current?.navigationController?.pushViewController(vc)
}
YHServiceOrderListView.gotoResignGuideVC()
} else if tag == 2 {
//我的续签方案
printLog("续签方案")
if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
printLog(param)
var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/report/program"
// var url = "http://192.168.23.75:10301/" + "superAppBridge.html#/report/program"
url = url + "?param=" + YHLoginManager.shared.h5Token + "&batchID=\(stepID)" + "&order_id=\(orderID)"
let vc = YHH5WebViewVC()
vc.navTitle = "我的续签方案"
vc.url = url
vc.isSupportWebviewInterBackFlag = true
UIViewController.current?.navigationController?.pushViewController(vc)
}
YHServiceOrderListView.gotoResignMethod(orderID: orderID, stepID: stepID)
} else if tag == 3 {
//添加在港记录
let vc = YHHKImmigrationRecordsVC(orderId: orderID)
UIViewController.current?.navigationController?.pushViewController(vc)
YHServiceOrderListView.gotoHKImmigrationRecordsVC(orderID: orderID)
} else if tag == 4 {
//续签证件管理
let vc = YHResignCertificateListViewController()
vc.orderId = orderID
UIViewController.current?.navigationController?.pushViewController(vc)
YHServiceOrderListView.gotoResignCertificateListVC(orderID: orderID)
}
}
return view
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/C/YHResignConfirmInfoListViewController.swift
View file @ c2707391
......@@ -121,7 +121,8 @@ class YHResignConfirmInfoListViewController: YHBaseViewController {
YHHUD.flash(message: msg)
return
}
self.navigationController?.popToRootViewController(animated: true)
self.navigationController?.popToRootViewController(animated: false)
YHButlerServiceManager.shared.sessionGoBack()
goTabBarBy(tabType: .service)
}
}
......
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