完善

younger_times

2023-05-05 e1c01139778be6f2f96d359fa3db5f8ce60f80d9

完善

 BrokerDriver.xcodeproj/project.pbxproj

@@ -459,6 +459,7 @@
                138DA4B129F62F9500A71FE7 /* Frameworks */,
                138DA4B229F62F9500A71FE7 /* Resources */,
                23C4AAD23341800058A35A41 /* [CP] Embed Pods Frameworks */,
                535529A1A5A3B723AF54D8E1 /* [CP] Copy Pods Resources */,
            );
            buildRules = (
            );
@@ -560,6 +561,23 @@
            shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-BrokerDriver/Pods-BrokerDriver-frameworks.sh\"\n";
            showEnvVarsInLog = 0;
        };
        535529A1A5A3B723AF54D8E1 /* [CP] Copy Pods Resources */ = {
            isa = PBXShellScriptBuildPhase;
            buildActionMask = 2147483647;
            files = (
            );
            inputFileListPaths = (
                "${PODS_ROOT}/Target Support Files/Pods-BrokerDriver/Pods-BrokerDriver-resources-${CONFIGURATION}-input-files.xcfilelist",
            );
            name = "[CP] Copy Pods Resources";
            outputFileListPaths = (
                "${PODS_ROOT}/Target Support Files/Pods-BrokerDriver/Pods-BrokerDriver-resources-${CONFIGURATION}-output-files.xcfilelist",
            );
            runOnlyForDeploymentPostprocessing = 0;
            shellPath = /bin/sh;
            shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-BrokerDriver/Pods-BrokerDriver-resources.sh\"\n";
            showEnvVarsInLog = 0;
        };
        541DEF03651AC9A1F93D5BE7 /* [CP] Check Pods Manifest.lock */ = {
            isa = PBXShellScriptBuildPhase;
            buildActionMask = 2147483647;

 BrokerDriver/Base/BaseNavigationController.swift

@@ -31,12 +31,16 @@
            scrollBar.backgroundColor = UIColor.clear


            let img = UIImage.jq_gradient([UIColor.black.withAlphaComponent(0.4),UIColor.clear], size: CGSize(width: JQ_ScreenW, height: JQ_NavBarHeight), radius: 0, locations: [0,1], direction: .vertical)

            let standardBar = UINavigationBarAppearance()
            standardBar.configureWithOpaqueBackground()
            standardBar.backgroundEffect = nil
            standardBar.shadowColor = nil
            standardBar.shadowImage = nil
            standardBar.titleTextAttributes = [.foregroundColor:Def_NavFontColor,.font:Def_NavFont]
            standardBar.backgroundColor = UIColor.clear
            standardBar.backgroundImage = img

            navigationBar.scrollEdgeAppearance = scrollBar //顶部透明
            navigationBar.standardAppearance = standardBar

 BrokerDriver/Home/VC/HomeDetailAttachVC.swift

@@ -70,8 +70,13 @@
    }

    func scrollViewDidScroll(_ scrollView: UIScrollView) {
        let offetY = -(scrollView.contentOffset.y - UIDevice.jq_safeEdges.top) + UIDevice.jq_safeEdges.top + 30
        if offetY >= 0 {


        let totalHeight = adapterViewController.headHeight
        let offset =  totalHeight - scrollView.contentOffset.y
        let isTop = (offset - topSafeHeight) < 0

        if scrollView.contentOffset.y > 0 && !isTop{
            adapterViewController.scrollview.contentOffset = scrollView.contentOffset
        }
    }

 BrokerDriver/Home/VC/HomeDetailContentVC.swift

@@ -19,6 +19,7 @@
    @IBOutlet weak var contentTableView: UITableView!
    @IBOutlet weak var contentTableHeiCons: NSLayoutConstraint!
    @IBOutlet weak var label_BLN: UILabel!
    @IBOutlet weak var label_status: UILabel!

    var adapterViewController:FFAdapterViewController!

@@ -31,6 +32,7 @@
                label_id.text = m.orderId
                icon_id.image = m.status.transImage
                label_BLN.text = "B/L OR AWB NO.:\(m.tGoods?.containerNumber ?? "")"
                label_status.text = m.nextStatus.transStr
                contentTableView.reloadData()
                cargoTableview.reloadData()

@@ -90,6 +92,12 @@
        }).disposed(by: disposeBag)
    }

    @IBAction func tapAction(_ sender: TapButton) {
        print("---->")
    }



    required init?(coder: NSCoder) {
        fatalError("init(coder:) has not been implemented")
    }
@@ -97,8 +105,13 @@

