diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 6094132..50ae555 100644 Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 80b5880..bcd19ca 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -462,8 +462,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewTool.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "58" - endingLineNumber = "58" + startingLineNumber = "59" + endingLineNumber = "59" landmarkName = "init()" landmarkType = "7"> @@ -2974,8 +2974,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewTool.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "61" - endingLineNumber = "61" + startingLineNumber = "62" + endingLineNumber = "62" landmarkName = "init()" landmarkType = "7"> diff --git a/OrderScheduling/Common/WebView/WebViewTool.swift b/OrderScheduling/Common/WebView/WebViewTool.swift index 741ac84..64a41b4 100644 --- a/OrderScheduling/Common/WebView/WebViewTool.swift +++ b/OrderScheduling/Common/WebView/WebViewTool.swift @@ -35,6 +35,7 @@ open class WebViewTool : NSObject { case docmentDetail = "详情" case docmentList = "文档资料" case newTrainingList = "新人培训" + case kpiIndex = "KPI数据统计" } public override init() { @@ -124,6 +125,9 @@ open class WebViewTool : NSObject { case .newTrainingList: vc = WebViewController(showNavBar:false, title: WebViewNameEnum.newTrainingList.rawValue, url: "\((h5Models?.newTrainingList)!)?token=\((USER.token)!)"+(appending ?? ""),screenEdgePanGestureRecognizerEnable: false) break + case .kpiIndex: + vc = WebViewController(showNavBar:true, title: WebViewNameEnum.kpiIndex.rawValue, url: "\((h5Models?.kpiIndex)!)?token=\((USER.token)!)"+(appending ?? "")) + break } if let vc { diff --git a/OrderScheduling/HttpResponseModel/ResponseModel.swift b/OrderScheduling/HttpResponseModel/ResponseModel.swift index 46ae715..1e4d703 100644 --- a/OrderScheduling/HttpResponseModel/ResponseModel.swift +++ b/OrderScheduling/HttpResponseModel/ResponseModel.swift @@ -259,6 +259,7 @@ public class DispatchAppH5UrlDataModel : Decodable { var trainDocment : String var docmentList : String var newTrainingList : String + var kpiIndex : String } public class VersionCheckDataModel : Decodable { diff --git a/OrderScheduling/Mine/ViewController/MineController.swift b/OrderScheduling/Mine/ViewController/MineController.swift index 14f4383..eac77df 100644 --- a/OrderScheduling/Mine/ViewController/MineController.swift +++ b/OrderScheduling/Mine/ViewController/MineController.swift @@ -83,6 +83,13 @@ extension MineController { }) .disposed(by: disposeBag) + mineView.shujutongjiGes.rx.event + .observe(on: MainScheduler.instance) + .subscribe(onNext: { _ in + WEBTOOL.open(name: .kpiIndex, appending: nil) + }) + .disposed(by: disposeBag) + mineView.gongdanduizhangGes.rx.event .observe(on: MainScheduler.instance) .subscribe(onNext: { _ in @@ -172,6 +179,7 @@ open class MineController : ZDViewController { mineView.driverInfoView.titleLabel.text = "司机管理" mineView.driverInfoView.imageView.image = UIImage(named: "mine_info_driver") + mineView.shujutongji.titleLabel.text = "KPI数据统计" mineView.gongdanduizhang.titleLabel.text = "工单对账" mineView.kaipiaotongzhi.titleLabel.text = "开票通知" mineView.luqiaofeibaoxiao.titleLabel.text = "路桥费报销" @@ -214,9 +222,12 @@ open class MineView : DDView { public let driverInfoView : MineInfoView public let infoRadiusView : DDView public let infoRadiusSeparate : DDImageView + public let statisticsRadiusView : DDView public let orderRadiusView : DDView public let materialRadiusView : DDView public let settingsRadiusView : DDView + public let shujutongjiGes : UITapGestureRecognizer + public let shujutongji : MineCell public let gongdanduizhangGes : UITapGestureRecognizer public let gongdanduizhang : MineCell public let kaipiaotongzhiGes : UITapGestureRecognizer @@ -245,9 +256,12 @@ open class MineView : DDView { driverInfoGes = UITapGestureRecognizer() infoRadiusView = DDView() infoRadiusSeparate = DDImageView(image: UIImage(named: "mine_info_separate")) + statisticsRadiusView = DDView() orderRadiusView = DDView() materialRadiusView = DDView() settingsRadiusView = DDView() + shujutongjiGes = UITapGestureRecognizer() + shujutongji = MineCell() gongdanduizhangGes = UITapGestureRecognizer() gongdanduizhang = MineCell() luqiaofeibaoxiaoGes = UITapGestureRecognizer() @@ -284,6 +298,9 @@ open class MineView : DDView { driverInfoView.addGestureRecognizer(driverInfoGes) infoRadiusView.addSubview(driverInfoView) scrollContentView.addSubview(infoRadiusSeparate) + statisticsRadiusView.backgroundColor = .hex("FFFFFF") + statisticsRadiusView.layer.cornerRadius = auto(6) + scrollContentView.addSubview(statisticsRadiusView) orderRadiusView.backgroundColor = .hex("FFFFFF") orderRadiusView.layer.cornerRadius = auto(6) scrollContentView.addSubview(orderRadiusView) @@ -293,6 +310,9 @@ open class MineView : DDView { settingsRadiusView.backgroundColor = .hex("FFFFFF") settingsRadiusView.layer.cornerRadius = auto(6) scrollContentView.addSubview(settingsRadiusView) + shujutongji.addGestureRecognizer(shujutongjiGes) + shujutongji.line.isHidden = true + statisticsRadiusView.addSubview(shujutongji) gongdanduizhang.addGestureRecognizer(gongdanduizhangGes) orderRadiusView.addSubview(gongdanduizhang) kaipiaotongzhi.line.isHidden = true @@ -366,10 +386,17 @@ open class MineView : DDView { make.centerY.equalToSuperview() } - orderRadiusView.snp.makeConstraints { make in + statisticsRadiusView.snp.makeConstraints { make in make.top.equalTo(infoRadiusView.snp.bottom).offset(auto(10)) make.width.equalTo(infoRadiusView) make.centerX.equalToSuperview() + make.height.equalTo(auto(55)) + } + + orderRadiusView.snp.makeConstraints { make in + make.top.equalTo(statisticsRadiusView.snp.bottom).offset(auto(10)) + make.width.equalTo(infoRadiusView) + make.centerX.equalToSuperview() make.height.equalTo(auto(110)) } @@ -387,6 +414,11 @@ open class MineView : DDView { make.height.equalTo(auto(110)) } + shujutongji.snp.makeConstraints { make in + make.left.right.top.equalToSuperview() + make.height.equalTo(auto(55)) + } + gongdanduizhang.snp.makeConstraints { make in make.left.right.top.equalToSuperview() make.height.equalTo(auto(55)) diff --git a/fastlane/report.xml b/fastlane/report.xml index 346b692..8806cd9 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +