Skip to content

G
galaxy-iOS
Commit b2fb2054 authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

parents bbf2a1b8 eb811129
Show whitespace changes
Inline Side-by-side
Showing with 142 additions and 110 deletions
galaxy/galaxy/AppDelegate.swift
View file @ b2fb2054
......@@ -134,9 +134,7 @@ extension AppDelegate {
private func thirdSetting() -> Void {
//1.数据解析
#if DEBUG
//TODO: for test hjl
SmartConfig.debugMode = .none
// SmartConfig.openErrorAssert = false
#elseif TESTENV
SmartConfig.debugMode = .none
#else
......
galaxy/galaxy/Classes/Base/V/YHTwoOptionAlertView.swift
View file @ b2fb2054
......@@ -122,7 +122,6 @@ class YHTwoOptionAlertView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeHoldViewPageViewController.swift
View file @ b2fb2054
......@@ -75,17 +75,12 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
updateDefaultSearchKeyWord()
requestAppNewVersion()
checkHomeAlertView()
if needReloadDataFlag {
needReloadDataFlag = false
homePageVC.requestOrder()
}
// DispatchQueue.main.async {
// self.getAlertStatus()
// }
}
override func viewWillDisappear(_ animated: Bool) {
......@@ -140,14 +135,11 @@ extension YHHomeHoldViewPageViewController {
return
}
princleVM.getPrincleStatus { success, error in
if success {
guard let model = self.princleVM.alertStatusModel else {
return
}
if let vc = UIApplication.shared.keyWindow?.rootViewController as? YHTabBarViewController {
if vc.selectedIndex != 0 {
return
......@@ -191,6 +183,9 @@ extension YHHomeHoldViewPageViewController {
}
}
view.show()
} else if model.type == 20 {
//签约用户新人指引
//TODO: 需要完善 for test hjl
}
}
}
......@@ -212,35 +207,6 @@ extension YHHomeHoldViewPageViewController {
getTotalUnreadMsgCount()
}
func requestAppNewVersion() {
if YHConfigManager.shared.loadNewDataFlag == false {
YHConfigManager.shared.loadConfigData {
[weak self] in
guard let self = self else { return }
self.showNewVersionAlertView()
}
} else {
showNewVersionAlertView()
}
}
func showNewVersionAlertView() {
let isNeedShowAlert = YHAppVersionManager.shared.needShowAlertViewOfSuggestVersionUpdate()
if isNeedShowAlert {
if let configModel = YHConfigManager.shared.reqVM.configModel {
let alertView = YHFindAppNewVersionView.alertView(version: configModel.max_version)
let arr = configModel.suggest_updating_msg.components(separatedBy: "$")
alertView.updateContentArray(arr)
alertView.show()
alertView.cancleBlock = {
self.getAlertStatus()
}
}
} else {
self.getAlertStatus()
}
}
// 请求未读消息总数
@objc func getTotalUnreadMsgCount() {
if !YHLoginManager.shared.isLogin() {
......@@ -445,3 +411,41 @@ extension YHHomeHoldViewPageViewController : UITabBarControllerDelegate {
return true
}
}
//MARK: 弹窗相关的逻辑
private extension YHHomeHoldViewPageViewController {
// 1、强升级 弹窗 > 2、签约用户新人指引 > 3、原则批/正式批 弹窗 > 4、建议更新
func checkHomeAlertView() {
requestAppNewVersion()
}
func requestAppNewVersion() {
if YHConfigManager.shared.loadNewDataFlag == false {
YHConfigManager.shared.loadConfigData {
[weak self] in
guard let self = self else { return }
self.showNewVersionAlertView()
}
} else {
showNewVersionAlertView()
}
}
func showNewVersionAlertView() {
let isNeedShowAlert = YHAppVersionManager.shared.needShowAlertViewOfSuggestVersionUpdate()
if isNeedShowAlert {
if let configModel = YHConfigManager.shared.reqVM.configModel {
let alertView = YHFindAppNewVersionView.alertView(version: configModel.max_version)
let arr = configModel.suggest_updating_msg.components(separatedBy: "$")
alertView.updateContentArray(arr)
alertView.show()
alertView.cancleBlock = {
self.getAlertStatus()
}
}
} else {
self.getAlertStatus()
}
}
}
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHAgreementAlertView.swift
View file @ b2fb2054
......@@ -174,7 +174,6 @@ class YHAgreementAlertView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHServiceOrderAlertView.swift
View file @ b2fb2054
......@@ -159,7 +159,6 @@ class YHServiceOrderAlertView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterViewController.swift
View file @ b2fb2054
......@@ -27,6 +27,7 @@ class YHServiceCenterViewController: YHBaseViewController {
var state: Int = 0
var isCanSelectStep: Bool = false
var stepID: Int = 0
var headIndex = 0
private lazy var topBkg : UIView = {
let imagV = UIImageView()
......@@ -241,6 +242,8 @@ extension YHServiceCenterViewController {
guard let self = self else { return }
self.model = model
self.state = 0
self.headIndex = 0
self.isCanSelectStep = false
}
self.navigationController?.pushViewController(vc)
} else {
......@@ -274,15 +277,17 @@ extension YHServiceCenterViewController {
self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
}
if self.state == 3 {
self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.renewalSection.list.first?.list ?? []
self.stepID = self.serviceCenterMainReqVM.mainModel.renewalSection.list.first?.id ?? 0
self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.renewalSection.list[headIndex].list
self.stepID = self.serviceCenterMainReqVM.mainModel.renewalSection.list[headIndex].id
self.homeTableView.tableHeaderView = headView
self.headView.block = {[weak self] id, array in
self.headView.block = {[weak self] stepIndex, id, array in
guard let self = self else { return }
self.headIndex = stepIndex
self.stepID = id
self.arrDataForSeviceCenterProgress = array
self.homeTableView.reloadData()
}
self.headView.selectIndex = self.headIndex
self.headView.dataSource = self.serviceCenterMainReqVM.mainModel.renewalSection.list
self.titleLabel.setTitle("续签阶段", for: .normal)
self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
......@@ -346,19 +351,23 @@ extension YHServiceCenterViewController {
}
}
if self.state == 3 {
self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.renewalSection.list.first?.list ?? []
self.stepID = self.serviceCenterMainReqVM.mainModel.renewalSection.list.first?.id ?? 0
if self.serviceCenterMainReqVM.mainModel.renewalSection.list.count > headIndex {
self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.renewalSection.list[headIndex].list
self.stepID = self.serviceCenterMainReqVM.mainModel.renewalSection.list[headIndex].id
self.homeTableView.tableHeaderView = headView
self.headView.block = {[weak self] id, array in
self.headView.block = {[weak self] stepIndex, id , array in
guard let self = self else { return }
self.headIndex = stepIndex
self.stepID = id
self.arrDataForSeviceCenterProgress = array
self.homeTableView.reloadData()
}
self.headView.selectIndex = self.headIndex
self.headView.dataSource = self.serviceCenterMainReqVM.mainModel.renewalSection.list
self.titleLabel.setTitle("续签阶段", for: .normal)
self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
}
}
self.homeTableView.reloadData()
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift
View file @ b2fb2054
......@@ -62,6 +62,8 @@ extension YHServiceOrderListView {
array.append(item)
} else if item.status == type {
array.append(item)
} else if item.status == 4, type == 2 {
array.append(item)
}
}
self.arrDataForSeviceCenterProgress = array
......@@ -252,7 +254,6 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
} else if model.type == 6 {
let vc = YHMyDocumentsListViewController()
vc.orderId = orderID
vc.mobile = mobile
UIViewController.current?.navigationController?.pushViewController(vc)
} else if model.type == 11 || model.type == 12 || model.type == 14 {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterCardExampleView.swift
View file @ b2fb2054
......@@ -209,7 +209,6 @@ class YHAdopterCardExampleView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHNoAdopterAlertView.swift
View file @ b2fb2054
......@@ -110,7 +110,6 @@ class YHNoAdopterAlertView: UIView, UIGestureRecognizerDelegate {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/M/YHPrincipleWaitResultModel.swift
View file @ b2fb2054
......@@ -19,7 +19,7 @@ enum YHPrincipleWaitItemType: Int {
// MARK: - Applicant
class YHPrincipleAlertStatusModel: SmartCodable {
var type: Int = 0 //1-展示正式批已获批弹窗 2-展示原则批已获批弹窗 0-不展示
var type: Int = 0 //1-展示正式批已获批弹窗 2-展示原则批已获批弹窗 0-不展示 20-首页展示签约新人指引
var date: Int = 0 //正式批获批时间
required init() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsListViewController.swift
View file @ b2fb2054
......@@ -16,7 +16,6 @@ class YHMyDocumentsListViewController: YHBaseViewController {
var tableView: UITableView!
var viewModel: YHMyDocumentsListViewModel?
var orderId: Int = 0
var mobile: String = ""
var arrIDs : [Int] = []//保存所有下载的id
//是否展示下载全部按钮
var canSendEmailFlag : Bool = false {
......@@ -89,7 +88,7 @@ extension YHMyDocumentsListViewController {
}
func getData() {
viewModel?.requestDocumentsList("\(orderId)", mobile, callBackBlock: {[weak self] success, error in
viewModel?.requestDocumentsList("\(orderId)", callBackBlock: {[weak self] success, error in
guard let self = self else { return }
if success {
guard let arr = self.viewModel?.mainModel?.docs else { return }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHCheckEamilAlertView.swift
View file @ b2fb2054
......@@ -183,7 +183,6 @@ class YHCheckEamilAlertView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsListViewModel.swift
View file @ b2fb2054
......@@ -12,9 +12,8 @@ class YHMyDocumentsListViewModel: YHBaseViewModel {
var mainModel: YHMyDocumentsModel?
// 请求文书列表
func requestDocumentsList(_ orderId: String, _ mobile: String, callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
let params: [String : Any] = ["order_id": orderId,
"mobile": mobile]
func requestDocumentsList(_ orderId: String, callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
let params: [String : Any] = ["order_id": orderId]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Documents.listApi
let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
//1. json字符串 转 对象
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHCommonAlertView.swift
View file @ b2fb2054
......@@ -234,7 +234,6 @@ class YHCommonAlertView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
if isFullGuestureEnabel {
dismiss()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHSignAppendStepView.swift
View file @ b2fb2054
......@@ -256,7 +256,6 @@ class YHSignAppendStepView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailHkViewController.swift
View file @ b2fb2054
......@@ -136,6 +136,8 @@ class YHResignCertificateDetailHkViewController: YHBaseViewController {
@objc func didSaveBtnClicked() {
if !checkInfo() {
isShowPrompt = true
updateData()
return
}
......@@ -143,7 +145,6 @@ class YHResignCertificateDetailHkViewController: YHBaseViewController {
}
func checkInfo() -> Bool {
var errorItemCount = 0
if urls.first?.count == 0 {
failString = "请港澳通行证正面"
return false
......@@ -177,7 +178,7 @@ private extension YHResignCertificateDetailHkViewController {
//2、保存旅行证件
func saveAllTravelCertificate() {
let passPort: [String: Any] = ["name": "护照",
let hkPassPort: [String: Any] = ["name": "护照",
"issue_start": self.viewModel.dataModel.cert_info.issue_start,
"issue_end": self.viewModel.dataModel.cert_info.issue_end,
"img_front": urls[0],
......@@ -185,7 +186,7 @@ private extension YHResignCertificateDetailHkViewController {
"validate_start": self.viewModel.dataModel.cert_info.validate_start,
"validate_end": self.viewModel.dataModel.cert_info.validate_end]
let params : [String : Any] = [
"passPort": passPort,
"hkPassPort": hkPassPort,
"id": dataModel.id
]
viewModel.submitResignCertificateUpdate(params) { success, error in
......@@ -254,7 +255,7 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
}
} else {
// OCR 无法识别
self.failString = "无法识别，请核查文件"
self.failString = "非逗留(D)签证，请检查文件"
}
self.updateData()
}
......@@ -263,6 +264,11 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
cell.deleteBlock = { [weak self] url, index in
guard let self = self else { return }
self.urls[index] = url
if index == 0 {
self.dataModel.cert_info.img_front = ""
} else {
self.dataModel.cert_info.img_back = ""
}
}
cell.block = {[weak self] model in
guard let self = self else { return }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailPassPortViewController.swift
View file @ b2fb2054
......@@ -224,6 +224,9 @@ extension YHResignCertificateDetailPassPortViewController: UITableViewDelegate,
cell.deleteBlock = { [weak self] url, index in
guard let self = self else { return }
self.urls[index] = url
if index == 0 {
self.dataModel.cert_info.img_front = ""
}
}
cell.block = {[weak self] model in
guard let self = self else { return }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateListViewController.swift
View file @ b2fb2054
......@@ -84,6 +84,9 @@ extension YHResignCertificateListViewController: UITableViewDelegate, UITableVie
cell.dataSource = model
cell.clickBlock = { [weak self] model in
guard let self = self else { return }
if model.age < 11 {
return
}
if indexPath.row == 0 {
if model.cert_type == "PASS_PORT" {
let vc = YHResignCertificateDetailPassPortViewController()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificateListTableViewCell.swift
View file @ b2fb2054
......@@ -230,7 +230,7 @@ class YHResignCertificateView: UIView {
explainLabel.textColor = UIColor(hex: 0x3cc694)
nextStepImageView.image = UIImage(named: "service_adopter_income_success")
}
if dataSource.age < 12 {
if dataSource.age < 11 {
explainLabel.text = "无需提供"
explainLabel.textColor = UIColor.mainTextColor18
nextStepImageView.isHidden = true
......@@ -249,13 +249,15 @@ class YHResignCertificateView: UIView {
}
}
if dataSource.cert_type == "PASS_PORT" {
subTitleLabel.text = "(护照入境)"
subTitleLabel.text = " (护照入境)"
} else if dataSource.cert_type == "HK_PASS_PORT" {
subTitleLabel.text = "(港澳通行证入境)"
subTitleLabel.text = " (港澳通行证入境)"
} else {
subTitleLabel.text = ""
}
if dataSource.age < 11 {
subTitleLabel.text = " (未满11岁)"
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/VM/YHResignCertificateDetailViewModel.swift
View file @ b2fb2054
......@@ -51,9 +51,9 @@ class YHResignCertificateDetailViewModel: YHBaseViewModel {
case .id2:
dataModel.cert_info.issue_end = item.message ?? ""
case .id3:
dataModel.cert_info.issue_start = item.message ?? ""
dataModel.cert_info.validate_start = item.message ?? ""
case .id4:
dataModel.cert_info.issue_end = item.message ?? ""
dataModel.cert_info.validate_end = item.message ?? ""
default:
break
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyMemberViewModel.swift
View file @ b2fb2054
......@@ -124,8 +124,8 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
if model.end_of_term.count != 0 {
mainModel.certificates.hkMacaoPass.issueDateEndAt = model.end_of_term
}
if model.issuing_authority.count != 0 {
mainModel.certificates.hkMacaoPass.issueAt = model.issuing_authority
if model.IssueAddress.count != 0 {
mainModel.certificates.hkMacaoPass.issueAt = model.IssueAddress
}
if model.card_num.count != 0 {
mainModel.certificates.hkMacaoPass.number = model.card_num
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHCardExampleView.swift
View file @ b2fb2054
......@@ -206,7 +206,6 @@ class YHCardExampleView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHDatePickView.swift
View file @ b2fb2054
......@@ -189,7 +189,6 @@ class YHDatePickView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHImagePickerView.swift
View file @ b2fb2054
......@@ -213,7 +213,6 @@ class YHImagePickerView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift
View file @ b2fb2054
......@@ -362,8 +362,8 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
if model.end_of_term.count != 0 {
mainModel.certificates.hk_macao_pass.issue_date_end_at = model.end_of_term
}
if model.issuing_authority.count != 0 {
mainModel.certificates.hk_macao_pass.issue_at = model.issuing_authority
if model.IssueAddress.count != 0 {
mainModel.certificates.hk_macao_pass.issue_at = model.IssueAddress
}
if model.card_num.count != 0 {
mainModel.certificates.hk_macao_pass.number = model.card_num
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHSelectFileSheetView.swift
View file @ b2fb2054
......@@ -165,7 +165,6 @@ class YHSelectFileSheetView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceCenterStepThreeTableHeadView.swift
View file @ b2fb2054
......@@ -9,12 +9,12 @@
import UIKit
class YHServiceCenterStepThreeTableHeadView: UIView {
typealias Block = (Int, [YHServiceCenterProgressModel]) -> ()
typealias Block = (Int, Int, [YHServiceCenterProgressModel]) -> ()
var block: Block?
var dataSource: [YHServiceStepProgressThreeModel] = [] {
didSet {
selectIndex = 0
if dataSource.count > selectIndex {
let model = dataSource[selectIndex]
explainLabel.text = model.personStr
if model.personStr.count > 20 {
......@@ -25,6 +25,7 @@ class YHServiceCenterStepThreeTableHeadView: UIView {
self.myCollectView.reloadData()
}
}
}
var bgView: UIView!
var moreButton: UIButton!
var explainLabel: UILabel!
......@@ -85,7 +86,7 @@ class YHServiceCenterStepThreeTableHeadView: UIView {
explainLabel = {
let label = UILabel()
label.textColor = UIColor.mainTextColor70
label.text = "本期人员：张大大 (首次)、张笑笑 (第2次)"
label.text = ""
label.font = UIFont.PFSC_M(ofSize: 13)
return label
}()
......@@ -145,6 +146,7 @@ extension YHServiceCenterStepThreeTableHeadView: UICollectionViewDelegate, UICol
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
selectIndex = indexPath.row
if dataSource.count > selectIndex {
let model = dataSource[selectIndex]
explainLabel.text = model.personStr
if model.personStr.count > 20 {
......@@ -155,7 +157,8 @@ extension YHServiceCenterStepThreeTableHeadView: UICollectionViewDelegate, UICol
collectionView.reloadData()
let array = model.list
if let block = block {
block(model.id, array)
block(selectIndex, model.id, array)
}
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceMoreAlertView.swift
View file @ b2fb2054
......@@ -111,7 +111,6 @@ class YHServiceMoreAlertView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceStepAlertView.swift
View file @ b2fb2054
......@@ -111,7 +111,6 @@ class YHServiceStepAlertView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHSubmintAllInfoSuccessTipView.swift
View file @ b2fb2054
......@@ -195,7 +195,6 @@ class YHSubmintAllInfoSuccessTipView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHSubmitAllInfoCheckView.swift
View file @ b2fb2054
......@@ -123,7 +123,6 @@ class YHSubmitAllInfoCheckView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceOrderSearchViewModel.swift
View file @ b2fb2054
......@@ -63,7 +63,6 @@ class YHServiceOrderSearchViewModel: YHBaseViewModel {
}
}
//TODO: for test hjl
func getAssistList(callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.assist
let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
......
galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift
View file @ b2fb2054
......@@ -32,8 +32,7 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
//是否曾今有过网络
private var isNetWorkOkBefore : Bool = false
//是否需要重新刷新界面
var isNeedRefreshDataFlag : Bool = false
override func viewDidLoad() {
super.viewDidLoad()
......@@ -50,18 +49,9 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
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或者小程序
var isShareToMiniProgramFlag : Bool = false //是否分享到小程序 默认分享到h5
......@@ -80,6 +70,25 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
let vm = YHHomePageViewModel()
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: - 内部方法
......@@ -120,8 +129,6 @@ private extension YHH5WebViewVC {
if isWithBottomViewFlag {
loadQrInfo()
view.addSubview(shareView)
}
shareView.block = { tag in
if tag == 0 {
......@@ -136,6 +143,10 @@ private extension YHH5WebViewVC {
}
}
}
}
// 创建wkwebview
webview = DWKWebView(frame: .zero)
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHCodeSueecssViewController.swift
View file @ b2fb2054
......@@ -96,8 +96,16 @@ class YHCodeSueecssViewController: YHBaseViewController {
guard let self = self else { return }
if let phone = self.phoneNumber {
// 登录接口需要加一个deviceToken参数
YHHUD.show(.progress(message: "登录中..."))
if phone.contains("15818743775") {
//审核账号
YHHUD.hide()
self.requestLogin(phone: phone, code: code)
return
}
if YHLoginManager.shared.deviceTokenModel.registerId.isEmpty {
JPUSHService.registrationIDCompletionHandler {
resCode, registrationID in
......@@ -168,15 +176,20 @@ class YHCodeSueecssViewController: YHBaseViewController {
} else {
YHLoginManager.shared.loginSuccessActionBlock?()
YHHUD.flash(message: "登录成功")
if YHLoginManager.shared.userModel?.is_first_login == 1 {
let vc = YHUserInfoSettingViewController()
vc.modalPresentationStyle = .fullScreen
self.navigationController?.pushViewController(vc)
} else {
//20240927版本 登录时 不需要 特殊处理注册用户 by Cecilia曾欢宝
// if YHLoginManager.shared.userModel?.is_first_login == 1 {
// let vc = YHUserInfoSettingViewController()
// vc.modalPresentationStyle = .fullScreen
// self.navigationController?.pushViewController(vc)
// } else {
// TXCommonHandler.sharedInstance().cancelLoginVC(animated: true)
// self.dismiss(animated: true)
// }
TXCommonHandler.sharedInstance().cancelLoginVC(animated: true)
self.dismiss(animated: true)
}
}
})
}
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHLoginOneLeadView.swift
View file @ b2fb2054
......@@ -61,7 +61,6 @@ class YHLoginOneLeadView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHPrivacyAlertView.swift
View file @ b2fb2054
......@@ -127,7 +127,6 @@ class YHPrivacyAlertView: UIView {
}
@objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss()
}
......
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