extension HomeDetailContentVC:UIScrollViewDelegate{
    func scrollViewDidScroll(_ scrollView: UIScrollView) {
        let offetY = -(scrollView.contentOffset.y - UIDevice.jq_safeEdges.top) + UIDevice.jq_safeEdges.top + 30
        if offetY >= 0 {


        let totalHeight = adapterViewController.headHeight
        let offset =  totalHeight - scrollView.contentOffset.y
        let isTop = (offset - topSafeHeight) < 0

        if scrollView.contentOffset.y > 0 && !isTop{
            adapterViewController.scrollview.contentOffset = scrollView.contentOffset
        }
    }

 BrokerDriver/Home/VC/HomeDetailContentVC.xib

@@ -18,6 +18,7 @@
                <outlet property="icon_id" destination="dxz-eo-8V9" id="k3M-65-5bl"/>
                <outlet property="label_BLN" destination="g2O-U5-pwS" id="MlO-7O-AIo"/>
                <outlet property="label_id" destination="mAs-6B-l9W" id="w1e-KY-eAa"/>
                <outlet property="label_status" destination="75W-Za-jGl" id="wfG-bd-Yce"/>
                <outlet property="label_type" destination="5Xf-g6-HxA" id="pwC-nh-cre"/>
                <outlet property="scrollView" destination="RZZ-lC-T7W" id="Arq-58-WYM"/>
                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
@@ -186,7 +187,7 @@
                        <constraint firstItem="aoZ-mE-xqn" firstAttribute="top" secondItem="Sh7-2N-mvt" secondAttribute="bottom" id="wDA-wF-QYZ"/>
                    </constraints>
                </scrollView>
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZL1-Nv-BlK">
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZL1-Nv-BlK" customClass="TapButton" customModule="BrokerDriver" customModuleProvider="target">
                    <rect key="frame" x="0.0" y="774" width="393" height="44"/>
                    <subviews>
                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="42Z-5A-7T8">
@@ -226,6 +227,9 @@
                        <constraint firstAttribute="height" constant="44" id="L3V-NS-6Zl"/>
                        <constraint firstItem="42Z-5A-7T8" firstAttribute="leading" secondItem="ZL1-Nv-BlK" secondAttribute="leading" id="fsu-ga-8tu"/>
                    </constraints>
                    <connections>
                        <action selector="tapAction:" destination="-1" eventType="touchUpInside" id="DJ0-9e-7dK"/>
                    </connections>
                </view>
            </subviews>
            <viewLayoutGuide key="safeArea" id="nCn-el-ZCs"/>

 BrokerDriver/Home/VC/HomeDetailNoteVC.swift

@@ -105,8 +105,13 @@
    }

    func scrollViewDidScroll(_ scrollView: UIScrollView) {
        let offetY = -(scrollView.contentOffset.y - UIDevice.jq_safeEdges.top) + UIDevice.jq_safeEdges.top + 30
        if offetY >= 0 {


        let totalHeight = adapterViewController.headHeight
        let offset =  totalHeight - scrollView.contentOffset.y
        let isTop = (offset - topSafeHeight) < 0

        if scrollView.contentOffset.y > 0 && !isTop{
            adapterViewController.scrollview.contentOffset = scrollView.contentOffset
        }
    }

 BrokerDriver/Home/VC/HomePageVC.swift

@@ -99,8 +99,7 @@
    }

    func scrollViewDidScroll(_ scrollView: UIScrollView) {
        let offetY = -(scrollView.contentOffset.y - UIDevice.jq_safeEdges.top) + UIDevice.jq_safeEdges.top + 30
        if offetY >= 0 {
        if scrollView.contentOffset.y >= 0{
            adapterViewController.scrollview.contentOffset = scrollView.contentOffset
        }
    }

 BrokerDriver/Network/NetworkRequest.swift

@@ -160,8 +160,8 @@
//                        alert(msg: "请求失败")
                        ob.onError(response.error!)
                    }else if let data = response.data,let jsonString = String(data: data, encoding: String.Encoding.utf8){
                        LogInfo("返回数据:\(jsonString)")
                        if let next = BaseResponse<T>.deserialize(from: jsonString){
                            LogInfo("返回数据:\(next.data?.toJSON() ?? [:])")
                            if next.code == 200{
                                ob.onNext(next)
                            }else if next.code == 700{

 BrokerDriver/Network/Services.swift

@@ -147,4 +147,11 @@
        return NetworkRequest.request(params: params, method: .get, progress: false)
    }

    class func nextStatus(id:Int)->Observable<BaseResponse<SimpleModel>>{
        let params = ParamsAppender.build(url: All_Url)
            .interface(url: "/api/index/nextStatus")
            .append(key: "id", value: id)
        return NetworkRequest.request(params: params, method: .get, progress: true)
    }

}

 BrokerDriver/ViewModels/OrderViewModel.swift

@@ -16,7 +16,7 @@
    var pickUpTime: String = ""
    var portName: String = ""
    var start: String = ""
    var status: OrderType = .None
    var status:OrderType = .None
    var type: Int = 0
}

@@ -30,6 +30,7 @@
    var orderId: String = ""
    var orderType: String = ""
    var status: OrderType = .None
    var nextStatus:OrderType = .None
    var tGoods: OrderDetailGoodsModel?
    var type: String = ""
}

 Podfile

@@ -14,6 +14,8 @@
  pod 'MBProgressHUD'
  pod 'SwifterSwift'
  pod 'Lantern'
  pod 'GoogleMaps'
  pod 'GooglePlaces'

  post_install do |installer|
    installer.pods_project.targets.each do |target|