diff --git a/.DS_Store b/.DS_Store index abac53a..c6f24c5 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 73c9b5b..c9d810b 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 823106e..09616d0 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -5076,5 +5076,37 @@ landmarkType = "7"> + + + + + + + + diff --git a/OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/Contents.json b/OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/Contents.json new file mode 100644 index 0000000..9bc416a --- /dev/null +++ b/OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "ershouche_new.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ershouche_new@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ershouche_new@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new.png b/OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new.png new file mode 100644 index 0000000..5297258 Binary files /dev/null and b/OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new.png differ diff --git a/OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new@2x.png b/OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new@2x.png new file mode 100644 index 0000000..f58407b Binary files /dev/null and b/OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new@2x.png differ diff --git a/OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new@3x.png b/OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new@3x.png new file mode 100644 index 0000000..e8a943a Binary files /dev/null and b/OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new@3x.png differ diff --git a/OrderScheduling/HttpRequestCenter/ApiList.swift b/OrderScheduling/HttpRequestCenter/ApiList.swift index f03b8ef..d3ea816 100644 --- a/OrderScheduling/HttpRequestCenter/ApiList.swift +++ b/OrderScheduling/HttpRequestCenter/ApiList.swift @@ -67,4 +67,6 @@ open class ApiList { public let appPushRecordList = "/supplierAppV2/dispatchApp/order/appPushRecordList" public let getConfigByCode = "/base/baseConfig/getConfigByCode" + + public let thisWeekNumber = "/toc-user/car-admin/thisWeekNumber" } diff --git a/OrderScheduling/HttpRequestCenter/RequestList.swift b/OrderScheduling/HttpRequestCenter/RequestList.swift index 04bb340..554aac8 100644 --- a/OrderScheduling/HttpRequestCenter/RequestList.swift +++ b/OrderScheduling/HttpRequestCenter/RequestList.swift @@ -140,4 +140,8 @@ open class RequestList { func getConfigByCode(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.getConfigByCode,parameters: parameters,encoding: URLEncodedFormParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) } + + func thisWeekNumber()-> Single?> { + return DDAF.get(urlString: HOST+API.thisWeekNumber,encoding: URLEncodedFormParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) + } } diff --git a/OrderScheduling/Mine/ViewController/MineController.swift b/OrderScheduling/Mine/ViewController/MineController.swift index 1cdc859..86591bb 100644 --- a/OrderScheduling/Mine/ViewController/MineController.swift +++ b/OrderScheduling/Mine/ViewController/MineController.swift @@ -45,11 +45,14 @@ extension MineController { .disposed(by: disposeBag) refreshRelay - .flatMapLatest { _ in - return RQ.generalInfo() + .flatMapLatest({ _ in + return RQ.thisWeekNumber() + }) + .flatMapLatest { numberModel in + return Single.zip(RQ.generalInfo(),Single.just(numberModel)) } .observe(on: MainScheduler.instance) - .subscribe(onNext: {[weak self] response in + .subscribe(onNext: {[weak self] response,numberModel in if response?.success == true { self?.mineView.scrollView.mj_header?.endRefreshing() self?.mineView.carInfoView.descLabel.text = String(response?.data?.vehicleCount ?? 0)+"台" @@ -64,6 +67,17 @@ extension MineController { }else{ self?.view.dd_makeToast(response?.msg) } + + if numberModel?.success == true { + if let number = numberModel?.data, number > 0 { + self?.mineView.ershouche.contentView.isHidden = false + self?.mineView.ershouche.contentLabel.text = "\(number)" + }else{ + self?.mineView.ershouche.contentView.isHidden = true + } + }else{ + self?.view.dd_makeToast(numberModel?.msg) + } }) .disposed(by: disposeBag) @@ -408,6 +422,8 @@ open class MineView : DDView { materialRadiusView.addSubview(wendangziliao) ershouche.addGestureRecognizer(ershoucheGes) ershouche.line.isHidden = true + ershouche.contentImageView.image = UIImage(named: "ershouche_new") + ershouche.contentLabel.text = "0" usedCarRadiusView.addSubview(ershouche) banbenjiance.addGestureRecognizer(banbenjianceGes) settingsRadiusView.addSubview(banbenjiance) @@ -579,15 +595,28 @@ open class MineCell : DDView { public let arrow : DDImageView public let line : DDView + public let contentView : UIView + public let contentImageView : UIImageView + public let contentLabel : UILabel + override init(frame: CGRect) { titleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(14)), textColor: .hex("323643")) arrow = DDImageView(image: UIImage(named: "mine_info_arrow")) line = DDView() + contentView = UIView() + contentImageView = UIImageView() + contentLabel = UILabel() super.init(frame: frame) addSubview(titleLabel) addSubview(arrow) line.backgroundColor = .hex("E9E9EA") addSubview(line) + contentView.isHidden = true + addSubview(contentView) + contentView.addSubview(contentImageView) + contentLabel.font = .dd_systemFont(ofSize: 14, weight: .medium) + contentLabel.textColor = .dd_hex(light: "d81e06") + contentView.addSubview(contentLabel) titleLabel.snp.makeConstraints { make in make.left.equalTo(auto(20)) @@ -605,6 +634,22 @@ open class MineCell : DDView { make.right.equalTo(arrow) make.height.equalTo(1) } + + contentView.snp.makeConstraints { make in + make.right.equalTo(arrow.snp.left).offset(-auto(10)) + make.centerY.equalToSuperview() + } + + contentImageView.snp.makeConstraints { make in + make.left.equalToSuperview() + make.top.bottom.equalToSuperview().inset(auto(5)) + } + + contentLabel.snp.makeConstraints { make in + make.left.equalTo(contentImageView.snp.right).offset(auto(5)) + make.centerY.equalToSuperview() + make.right.equalToSuperview() + } } public required init?(coder: NSCoder) { diff --git a/Pods/.DS_Store b/Pods/.DS_Store index c9419e7..20ba448 100644 Binary files a/Pods/.DS_Store and b/Pods/.DS_Store differ