diff --git a/OrderScheduling/HttpRequestCenter/ParametersList.swift b/OrderScheduling/HttpRequestCenter/ParametersList.swift index 15b9c69..9633462 100644 --- a/OrderScheduling/HttpRequestCenter/ParametersList.swift +++ b/OrderScheduling/HttpRequestCenter/ParametersList.swift @@ -294,4 +294,6 @@ public struct GiveUpParameters : Encodable { public struct SelectCountBySupplierIdPrameters : Encodable { var supplierId : Int? + var remindApp : Int? + var userId : Int? } diff --git a/OrderScheduling/HttpResponseModel/ResponseModel.swift b/OrderScheduling/HttpResponseModel/ResponseModel.swift index 184c229..8e11926 100644 --- a/OrderScheduling/HttpResponseModel/ResponseModel.swift +++ b/OrderScheduling/HttpResponseModel/ResponseModel.swift @@ -370,7 +370,7 @@ public class AppPushRecordListDataModel : Decodable { public class ConfigByCodeDataModel : Decodable { var bannerConfig : [ConfigByCodeBannerModel]? - var supplierAppIsUserNewReport : String? + var supplierAppIsUserNewReport : Bool? public class ConfigByCodeBannerModel : Decodable { var linkUrl : String? var bannerIcon : String? diff --git a/OrderScheduling/Main/SceneDelegate.swift b/OrderScheduling/Main/SceneDelegate.swift index 9acb796..2dd1f0a 100644 --- a/OrderScheduling/Main/SceneDelegate.swift +++ b/OrderScheduling/Main/SceneDelegate.swift @@ -47,7 +47,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { NewTraining.default.newTrainingRelay.accept(nil) } - // 在服务商登录调度app后,弹框提醒服务商(提醒次数为2次) + // 在服务商登录调度app后,弹框提醒服务商 if USER.isLogin == true, appIsAlive == true { UserData.default.showGongdanpiciAlert() } diff --git a/OrderScheduling/Mine/ViewController/MineController.swift b/OrderScheduling/Mine/ViewController/MineController.swift index 162b993..1099216 100644 --- a/OrderScheduling/Mine/ViewController/MineController.swift +++ b/OrderScheduling/Mine/ViewController/MineController.swift @@ -49,7 +49,7 @@ extension MineController { return RQ.thisWeekNumber() }) .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) .subscribe(onNext: {[weak self] response,needConfirmPersonInfoModel,selectCountModel,numberModel in diff --git a/OrderScheduling/Rescue/View/GongdanpiciTool.swift b/OrderScheduling/Rescue/View/GongdanpiciTool.swift index 79a98ed..b20b374 100644 --- a/OrderScheduling/Rescue/View/GongdanpiciTool.swift +++ b/OrderScheduling/Rescue/View/GongdanpiciTool.swift @@ -17,15 +17,8 @@ class GongdanpiciTool : NSObject { guard let supplierId = UserData.default.supplierId else { return } - - var selectCountBySupplierId = (UserDefaults.standard.object(forKey: "selectCountBySupplierId") as? Int) ?? 0 - - // 只弹两次 - guard selectCountBySupplierId < 2 else { - return - } - - RQ.selectCountBySupplierId(parameters: SelectCountBySupplierIdPrameters(supplierId: supplierId)) + + RQ.selectCountBySupplierId(parameters: SelectCountBySupplierIdPrameters(supplierId: supplierId,remindApp: 1,userId: UserData.default.userId)) .observe(on: MainScheduler.instance) .subscribe(onSuccess: { selectCountModel in if selectCountModel?.success == true { @@ -60,10 +53,6 @@ class GongdanpiciTool : NSObject { let tabBarVc = UIApplication.shared.dd_keyWindow.rootViewController as? UITabBarController let nav = tabBarVc?.selectedViewController as? UINavigationController nav?.topViewController?.present(popup, animated: true) - - // 计数 - selectCountBySupplierId+=1 - UserDefaults.standard.set(selectCountBySupplierId, forKey: "selectCountBySupplierId") } }else{ let tabBarVc = UIApplication.shared.dd_keyWindow.rootViewController as? UITabBarController diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index 0a5659e..b21e2bd 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -143,7 +143,7 @@ extension RescueController { .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] response in if response?.success == true { - WEBTOOL.supplierAppIsUserNewReport = (response?.data?.supplierAppIsUserNewReport == "true") + WEBTOOL.supplierAppIsUserNewReport = (response?.data?.supplierAppIsUserNewReport == true) }else{ self?.view.dd_makeToast(response?.msg) }