diff --git a/.DS_Store b/.DS_Store index c8f9266..abac53a 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/OrderScheduling.xcodeproj/project.pbxproj b/OrderScheduling.xcodeproj/project.pbxproj index 220573d..0317151 100644 --- a/OrderScheduling.xcodeproj/project.pbxproj +++ b/OrderScheduling.xcodeproj/project.pbxproj @@ -1379,12 +1379,10 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingDebug.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; + DEVELOPMENT_TEAM = X9WF5T89LV; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1416,7 +1414,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "sup dev"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -1492,11 +1489,9 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 8; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; + DEVELOPMENT_TEAM = X9WF5T89LV; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = OrderSchedulingNotificationService/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = OrderSchedulingNotificationService; @@ -1516,7 +1511,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier.OrderSchedulingNotificationService; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "sino supplier notification service extension"; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = "OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h"; diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 2f5cc7f..0d57e3e 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 0861396..eae2642 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -462,8 +462,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewTool.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "61" - endingLineNumber = "61" + startingLineNumber = "62" + endingLineNumber = "62" landmarkName = "init()" landmarkType = "7"> @@ -2958,8 +2958,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewTool.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "64" - endingLineNumber = "64" + startingLineNumber = "65" + endingLineNumber = "65" landmarkName = "init()" landmarkType = "7"> diff --git a/OrderScheduling/Common/WebView/WebViewTool.swift b/OrderScheduling/Common/WebView/WebViewTool.swift index 38ed9f2..eb43cc0 100644 --- a/OrderScheduling/Common/WebView/WebViewTool.swift +++ b/OrderScheduling/Common/WebView/WebViewTool.swift @@ -38,6 +38,7 @@ open class WebViewTool : NSObject { case kpiIndex = "KPI数据统计" case batteryList = "电瓶进销存" case invoiceListInfo = "开票信息" + case indexList = "二手车信息" } public override init() { @@ -136,6 +137,9 @@ open class WebViewTool : NSObject { case .invoiceListInfo: vc = WebViewController(showNavBar:false, title: nil, url: "\((h5Models?.invoiceListInfo)!)?token=\((USER.token)!)"+(appending ?? "")) break + case .indexList: + vc = WebViewController(showNavBar:true, title: WebViewNameEnum.indexList.rawValue, url: "\((h5Models?.indexList)!)?token=\((USER.token)!)"+(appending ?? "")) + break } if let vc { diff --git a/OrderScheduling/HttpResponseModel/ResponseModel.swift b/OrderScheduling/HttpResponseModel/ResponseModel.swift index 99fa487..6723a9c 100644 --- a/OrderScheduling/HttpResponseModel/ResponseModel.swift +++ b/OrderScheduling/HttpResponseModel/ResponseModel.swift @@ -262,6 +262,7 @@ public class DispatchAppH5UrlDataModel : Decodable { var kpiIndex : String var batteryList : String var invoiceListInfo : String + var indexList : String } public class VersionCheckDataModel : Decodable { diff --git a/OrderScheduling/Mine/ViewController/MineController.swift b/OrderScheduling/Mine/ViewController/MineController.swift index 8d66a53..1cdc859 100644 --- a/OrderScheduling/Mine/ViewController/MineController.swift +++ b/OrderScheduling/Mine/ViewController/MineController.swift @@ -147,6 +147,13 @@ extension MineController { }) .disposed(by: disposeBag) + mineView.ershoucheGes.rx.event + .observe(on: MainScheduler.instance) + .subscribe(onNext: { _ in + WEBTOOL.open(name: .indexList, appending: nil) + }) + .disposed(by: disposeBag) + mineView.banbenjianceGes.rx.event .observe(on: MainScheduler.instance) .subscribe(onNext: { _ in @@ -207,6 +214,7 @@ open class MineController : ZDViewController { mineView.dianpingjinxiaocun.titleLabel.text = "电瓶进销存" mineView.peixunwendang.titleLabel.text = "培训文档" mineView.wendangziliao.titleLabel.text = "文档资料" + mineView.ershouche.titleLabel.text = "二手车信息" mineView.banbenjiance.titleLabel.text = "版本检测" mineView.tongzhitixing.titleLabel.text = "通知提醒" @@ -273,6 +281,7 @@ open class MineView : DDView { public let statisticsRadiusView : DDView public let orderRadiusView : DDView public let materialRadiusView : DDView + public let usedCarRadiusView : DDView public let settingsRadiusView : DDView public let shujutongjiGes : UITapGestureRecognizer public let shujutongji : MineCell @@ -290,6 +299,8 @@ open class MineView : DDView { public let peixunwendang : MineCell public let wendangziliaoGes : UITapGestureRecognizer public let wendangziliao : MineCell + public let ershoucheGes : UITapGestureRecognizer + public let ershouche : MineCell public let banbenjianceGes : UITapGestureRecognizer public let banbenjiance : MineCell public let tongzhitixingGes : UITapGestureRecognizer @@ -311,6 +322,7 @@ open class MineView : DDView { statisticsRadiusView = DDView() orderRadiusView = DDView() materialRadiusView = DDView() + usedCarRadiusView = DDView() settingsRadiusView = DDView() shujutongjiGes = UITapGestureRecognizer() shujutongji = MineCell() @@ -328,6 +340,8 @@ open class MineView : DDView { peixunwendang = MineCell() wendangziliaoGes = UITapGestureRecognizer() wendangziliao = MineCell() + ershoucheGes = UITapGestureRecognizer() + ershouche = MineCell() banbenjianceGes = UITapGestureRecognizer() banbenjiance = MineCell() tongzhitixingGes = UITapGestureRecognizer() @@ -363,6 +377,9 @@ open class MineView : DDView { materialRadiusView.backgroundColor = .hex("FFFFFF") materialRadiusView.layer.cornerRadius = auto(6) scrollContentView.addSubview(materialRadiusView) + usedCarRadiusView.backgroundColor = .hex("FFFFFF") + usedCarRadiusView.layer.cornerRadius = auto(6) + scrollContentView.addSubview(usedCarRadiusView) settingsRadiusView.backgroundColor = .hex("FFFFFF") settingsRadiusView.layer.cornerRadius = auto(6) scrollContentView.addSubview(settingsRadiusView) @@ -389,6 +406,9 @@ open class MineView : DDView { wendangziliao.line.isHidden = true wendangziliao.addGestureRecognizer(wendangziliaoGes) materialRadiusView.addSubview(wendangziliao) + ershouche.addGestureRecognizer(ershoucheGes) + ershouche.line.isHidden = true + usedCarRadiusView.addSubview(ershouche) banbenjiance.addGestureRecognizer(banbenjianceGes) settingsRadiusView.addSubview(banbenjiance) tongzhitixing.line.isHidden = true @@ -469,10 +489,17 @@ open class MineView : DDView { make.height.equalTo(auto(110)) } - settingsRadiusView.snp.makeConstraints { make in + usedCarRadiusView.snp.makeConstraints { make in make.top.equalTo(materialRadiusView.snp.bottom).offset(auto(10)) make.width.equalTo(infoRadiusView) make.centerX.equalToSuperview() + make.height.equalTo(auto(55)) + } + + settingsRadiusView.snp.makeConstraints { make in + make.top.equalTo(usedCarRadiusView.snp.bottom).offset(auto(10)) + make.width.equalTo(infoRadiusView) + make.centerX.equalToSuperview() make.height.equalTo(auto(110)) } @@ -519,6 +546,10 @@ open class MineView : DDView { make.left.bottom.right.equalToSuperview() } + ershouche.snp.makeConstraints { make in + make.edges.equalToSuperview() + } + banbenjiance.snp.makeConstraints { make in make.left.top.right.equalToSuperview() make.height.equalTo(auto(55)) diff --git a/fastlane/report.xml b/fastlane/report.xml index 54918a7..38a3cb4 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +