二手车数量信息
This commit is contained in:
Binary file not shown.
@@ -5076,5 +5076,37 @@
|
|||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
</BreakpointProxy>
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
uuid = "517F2080-4F49-428F-A9D0-8A1579C345AA"
|
||||||
|
shouldBeEnabled = "No"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "OrderScheduling/Mine/ViewController/MineController.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "52"
|
||||||
|
endingLineNumber = "52"
|
||||||
|
landmarkName = "addActions()"
|
||||||
|
landmarkType = "7">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
uuid = "42E2190C-4191-43FE-8B43-389E661FC6A3"
|
||||||
|
shouldBeEnabled = "No"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "OrderScheduling/Mine/ViewController/MineController.swift"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "49"
|
||||||
|
endingLineNumber = "49"
|
||||||
|
landmarkName = "addActions()"
|
||||||
|
landmarkType = "7">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
</Breakpoints>
|
</Breakpoints>
|
||||||
</Bucket>
|
</Bucket>
|
||||||
|
|||||||
23
OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/Contents.json
vendored
Normal file
23
OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/Contents.json
vendored
Normal file
@@ -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
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new.png
vendored
Normal file
BIN
OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 681 B |
BIN
OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new@2x.png
vendored
Normal file
BIN
OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new@3x.png
vendored
Normal file
BIN
OrderScheduling/Assets.xcassets/Mine/ershouche_new.imageset/ershouche_new@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
@@ -67,4 +67,6 @@ open class ApiList {
|
|||||||
public let appPushRecordList = "/supplierAppV2/dispatchApp/order/appPushRecordList"
|
public let appPushRecordList = "/supplierAppV2/dispatchApp/order/appPushRecordList"
|
||||||
|
|
||||||
public let getConfigByCode = "/base/baseConfig/getConfigByCode"
|
public let getConfigByCode = "/base/baseConfig/getConfigByCode"
|
||||||
|
|
||||||
|
public let thisWeekNumber = "/toc-user/car-admin/thisWeekNumber"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -140,4 +140,8 @@ open class RequestList {
|
|||||||
func getConfigByCode<P:Encodable>(parameters:P) -> Single<ResponseModel<ConfigByCodeDataModel>?> {
|
func getConfigByCode<P:Encodable>(parameters:P) -> Single<ResponseModel<ConfigByCodeDataModel>?> {
|
||||||
return DDAF.post(urlString: HOST+API.getConfigByCode,parameters: parameters,encoding: URLEncodedFormParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<ConfigByCodeDataModel>.self)
|
return DDAF.post(urlString: HOST+API.getConfigByCode,parameters: parameters,encoding: URLEncodedFormParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<ConfigByCodeDataModel>.self)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func thisWeekNumber()-> Single<ResponseModel<Int>?> {
|
||||||
|
return DDAF.get(urlString: HOST+API.thisWeekNumber,encoding: URLEncodedFormParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<Int>.self)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,11 +45,14 @@ extension MineController {
|
|||||||
.disposed(by: disposeBag)
|
.disposed(by: disposeBag)
|
||||||
|
|
||||||
refreshRelay
|
refreshRelay
|
||||||
.flatMapLatest { _ in
|
.flatMapLatest({ _ in
|
||||||
return RQ.generalInfo()
|
return RQ.thisWeekNumber()
|
||||||
|
})
|
||||||
|
.flatMapLatest { numberModel in
|
||||||
|
return Single.zip(RQ.generalInfo(),Single.just(numberModel))
|
||||||
}
|
}
|
||||||
.observe(on: MainScheduler.instance)
|
.observe(on: MainScheduler.instance)
|
||||||
.subscribe(onNext: {[weak self] response in
|
.subscribe(onNext: {[weak self] response,numberModel in
|
||||||
if response?.success == true {
|
if response?.success == true {
|
||||||
self?.mineView.scrollView.mj_header?.endRefreshing()
|
self?.mineView.scrollView.mj_header?.endRefreshing()
|
||||||
self?.mineView.carInfoView.descLabel.text = String(response?.data?.vehicleCount ?? 0)+"台"
|
self?.mineView.carInfoView.descLabel.text = String(response?.data?.vehicleCount ?? 0)+"台"
|
||||||
@@ -64,6 +67,17 @@ extension MineController {
|
|||||||
}else{
|
}else{
|
||||||
self?.view.dd_makeToast(response?.msg)
|
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)
|
.disposed(by: disposeBag)
|
||||||
|
|
||||||
@@ -408,6 +422,8 @@ open class MineView : DDView {
|
|||||||
materialRadiusView.addSubview(wendangziliao)
|
materialRadiusView.addSubview(wendangziliao)
|
||||||
ershouche.addGestureRecognizer(ershoucheGes)
|
ershouche.addGestureRecognizer(ershoucheGes)
|
||||||
ershouche.line.isHidden = true
|
ershouche.line.isHidden = true
|
||||||
|
ershouche.contentImageView.image = UIImage(named: "ershouche_new")
|
||||||
|
ershouche.contentLabel.text = "0"
|
||||||
usedCarRadiusView.addSubview(ershouche)
|
usedCarRadiusView.addSubview(ershouche)
|
||||||
banbenjiance.addGestureRecognizer(banbenjianceGes)
|
banbenjiance.addGestureRecognizer(banbenjianceGes)
|
||||||
settingsRadiusView.addSubview(banbenjiance)
|
settingsRadiusView.addSubview(banbenjiance)
|
||||||
@@ -579,15 +595,28 @@ open class MineCell : DDView {
|
|||||||
public let arrow : DDImageView
|
public let arrow : DDImageView
|
||||||
public let line : DDView
|
public let line : DDView
|
||||||
|
|
||||||
|
public let contentView : UIView
|
||||||
|
public let contentImageView : UIImageView
|
||||||
|
public let contentLabel : UILabel
|
||||||
|
|
||||||
override init(frame: CGRect) {
|
override init(frame: CGRect) {
|
||||||
titleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(14)), textColor: .hex("323643"))
|
titleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(14)), textColor: .hex("323643"))
|
||||||
arrow = DDImageView(image: UIImage(named: "mine_info_arrow"))
|
arrow = DDImageView(image: UIImage(named: "mine_info_arrow"))
|
||||||
line = DDView()
|
line = DDView()
|
||||||
|
contentView = UIView()
|
||||||
|
contentImageView = UIImageView()
|
||||||
|
contentLabel = UILabel()
|
||||||
super.init(frame: frame)
|
super.init(frame: frame)
|
||||||
addSubview(titleLabel)
|
addSubview(titleLabel)
|
||||||
addSubview(arrow)
|
addSubview(arrow)
|
||||||
line.backgroundColor = .hex("E9E9EA")
|
line.backgroundColor = .hex("E9E9EA")
|
||||||
addSubview(line)
|
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
|
titleLabel.snp.makeConstraints { make in
|
||||||
make.left.equalTo(auto(20))
|
make.left.equalTo(auto(20))
|
||||||
@@ -605,6 +634,22 @@ open class MineCell : DDView {
|
|||||||
make.right.equalTo(arrow)
|
make.right.equalTo(arrow)
|
||||||
make.height.equalTo(1)
|
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) {
|
public required init?(coder: NSCoder) {
|
||||||
|
|||||||
BIN
Pods/.DS_Store
generated
vendored
BIN
Pods/.DS_Store
generated
vendored
Binary file not shown.
Reference in New Issue
Block a user