diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 9ff966c..e5719ec 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 395282b..4e1c4bf 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -317,8 +317,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "568" - endingLineNumber = "568" + startingLineNumber = "603" + endingLineNumber = "603" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -495,6 +495,38 @@ endingLineNumber = "35" landmarkName = "+dd_thumbnailImageForVideo:" landmarkType = "7"> + + + + + + @@ -666,8 +698,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "306" - endingLineNumber = "306" + startingLineNumber = "310" + endingLineNumber = "310" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -682,8 +714,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "284" - endingLineNumber = "284" + startingLineNumber = "288" + endingLineNumber = "288" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -698,8 +730,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "286" - endingLineNumber = "286" + startingLineNumber = "290" + endingLineNumber = "290" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -714,8 +746,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "312" - endingLineNumber = "312" + startingLineNumber = "316" + endingLineNumber = "316" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -730,8 +762,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "311" - endingLineNumber = "311" + startingLineNumber = "315" + endingLineNumber = "315" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -1242,8 +1274,8 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "104" - endingLineNumber = "104" + startingLineNumber = "101" + endingLineNumber = "101" landmarkName = "jpushNotificationCenter(_:willPresent:withCompletionHandler:)" landmarkType = "7"> @@ -1381,8 +1413,8 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "129" - endingLineNumber = "129" + startingLineNumber = "126" + endingLineNumber = "126" landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)" landmarkType = "7"> @@ -1637,8 +1669,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "235" - endingLineNumber = "235" + startingLineNumber = "270" + endingLineNumber = "270" landmarkName = "entry(model:remarkId:)" landmarkType = "7"> @@ -2032,8 +2064,8 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "131" - endingLineNumber = "131" + startingLineNumber = "128" + endingLineNumber = "128" landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)" landmarkType = "7"> @@ -2048,8 +2080,8 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "65" - endingLineNumber = "65" + startingLineNumber = "62" + endingLineNumber = "62" landmarkName = "application(_:didReceiveRemoteNotification:)" landmarkType = "7"> @@ -2064,8 +2096,8 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "105" - endingLineNumber = "105" + startingLineNumber = "102" + endingLineNumber = "102" landmarkName = "jpushNotificationCenter(_:willPresent:withCompletionHandler:)" landmarkType = "7"> @@ -2157,28 +2189,12 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "69" - endingLineNumber = "69" + startingLineNumber = "66" + endingLineNumber = "66" landmarkName = "application(_:didReceiveRemoteNotification:fetchCompletionHandler:)" landmarkType = "7"> - - - - @@ -2493,8 +2509,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "560" - endingLineNumber = "560" + startingLineNumber = "564" + endingLineNumber = "564" landmarkName = "viewDidAppear(_:)" landmarkType = "7"> @@ -2509,8 +2525,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "513" - endingLineNumber = "513" + startingLineNumber = "517" + endingLineNumber = "517" landmarkName = "viewDidLoad()" landmarkType = "7"> @@ -2541,8 +2557,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "821" - endingLineNumber = "821" + startingLineNumber = "856" + endingLineNumber = "856" landmarkName = "collectionView(_:didSelectItemAt:)" landmarkType = "7"> @@ -2838,8 +2854,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "310" - endingLineNumber = "310" + startingLineNumber = "345" + endingLineNumber = "345" landmarkName = "addActions()" landmarkType = "7"> @@ -2854,8 +2870,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "299" - endingLineNumber = "299" + startingLineNumber = "334" + endingLineNumber = "334" landmarkName = "addActions()" landmarkType = "7"> @@ -2870,8 +2886,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "301" - endingLineNumber = "301" + startingLineNumber = "336" + endingLineNumber = "336" landmarkName = "addActions()" landmarkType = "7"> @@ -3029,8 +3045,8 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "107" - endingLineNumber = "107" + startingLineNumber = "104" + endingLineNumber = "104" landmarkName = "jpushNotificationCenter(_:willPresent:withCompletionHandler:)" landmarkType = "7"> @@ -3077,8 +3093,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "81" - endingLineNumber = "81" + startingLineNumber = "105" + endingLineNumber = "105" landmarkName = "addActions()" landmarkType = "7"> @@ -3221,8 +3237,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "318" - endingLineNumber = "318" + startingLineNumber = "322" + endingLineNumber = "322" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -3269,8 +3285,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "190" - endingLineNumber = "190" + startingLineNumber = "194" + endingLineNumber = "194" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -3317,8 +3333,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "487" - endingLineNumber = "487" + startingLineNumber = "491" + endingLineNumber = "491" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -3333,8 +3349,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "485" - endingLineNumber = "485" + startingLineNumber = "489" + endingLineNumber = "489" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -3349,8 +3365,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "488" - endingLineNumber = "488" + startingLineNumber = "492" + endingLineNumber = "492" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -3466,5 +3482,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OrderScheduling/Main/AppDelegate.swift b/OrderScheduling/Main/AppDelegate.swift index c37dbf9..b4f0249 100644 --- a/OrderScheduling/Main/AppDelegate.swift +++ b/OrderScheduling/Main/AppDelegate.swift @@ -50,10 +50,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { let tokenString = deviceToken.map { String(format: "%02.2hhx", $0) }.joined() USER.deviceToken = tokenString - USER.regId = JPUSHService.registrationID() - print("deviceToken:\(tokenString)") - print("registrationID:\(JPUSHService.registrationID())") } func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) { @@ -134,6 +131,9 @@ extension AppDelegate : JPUSHRegisterDelegate { func jpushNotificationAuthorization(_ status: JPAuthorizationStatus, withInfo info: [AnyHashable : Any]?) { print("通知授权状态\(status)") + USER.regId = JPUSHService.registrationID() + print("registrationID:\(JPUSHService.registrationID())") + if status != .statusAuthorized { NOTIAUTHTOOL.requestNotiAuthRelay.accept(nil) }else{ diff --git a/OrderScheduling/Main/Initial.swift b/OrderScheduling/Main/Initial.swift index 0b9f1e6..743106e 100644 --- a/OrderScheduling/Main/Initial.swift +++ b/OrderScheduling/Main/Initial.swift @@ -81,8 +81,8 @@ class Initial : NSObject { } NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: Notification_loginSuccessToRescueController), object: nil, queue: .main) {[weak self] note in - window?.rootViewController = MainTabBarController.init() self?.initAppUpdate() + window?.rootViewController = MainTabBarController.init() } } diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index 85bb00e..b216254 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -66,13 +66,37 @@ extension RescueController { }) .disposed(by: disposeBag) - if USER.isLogin == true { - RQ.token(parameters: TokenParameters(refresh_token: USER.refreshToken!)) - .subscribe(onSuccess: { _ in - - }) - .disposed(by: disposeBag) - } + // 刷新token,全屏都不许动 + Observable.just(1) + .observe(on: MainScheduler.instance) + .do(onNext: { _ in + UIApplication.shared.dd_keyWindow.dd_showHUD() + }) + .flatMapLatest { _ in + return RQ.token(parameters: TokenParameters(refresh_token: USER.refreshToken!)) + } + .observe(on: MainScheduler.instance) + .do(onNext: { _ in + UIApplication.shared.dd_keyWindow.dd_hideHUD() + }) + .subscribe(onNext: {[weak self] response in + if response?.success == true { + USER.setToken(token: response?.data?.accessToken.tokenValue) + USER.setRefreshToken(token: response?.data?.refreshToken.tokenValue) + } + // 内容 + if let view = self?.view,let categoryContainerView = self?.categoryContainerView, let categoryView = self?.categoryView { + print(view.safeAreaInsets.bottom) + view.addSubview(categoryContainerView) + categoryView.listContainer = categoryContainerView + categoryContainerView.snp.remakeConstraints({ make in + make.top.equalTo(categoryView.snp.bottom) + make.left.right.equalToSuperview() + make.bottom.equalTo(-view.safeAreaInsets.bottom) + }) + } + }) + .disposed(by: disposeBag) // 点击tabBar 需要刷下下列 preRefreshRelay @@ -83,6 +107,17 @@ extension RescueController { }) .disposed(by: disposeBag) } + + override func viewSafeAreaInsetsDidChange() { + super.viewSafeAreaInsetsDidChange() + if categoryContainerView?.superview != nil { + categoryContainerView?.snp.remakeConstraints({ make in + make.top.equalTo(categoryView.snp.bottom) + make.left.right.equalToSuperview() + make.bottom.equalTo(-view.safeAreaInsets.bottom) + }) + } + } } extension RescuePendingOrderController { @@ -870,15 +905,6 @@ class RescueController : ZDViewController { indicator.indicatorWidth = auto(18) categoryView.indicators = [indicator] - // 内容 - view.addSubview(categoryContainerView!) - categoryView.listContainer = categoryContainerView - categoryContainerView?.snp.makeConstraints({ make in - make.top.equalTo(categoryView.snp.bottom) - make.left.right.equalToSuperview() - make.bottom.equalTo(-(view.safeAreaInsets.bottom+CGRectGetHeight(tabBarController?.tabBar.frame ?? CGRectZero))) - }) - messageView.titleLabel.text = "消息" messageView.addGestureRecognizer(messageTapGes) navigationItem.leftBarButtonItem = UIBarButtonItem(customView: messageView) diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index e3b5741..c4daf24 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -184,6 +184,10 @@ extension VehicleMonitoringController { } extension VehicleMonitoringController : DDMAMapViewDelegate { + public func dd_mapViewRequireLocationAuth(_ locationManager: CLLocationManager) { + locationManager.requestWhenInUseAuthorization() + } + public func dd_mapView(_ mapView: MAMapView, viewFor annotation: MAAnnotation) -> MAAnnotationView { if annotation.isMember(of: MAPointAnnotation.self) { let pointAnnotation = annotation as! MAPointAnnotation