dezhong/OrderScheduling
18
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
ddisfriend
2026-03-09 10:41:23 +08:00
parent c8828c7f57
commit 350affe84e
6 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OrderScheduling/HttpRequestCenter/ParametersList.swift
View File

@@ -294,4 +294,6 @@ public struct GiveUpParameters : Encodable {
public struct SelectCountBySupplierIdPrameters : Encodable { public struct SelectCountBySupplierIdPrameters : Encodable {
var supplierId : Int? var supplierId : Int?
var remindApp : Int?
var userId : Int?
} }

2
OrderScheduling/HttpResponseModel/ResponseModel.swift
View File

@@ -370,7 +370,7 @@ public class AppPushRecordListDataModel : Decodable {
public class ConfigByCodeDataModel : Decodable { public class ConfigByCodeDataModel : Decodable {
var bannerConfig : [ConfigByCodeBannerModel]? var bannerConfig : [ConfigByCodeBannerModel]?
var supplierAppIsUserNewReport : String? var supplierAppIsUserNewReport : Bool?
public class ConfigByCodeBannerModel : Decodable { public class ConfigByCodeBannerModel : Decodable {
var linkUrl : String? var linkUrl : String?
var bannerIcon : String? var bannerIcon : String?

2
OrderScheduling/Main/SceneDelegate.swift
View File

@@ -47,7 +47,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
NewTraining.default.newTrainingRelay.accept(nil) NewTraining.default.newTrainingRelay.accept(nil)
} }
// 在服务商登录调度app后，弹框提醒服务商（提醒次数为2次) // 在服务商登录调度app后，弹框提醒服务商
if USER.isLogin == true, appIsAlive == true { if USER.isLogin == true, appIsAlive == true {
UserData.default.showGongdanpiciAlert() UserData.default.showGongdanpiciAlert()
} }

2
OrderScheduling/Mine/ViewController/MineController.swift
View File

@@ -49,7 +49,7 @@ extension MineController {
return RQ.thisWeekNumber() return RQ.thisWeekNumber()
}) })
.flatMapLatest { numberModel in .flatMapLatest { numberModel in
return Single.zip(RQ.generalInfo(),RQ.getNeedConfirmPersonInfo(prameters: NeedConfirmPersonInfoParameters(supplierId: UserData.default.supplierId)),RQ.selectCountBySupplierId(parameters: SelectCountBySupplierIdPrameters(supplierId: UserData.default.supplierId)),Single.just(numberModel)) return Single.zip(RQ.generalInfo(),RQ.getNeedConfirmPersonInfo(prameters: NeedConfirmPersonInfoParameters(supplierId: UserData.default.supplierId)),RQ.selectCountBySupplierId(parameters: SelectCountBySupplierIdPrameters(supplierId: UserData.default.supplierId,remindApp: 0,userId: UserData.default.userId)),Single.just(numberModel))
} }
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] response,needConfirmPersonInfoModel,selectCountModel,numberModel in .subscribe(onNext: {[weak self] response,needConfirmPersonInfoModel,selectCountModel,numberModel in

13
OrderScheduling/Rescue/View/GongdanpiciTool.swift
View File

@@ -18,14 +18,7 @@ class GongdanpiciTool : NSObject {
return return
} }
var selectCountBySupplierId = (UserDefaults.standard.object(forKey: "selectCountBySupplierId") as? Int) ?? 0 RQ.selectCountBySupplierId(parameters: SelectCountBySupplierIdPrameters(supplierId: supplierId,remindApp: 1,userId: UserData.default.userId))
// 只弹两次
guard selectCountBySupplierId < 2 else {
return
}
RQ.selectCountBySupplierId(parameters: SelectCountBySupplierIdPrameters(supplierId: supplierId))
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onSuccess: { selectCountModel in .subscribe(onSuccess: { selectCountModel in
if selectCountModel?.success == true { if selectCountModel?.success == true {
@@ -60,10 +53,6 @@ class GongdanpiciTool : NSObject {
let tabBarVc = UIApplication.shared.dd_keyWindow.rootViewController as? UITabBarController let tabBarVc = UIApplication.shared.dd_keyWindow.rootViewController as? UITabBarController
let nav = tabBarVc?.selectedViewController as? UINavigationController let nav = tabBarVc?.selectedViewController as? UINavigationController
nav?.topViewController?.present(popup, animated: true) nav?.topViewController?.present(popup, animated: true)
// 计数
selectCountBySupplierId+=1
UserDefaults.standard.set(selectCountBySupplierId, forKey: "selectCountBySupplierId")
} }
}else{ }else{
let tabBarVc = UIApplication.shared.dd_keyWindow.rootViewController as? UITabBarController let tabBarVc = UIApplication.shared.dd_keyWindow.rootViewController as? UITabBarController

2
OrderScheduling/Rescue/ViewController/RescueController.swift
View File

@@ -143,7 +143,7 @@ extension RescueController {
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] response in .subscribe(onNext: {[weak self] response in
if response?.success == true { if response?.success == true {
WEBTOOL.supplierAppIsUserNewReport = (response?.data?.supplierAppIsUserNewReport == "true") WEBTOOL.supplierAppIsUserNewReport = (response?.data?.supplierAppIsUserNewReport == true)
}else{ }else{
self?.view.dd_makeToast(response?.msg) self?.view.dd_makeToast(response?.msg)
} }