diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 882be48..f0d15f1 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 a326b5d..b0b64c8 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -253,8 +253,8 @@ filePath = "OrderScheduling/Main/Initial.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "119" - endingLineNumber = "119" + startingLineNumber = "127" + endingLineNumber = "127" landmarkName = "networkErrorHandler(response:)" landmarkType = "7"> @@ -269,10 +269,10 @@ filePath = "OrderScheduling/Main/Initial.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "120" - endingLineNumber = "120" - landmarkName = "networkErrorHandler(response:)" - landmarkType = "7"> + startingLineNumber = "128" + endingLineNumber = "128" + landmarkName = "Initial" + landmarkType = "21"> - - - - - - - - - - - - - - @@ -867,112 +803,16 @@ - - - - - - - - - - - - - - - - - - - - @@ -1274,8 +1114,8 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "101" - endingLineNumber = "101" + startingLineNumber = "102" + endingLineNumber = "102" landmarkName = "jpushNotificationCenter(_:willPresent:withCompletionHandler:)" landmarkType = "7"> @@ -1397,8 +1237,8 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "137" - endingLineNumber = "137" + startingLineNumber = "138" + endingLineNumber = "138" landmarkName = "jpushNotificationAuthorization(_:withInfo:)" landmarkType = "7"> @@ -1413,8 +1253,8 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "125" - endingLineNumber = "125" + startingLineNumber = "126" + endingLineNumber = "126" landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)" landmarkType = "7"> @@ -1573,8 +1413,8 @@ filePath = "OrderScheduling/Main/Initial.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "105" - endingLineNumber = "105" + startingLineNumber = "113" + endingLineNumber = "113" landmarkName = "changeRootViewController(window:)" landmarkType = "7"> @@ -2032,8 +1872,8 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "43" - endingLineNumber = "43" + startingLineNumber = "44" + endingLineNumber = "44" landmarkName = "applicationDidBecomeActive(_:)" landmarkType = "7"> @@ -2048,8 +1888,8 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "127" - endingLineNumber = "127" + startingLineNumber = "128" + endingLineNumber = "128" landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)" landmarkType = "7"> @@ -2064,10 +1904,10 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "62" - endingLineNumber = "62" - landmarkName = "application(_:didReceiveRemoteNotification:)" - landmarkType = "7"> + startingLineNumber = "63" + endingLineNumber = "63" + landmarkName = "AppDelegate" + landmarkType = "3"> @@ -2173,8 +2013,8 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "66" - endingLineNumber = "66" + startingLineNumber = "67" + endingLineNumber = "67" landmarkName = "application(_:didReceiveRemoteNotification:fetchCompletionHandler:)" landmarkType = "7"> @@ -2189,9 +2029,9 @@ filePath = "OrderScheduling/Main/Initial.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "96" - endingLineNumber = "96" - landmarkName = "initRootViewController()" + startingLineNumber = "104" + endingLineNumber = "104" + landmarkName = "changeRootViewController(window:)" landmarkType = "7"> @@ -2317,10 +2157,10 @@ filePath = "OrderScheduling/Main/Initial.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "111" - endingLineNumber = "111" - landmarkName = "changeRootViewController(window:)" - landmarkType = "7"> + startingLineNumber = "119" + endingLineNumber = "119" + landmarkName = "Initial" + landmarkType = "3"> @@ -3540,8 +3380,8 @@ filePath = "OrderScheduling/Main/AppDelegate.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "136" - endingLineNumber = "136" + startingLineNumber = "137" + endingLineNumber = "137" landmarkName = "jpushNotificationAuthorization(_:withInfo:)" landmarkType = "7"> diff --git a/OrderScheduling/Assets.xcassets/Common/.DS_Store b/OrderScheduling/Assets.xcassets/Common/.DS_Store new file mode 100644 index 0000000..b5f2afd Binary files /dev/null and b/OrderScheduling/Assets.xcassets/Common/.DS_Store differ diff --git a/OrderScheduling/Assets.xcassets/DispatchOrder/.DS_Store b/OrderScheduling/Assets.xcassets/DispatchOrder/.DS_Store new file mode 100644 index 0000000..3ba79c6 Binary files /dev/null and b/OrderScheduling/Assets.xcassets/DispatchOrder/.DS_Store differ diff --git a/OrderScheduling/Assets.xcassets/Login/.DS_Store b/OrderScheduling/Assets.xcassets/Login/.DS_Store new file mode 100644 index 0000000..3c62819 Binary files /dev/null and b/OrderScheduling/Assets.xcassets/Login/.DS_Store differ diff --git a/OrderScheduling/Assets.xcassets/Mine/.DS_Store b/OrderScheduling/Assets.xcassets/Mine/.DS_Store new file mode 100644 index 0000000..c69f3f7 Binary files /dev/null and b/OrderScheduling/Assets.xcassets/Mine/.DS_Store differ diff --git a/OrderScheduling/Assets.xcassets/RefuseOrderEntry/.DS_Store b/OrderScheduling/Assets.xcassets/RefuseOrderEntry/.DS_Store new file mode 100644 index 0000000..22edb5a Binary files /dev/null and b/OrderScheduling/Assets.xcassets/RefuseOrderEntry/.DS_Store differ diff --git a/OrderScheduling/Assets.xcassets/Rescue/.DS_Store b/OrderScheduling/Assets.xcassets/Rescue/.DS_Store new file mode 100644 index 0000000..edea451 Binary files /dev/null and b/OrderScheduling/Assets.xcassets/Rescue/.DS_Store differ diff --git a/OrderScheduling/Assets.xcassets/ReviewFailed/.DS_Store b/OrderScheduling/Assets.xcassets/ReviewFailed/.DS_Store new file mode 100644 index 0000000..c4c0c51 Binary files /dev/null and b/OrderScheduling/Assets.xcassets/ReviewFailed/.DS_Store differ diff --git a/OrderScheduling/Assets.xcassets/TabBar/.DS_Store b/OrderScheduling/Assets.xcassets/TabBar/.DS_Store new file mode 100644 index 0000000..48c0d26 Binary files /dev/null and b/OrderScheduling/Assets.xcassets/TabBar/.DS_Store differ diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/.DS_Store b/OrderScheduling/Assets.xcassets/VehicleMonitoring/.DS_Store new file mode 100644 index 0000000..d934478 Binary files /dev/null and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/.DS_Store differ diff --git a/OrderScheduling/Login/ViewController/LoginController.swift b/OrderScheduling/Login/ViewController/LoginController.swift index 2544fa9..3480468 100644 --- a/OrderScheduling/Login/ViewController/LoginController.swift +++ b/OrderScheduling/Login/ViewController/LoginController.swift @@ -14,7 +14,6 @@ import DDTimerKit_Private import DDProgressHUDKit_Private import DDAutoUIKit_Private import DDControlsKit_Private -import CocoaDebug class LoginController : ZDViewController { private let disposeBag = DisposeBag() diff --git a/OrderScheduling/Main/AppDelegate.swift b/OrderScheduling/Main/AppDelegate.swift index 4c994be..f6e8ecb 100644 --- a/OrderScheduling/Main/AppDelegate.swift +++ b/OrderScheduling/Main/AppDelegate.swift @@ -6,7 +6,7 @@ // import UIKit -import CocoaDebug +import DDLogKit_Private class AppDelegate: UIResponder, UIApplicationDelegate { @@ -50,11 +50,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate { let tokenString = deviceToken.map { String(format: "%02.2hhx", $0) }.joined() USER.deviceToken = tokenString - print("deviceToken:\(tokenString)") + DDLog(message: "deviceToken:\(tokenString)") } func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) { - print("did fail to register for remote notification with error ", error) + DDLog(message: ("did fail to register for remote notification with error ", error)) } func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any]) { @@ -86,10 +86,10 @@ extension AppDelegate : JPUSHRegisterDelegate { func jpushNotificationCenter(_ center: UNUserNotificationCenter, openSettingsFor notification: UNNotification) { if notification.request.trigger?.isKind(of: UNPushNotificationTrigger.self) == true { // 从通知页面进入应用 - print("ios12从通知页面进入应用") + DDLog(message:"ios12从通知页面进入应用") }else{ // 从通知设置进入应用 - print("ios12从通知设置进入应用") + DDLog(message:"ios12从通知设置进入应用") } } @@ -129,9 +129,9 @@ extension AppDelegate : JPUSHRegisterDelegate { } func jpushNotificationAuthorization(_ status: JPAuthorizationStatus, withInfo info: [AnyHashable : Any]?) { - print("通知授权状态\(status)") + DDLog(message:"通知授权状态\(status)") USER.regId = JPUSHService.registrationID() - print("registrationID:\(JPUSHService.registrationID())") + DDLog(message:"registrationID:\(JPUSHService.registrationID())") if status != .statusAuthorized { NOTIAUTHTOOL.requestNotiAuthRelay.accept(nil) diff --git a/OrderScheduling/Main/Initial.swift b/OrderScheduling/Main/Initial.swift index f95c695..8ca2b32 100644 --- a/OrderScheduling/Main/Initial.swift +++ b/OrderScheduling/Main/Initial.swift @@ -14,7 +14,9 @@ import Alamofire import DDToastKit_Private import DDCategoryKit_Private import DDControlsKit_Private +#if DEBUG import CocoaDebug +#endif import RxSwift class Initial : NSObject { @@ -64,7 +66,9 @@ class Initial : NSObject { } func initCocoaDebug() { + #if DEBUG CocoaDebug.hideBubble() + #endif } func initCall() {