diff --git a/.DS_Store b/.DS_Store index 1a8f517..6e4d827 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/OrderScheduling.xcodeproj/project.pbxproj b/OrderScheduling.xcodeproj/project.pbxproj index ec3500c..f59aca5 100644 --- a/OrderScheduling.xcodeproj/project.pbxproj +++ b/OrderScheduling.xcodeproj/project.pbxproj @@ -1170,7 +1170,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; FRAMEWORK_SEARCH_PATHS = ( @@ -1385,7 +1385,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; @@ -1444,7 +1444,7 @@ CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; FRAMEWORK_SEARCH_PATHS = ( diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index d86fa30..b1b3d89 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 b82bcf8..80b5880 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -1294,8 +1294,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "777" - endingLineNumber = "777" + startingLineNumber = "770" + endingLineNumber = "770" landmarkName = "viewDidLoad()" landmarkType = "7"> @@ -3118,8 +3118,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "824" - endingLineNumber = "824" + startingLineNumber = "817" + endingLineNumber = "817" landmarkName = "addSubviews()" landmarkType = "7"> @@ -3230,8 +3230,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "889" - endingLineNumber = "889" + startingLineNumber = "882" + endingLineNumber = "882" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -3310,8 +3310,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1283" - endingLineNumber = "1283" + startingLineNumber = "1276" + endingLineNumber = "1276" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -3326,8 +3326,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1295" - endingLineNumber = "1295" + startingLineNumber = "1288" + endingLineNumber = "1288" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -3342,8 +3342,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1297" - endingLineNumber = "1297" + startingLineNumber = "1290" + endingLineNumber = "1290" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -3390,8 +3390,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1124" - endingLineNumber = "1124" + startingLineNumber = "1117" + endingLineNumber = "1117" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -3406,8 +3406,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1431" - endingLineNumber = "1431" + startingLineNumber = "1424" + endingLineNumber = "1424" landmarkName = "updateData(taskModel:)" landmarkType = "7"> @@ -3438,8 +3438,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1286" - endingLineNumber = "1286" + startingLineNumber = "1279" + endingLineNumber = "1279" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -3454,8 +3454,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1299" - endingLineNumber = "1299" + startingLineNumber = "1292" + endingLineNumber = "1292" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -3470,8 +3470,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1129" - endingLineNumber = "1129" + startingLineNumber = "1122" + endingLineNumber = "1122" landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkType = "7"> @@ -3486,8 +3486,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1298" - endingLineNumber = "1298" + startingLineNumber = "1291" + endingLineNumber = "1291" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -3518,8 +3518,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "649" - endingLineNumber = "649" + startingLineNumber = "642" + endingLineNumber = "642" landmarkName = "showListDetail(vehicleModel:)" landmarkType = "7"> @@ -3566,8 +3566,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "869" - endingLineNumber = "869" + startingLineNumber = "862" + endingLineNumber = "862" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -3582,8 +3582,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "875" - endingLineNumber = "875" + startingLineNumber = "868" + endingLineNumber = "868" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -3598,8 +3598,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "881" - endingLineNumber = "881" + startingLineNumber = "874" + endingLineNumber = "874" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -3678,8 +3678,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1437" - endingLineNumber = "1437" + startingLineNumber = "1430" + endingLineNumber = "1430" landmarkName = "listView()" landmarkType = "7"> @@ -3758,8 +3758,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "903" - endingLineNumber = "903" + startingLineNumber = "896" + endingLineNumber = "896" landmarkName = "viewDidAppear(_:)" landmarkType = "7"> @@ -4366,8 +4366,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "641" - endingLineNumber = "641" + startingLineNumber = "634" + endingLineNumber = "634" landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)" landmarkType = "7"> diff --git a/OrderScheduling/HttpResponseModel/ResponseModel.swift b/OrderScheduling/HttpResponseModel/ResponseModel.swift index 0ed6d23..46ae715 100644 --- a/OrderScheduling/HttpResponseModel/ResponseModel.swift +++ b/OrderScheduling/HttpResponseModel/ResponseModel.swift @@ -81,39 +81,21 @@ class OrderListDataModel: Decodable { var isSupplierSettle : SupplierSettleModel? var supplierSettleRatio : SupplierSettleRatioModel? class SupplierSettleModel : Decodable { - var code : IsSupplierSettleEnum + var code : Int var label : String } class SupplierSettleRatioModel : Decodable { - var code : SupplierSettleRatioEnum + var code : Int var label : String } class PositionEnvironmentModel : Decodable { - var code : positionEnvironment + var code : Int var label : String } enum IsSupplierSettleEnum : Int,Decodable { case NO = 0 case YES = 1 } - enum SupplierSettleRatioEnum : Int, Decodable { - case NO_SETTLE = 0 - case ALL_SETTLE = 1 - case DROP_SETTLE = 2 - case SERVICE_FAIL_SETTLE = 3 - case TRAIL_CAR_SETTLE = 4 - } - enum positionEnvironment : Int,Decodable { - case ground = 1 - case elevated_road = 2 - case expressway = 3 - case tunnel = 4 - case bridge = 5 - case underground = 6 - case high_rise_car_park = 7 - case crane_rescue = 8 - case wading = 9 - } } enum VehicleStatusCodeEnum : Int, Decodable { @@ -126,12 +108,12 @@ enum VehicleStatusCodeEnum : Int, Decodable { } class VehicleStatusModel : Decodable { - var code : VehicleStatusCodeEnum + var code : Int var label : String } class OnlineStatusModel : Decodable { - var code : OnlineStatusCodeEnum + var code : Int var label : String enum OnlineStatusCodeEnum : Int, Decodable { case offLine = 1 @@ -188,7 +170,7 @@ public class VehicleMonitorListDataModel : Decodable { var driverName : String? var driverPhone : String var vehicleType : String? - var terminalType : TerminalTypeEnum? + var terminalType : String? var vehicleStatus : VehicleStatusModel? var onlineStatus : OnlineStatusModel? var alarmType : AlarmType? @@ -217,15 +199,9 @@ public class VehicleMonitorListDataModel : Decodable { } public class AlarmType : Decodable { - var code : AlarmTypeEnum + var code : Int var label : String } - public enum AlarmTypeEnum : Int,Decodable { - case dropped = 1 - case busy = 2 - case empty_shift = 3 - } - } public class TaskModel : Decodable { @@ -295,20 +271,13 @@ public class VersionCheckDataModel : Decodable { var label : String } class TypeModel : Decodable { - var code : AppTypeEnum + var code : Int var label : String } enum UpdateEnum : Int,Decodable { case NO = 0 case YES = 1 } - enum AppTypeEnum : Int,Decodable { - case app_type_1 = 1 - case app_type_2 = 2 - case app_type_3 = 3 - case app_type_4 = 4 - case app_type_5 = 5 - } var updateTime : String? var createTime : String? var description : String? @@ -318,15 +287,11 @@ public class MessageReminderListDataModel : Decodable { var id : Int var msgType : MsgType class MsgType : Decodable { - var code : MsgTypeEnum + var code : Int var label : String } - enum MsgTypeEnum : Int,Decodable { - case DEPARTURE_REMINDER = 1 - case CUSTOMER_REMINDER = 2 - } var title : String - var titleContent : String + var titleContent : String? var titleColor : String var content : String? var imgPath : String? diff --git a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift index 3501eef..a229e76 100644 --- a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift +++ b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift @@ -171,27 +171,27 @@ extension DispatchOrderController { var middleImage : UIImage? switch vehicleModel.vehicleStatus?.code { - case .offLine,.lostConnection: + case VehicleStatusCodeEnum.offLine.rawValue,VehicleStatusCodeEnum.lostConnection.rawValue: backgroundColor = .hex("858585") bigImage = UIImage(named: "vehicleMonitoring_offline_big") middleImage = UIImage(named: "vehicleMonitor_offline_cell_flag_bg") break - case .onLine,.leisure: + case VehicleStatusCodeEnum.onLine.rawValue,VehicleStatusCodeEnum.leisure.rawValue: backgroundColor = .hex("067BB9") bigImage = UIImage(named: "vehicleMonitoring_empty_big") middleImage = UIImage(named: "vehicleMonitor_empty_cell_flag_bg") break - case .busy: + case VehicleStatusCodeEnum.busy.rawValue: backgroundColor = .hex("F05412") bigImage = UIImage(named: "vehicleMonitoring_busy_big") middleImage = UIImage(named: "vehicleMonitor_busy_cell_onlne_bg") break - case .BuyBusy: + case VehicleStatusCodeEnum.BuyBusy.rawValue: backgroundColor = .hex("F05412") bigImage = UIImage(named: "vehicleMonitoring_busy_big") middleImage = UIImage(named: "vehicleMonitor_busy_cell_onlne_bg") break - case .none: + default: backgroundColor = .hex("858585") bigImage = UIImage(named: "vehicleMonitoring_offline_big") middleImage = UIImage(named: "vehicleMonitor_offline_cell_flag_bg") @@ -199,7 +199,7 @@ extension DispatchOrderController { } switch vehicleModel.onlineStatus?.code { - case .onLine: + case OnlineStatusModel.OnlineStatusCodeEnum.onLine.rawValue: annotationView.bigStateLabel.textColor = .white annotationView.middleStateLabel.textColor = .white break @@ -344,31 +344,31 @@ extension DispatchOrderController : UITableViewDelegate,UITableViewDataSource { let model = resultArr[indexPath.item] switch model.vehicleStatus?.code { - case .offLine,.lostConnection: + case VehicleStatusCodeEnum.offLine.rawValue,VehicleStatusCodeEnum.lostConnection.rawValue: cell?.icon.image = UIImage(named: "vehicleMonitor_offline_cell_flag_bg") cell?.stateLabel.textColor = .hex("787878") cell?.name.textColor = .hex("787878") cell?.distance.textColor = .hex("787878") break - case .onLine,.leisure: + case VehicleStatusCodeEnum.onLine.rawValue,VehicleStatusCodeEnum.leisure.rawValue: cell?.icon.image = UIImage(named: "vehicleMonitor_empty_cell_flag_bg") cell?.stateLabel.textColor = .hex("3364B7") cell?.name.textColor = .hex("3364B7") cell?.distance.textColor = .hex("3364B7") break - case .busy: + case VehicleStatusCodeEnum.busy.rawValue: cell?.icon.image = UIImage(named: "vehicleMonitor_busy_cell_onlne_bg") cell?.stateLabel.textColor = .hex("FA5714") cell?.name.textColor = .hex("FA5714") cell?.distance.textColor = .hex("FA5714") break - case .BuyBusy: + case VehicleStatusCodeEnum.BuyBusy.rawValue: cell?.icon.image = UIImage(named: "vehicleMonitor_busy_cell_onlne_bg") cell?.stateLabel.textColor = .hex("FA5714") cell?.name.textColor = .hex("FA5714") cell?.distance.textColor = .hex("FA5714") break - case .none: + default: cell?.icon.image = UIImage(named: "vehicleMonitor_offline_cell_flag_bg") cell?.stateLabel.textColor = .hex("787878") cell?.name.textColor = .hex("787878") @@ -377,7 +377,7 @@ extension DispatchOrderController : UITableViewDelegate,UITableViewDataSource { } switch model.onlineStatus?.code { - case .onLine: + case OnlineStatusModel.OnlineStatusCodeEnum.onLine.rawValue: cell?.iconStateLabel.textColor = .white break default: @@ -388,7 +388,7 @@ extension DispatchOrderController : UITableViewDelegate,UITableViewDataSource { cell?.iconStateLabel.text = model.vehicleTypeStr var status = model.vehicleStatus?.label ?? "" - if model.onlineStatus?.code == .lostConnection { + if model.onlineStatus?.code == OnlineStatusModel.OnlineStatusCodeEnum.lostConnection.rawValue { status = status + "," + (model.onlineStatus?.label ?? "") } cell?.stateLabel.text = (model.vehicleName ?? "")+"/"+status diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index 33e5a77..75d69bf 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -191,7 +191,7 @@ extension VehicleMonitoringController { .subscribe(onNext: {[weak self] _ in if let view = self?.vehicleConfigView { var isShowMonitoring = false - if USER.supplierType == 1 && self?.selectedModel?.terminalType == .GPS { + if USER.supplierType == 1 && self?.selectedModel?.terminalType == VehicleMonitorListDataModel.ItemModel.TerminalTypeEnum.GPS.rawValue { isShowMonitoring = true }else{ isShowMonitoring = false @@ -555,38 +555,31 @@ extension VehicleMonitoringController { var bigImage : UIImage? var middleImage : UIImage? - if let alarmType = vehicleModel.alarmType { - switch alarmType.code { - case .busy: - - break - default: - - break - } + if let _ = vehicleModel.alarmType { + }else{ switch vehicleModel.vehicleStatus?.code { - case .offLine,.lostConnection: + case VehicleStatusCodeEnum.offLine.rawValue,VehicleStatusCodeEnum.lostConnection.rawValue: backgroundColor = .hex("858585") bigImage = UIImage(named: "vehicleMonitoring_offline_big") middleImage = UIImage(named: "vehicleMonitor_offline_cell_flag_bg") break - case .onLine,.leisure: + case VehicleStatusCodeEnum.onLine.rawValue,VehicleStatusCodeEnum.leisure.rawValue: backgroundColor = .hex("067BB9") bigImage = UIImage(named: "vehicleMonitoring_empty_big") middleImage = UIImage(named: "vehicleMonitor_empty_cell_flag_bg") break - case .busy: + case VehicleStatusCodeEnum.busy.rawValue: backgroundColor = .hex("F05412") bigImage = UIImage(named: "vehicleMonitoring_busy_big") middleImage = UIImage(named: "vehicleMonitor_busy_cell_onlne_bg") break - case .BuyBusy: + case VehicleStatusCodeEnum.BuyBusy.rawValue: backgroundColor = .hex("F05412") bigImage = UIImage(named: "vehicleMonitoring_busy_big") middleImage = UIImage(named: "vehicleMonitor_busy_cell_onlne_bg") break - case .none: + default: backgroundColor = .hex("858585") bigImage = UIImage(named: "vehicleMonitoring_offline_big") middleImage = UIImage(named: "vehicleMonitor_offline_cell_flag_bg") @@ -594,7 +587,7 @@ extension VehicleMonitoringController { } switch vehicleModel.onlineStatus?.code { - case .onLine: + case OnlineStatusModel.OnlineStatusCodeEnum.onLine.rawValue: annotationView.bigStateLabel.textColor = .white annotationView.middleStateLabel.textColor = .white break @@ -649,19 +642,19 @@ extension VehicleMonitoringController { vehicleMonitoringListDetailView.vehicleLabel.text = vehicleModel.vehicleName switch vehicleModel.vehicleStatus?.code { - case .offLine,.lostConnection: + case VehicleStatusCodeEnum.offLine.rawValue,VehicleStatusCodeEnum.lostConnection.rawValue: vehicleMonitoringListDetailView.icon.image = UIImage(named: "vehicleMonitor_offline_cell_flag_bg") break - case .onLine,.leisure: + case VehicleStatusCodeEnum.onLine.rawValue,VehicleStatusCodeEnum.leisure.rawValue: vehicleMonitoringListDetailView.icon.image = UIImage(named: "vehicleMonitor_empty_cell_flag_bg") break - case .busy: + case VehicleStatusCodeEnum.busy.rawValue: vehicleMonitoringListDetailView.icon.image = UIImage(named: "vehicleMonitor_busy_cell_onlne_bg") break - case .BuyBusy: + case VehicleStatusCodeEnum.BuyBusy.rawValue: vehicleMonitoringListDetailView.icon.image = UIImage(named: "vehicleMonitor_busy_cell_onlne_bg") break - case .none: + default: vehicleMonitoringListDetailView.icon.image = UIImage(named: "vehicleMonitor_offline_cell_flag_bg") break } diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift index f63cab9..ef7f92d 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift @@ -52,25 +52,25 @@ extension VehicleMonitoringListController : UITableViewDelegate,UITableViewDataS } switch model.vehicleStatus?.code { - case .offLine,.lostConnection: + case VehicleStatusCodeEnum.offLine.rawValue,VehicleStatusCodeEnum.lostConnection.rawValue: cell?.icon.image = UIImage(named: "vehicleMonitor_offline_cell_flag_bg") break - case .onLine,.leisure: + case VehicleStatusCodeEnum.onLine.rawValue,VehicleStatusCodeEnum.leisure.rawValue: cell?.icon.image = UIImage(named: "vehicleMonitor_empty_cell_flag_bg") break - case .busy: + case VehicleStatusCodeEnum.busy.rawValue: cell?.icon.image = UIImage(named: "vehicleMonitor_busy_cell_onlne_bg") break - case .BuyBusy: + case VehicleStatusCodeEnum.BuyBusy.rawValue: cell?.icon.image = UIImage(named: "vehicleMonitor_busy_cell_onlne_bg") break - case .none: + default: cell?.icon.image = UIImage(named: "vehicleMonitor_offline_cell_flag_bg") break } switch model.onlineStatus?.code { - case .onLine: + case OnlineStatusModel.OnlineStatusCodeEnum.onLine.rawValue: cell?.stateLabel.textColor = .white break default: