| BrokerDriver.xcodeproj/project.pbxproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Home/VC/HomeDetailContentVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Home/VC/HomePageVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Login/VC/LoginVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Network/Services.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/ViewModels/OrderViewModel.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Podfile | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
BrokerDriver.xcodeproj/project.pbxproj
@@ -812,8 +812,11 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9BAWVRPFM; EXCLUDED_ARCHS = "i386 armv7 armv7s"; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = BrokerDriver/Info.plist; @@ -832,6 +835,8 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.broker.BrokerDriver; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = dev_profile; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -844,8 +849,11 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9BAWVRPFM; EXCLUDED_ARCHS = "i386 armv7 armv7s"; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = BrokerDriver/Info.plist; @@ -864,6 +872,8 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.broker.BrokerDriver; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = adHoc_profile; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; BrokerDriver/Home/VC/HomeDetailContentVC.swift
@@ -124,7 +124,7 @@ } private func getData(){ Services.orderInfo(id: orderId, type:type).subscribe(onNext: { [weak self] data in Services.orderInfo(id: orderId).subscribe(onNext: { [weak self] data in if let model = data.data{ self?.model = model } BrokerDriver/Home/VC/HomePageVC.swift
@@ -34,6 +34,7 @@ let tableView = BaseTableView(frame: .zero, style: .plain) tableView.delegate = self tableView.dataSource = self tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: 100, right: 0) tableView.separatorStyle = .none tableView.backgroundColor = .clear tableView.register(UINib(nibName: "HomeItemTCell", bundle: nil), forCellReuseIdentifier: "_HomeItemTCell") @@ -116,11 +117,11 @@ } func scrollViewDidScroll(_ scrollView: UIScrollView) { if scrollView.contentOffset.y >= 0{ adapterViewController.scrollview.contentOffset = scrollView.contentOffset } } // func scrollViewDidScroll(_ scrollView: UIScrollView) { // if scrollView.contentOffset.y >= 0{ // adapterViewController.scrollview.contentOffset = scrollView.contentOffset // } // } override func setUI() { super.setUI() BrokerDriver/Login/VC/LoginVC.swift
@@ -18,7 +18,7 @@ #if DEBUG tf_email.text = "eeee" tf_email.text = "1511311473@qq.com" tf_pwd.text = "111111" #endif @@ -63,7 +63,7 @@ } } }) { error in }.disposed(by: disposeBag) } } BrokerDriver/Network/Services.swift
@@ -14,7 +14,7 @@ let All_Url = "http://192.168.110.22:8040" let Google_Url = "https://roads.googleapis.com/v1" #else let All_Url = "http://192.168.110.22:8040" let All_Url = "http://54.67.44.33:8040" let Google_Url = "https://roads.googleapis.com/v1" #endif @@ -28,7 +28,7 @@ .interface(url: "/gunsApi/companyLogin") .append(key: "username", value: username) .append(key: "password", value: password) return NetworkRequest.requestCode(params: params, method: .post, progress: true) return NetworkRequest.request(params: params, method: .post, progress: true) } class func getCompanyInfo()->Observable<BaseResponse<UserCompanyModel>>{ @@ -67,10 +67,10 @@ return NetworkRequest.request(params: params, method: .get, progress: false) } class func orderInfo(id:String,type:Int)->Observable<BaseResponse<OrderDetailModel>>{ class func orderInfo(id:String)->Observable<BaseResponse<OrderDetailModel>>{ let params = ParamsAppender.build(url: All_Url) .interface(url: "/api/index/orderInfo") .append(key: "type", value:type) .append(key: "driverId", value:UserViewModel.getUserInfo()!.id) .append(key: "id", value: id) return NetworkRequest.request(params: params, method: .get, progress: true) } BrokerDriver/ViewModels/OrderViewModel.swift
@@ -32,7 +32,7 @@ var status: OrderType = .None var nextStatus:OrderType = .None var tGoods: OrderDetailGoodsModel? var type: String = "" var type: Int = 0 } struct OrderDetailGoodsModel:HandyJSON { Podfile
@@ -6,7 +6,7 @@ inhibit_all_warnings! # Pods for BrokerDriver pod 'JQTools',:path=> '/Users/yvkd/MyProject/JQTools' pod 'JQTools',:path=> '/Users/yangkai/Developer/MyProject/JQTools' pod 'FFPage' pod 'SPPageMenu' pod 'HandyJSON' @@ -14,15 +14,15 @@ pod 'MBProgressHUD' pod 'SwifterSwift' pod 'Lantern' pod 'GoogleMaps' pod 'GoogleMaps','7.4.0' pod 'GooglePlaces' post_install do |installer| installer.pods_project.targets.each do |target| target.build_configurations.each do |config| config.build_settings['CODE_SIGN_IDENTITY'] = '' config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' end end end end
