修改

younger_times

2023-04-11 1a9f33a84c1e71f1faa74180dba7d2b241bd5061

修改

 OKProject/Assets.xcassets/banner.imageset/Contents.json

@@ -1,17 +1,16 @@
{
  "images" : [
    {
      "filename" : "pic.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "filename" : "pic@2x.png",
      "filename" : "banner@2x.png",
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "filename" : "pic@3x.png",
      "filename" : "banner@3x.png",
      "idiom" : "universal",
      "scale" : "3x"
    }

 OKProject/Assets.xcassets/banner.imageset/banner@2x.png

 OKProject/Assets.xcassets/banner.imageset/banner@3x.png

 OKProject/Assets.xcassets/banner.imageset/pic.png

Binary files differ

 OKProject/Assets.xcassets/banner.imageset/pic@2x.png

Binary files differ

 OKProject/Assets.xcassets/banner.imageset/pic@3x.png

Binary files differ

 OKProject/Class/TravelAcrossCity(跨城)/Controller/TravelCityHomeVC.swift

@@ -31,7 +31,7 @@

    override func viewWillAppear(_ animated: Bool) {
        super.viewWillAppear(animated)
        buyCardView.isHidden = !showCar
//        buyCardView.isHidden = !showCar
    }

    override func viewDidLoad() {
@@ -39,7 +39,7 @@
        bottom_view.setShodView()

        //74067 【特惠购卡】需根据返回的状态，是否显示 购卡模块、 我的商家中心模块
        buyCardView.isHidden = !showCar
//        buyCardView.isHidden = !showCar
        
        viewModel.subject.subscribe {[unowned self] (status) in
            switch status{
@@ -88,8 +88,8 @@
            self.bottomHeight.constant = 146
        }.disposed(by: disposeBag)

        buyCardView.isUserInteractionEnabled = true
        buyCardView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(buyCardAction)))
//        buyCardView.isUserInteractionEnabled = true
//        buyCardView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(buyCardAction)))

    }


 OKProject/Class/TravelAcrossCity(跨城)/Controller/TravelCityHomeVC.xib

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
    <device id="retina6_1" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="System colors in document resources" minToolsVersion="11.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -27,26 +27,26 @@
            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
            <subviews>
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WoA-am-9cY">
                    <rect key="frame" x="0.0" y="44" width="414" height="0.5"/>
                    <rect key="frame" x="0.0" y="48" width="414" height="0.5"/>
                    <color key="backgroundColor" red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="calibratedRGB"/>
                    <constraints>
                        <constraint firstAttribute="height" constant="0.5" id="7nW-EL-Jeg"/>
                    </constraints>
                </view>
                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="banner" translatesAutoresizingMaskIntoConstraints="NO" id="rg2-Sm-IMl">
                    <rect key="frame" x="0.0" y="45" width="414" height="817"/>
                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="banner" translatesAutoresizingMaskIntoConstraints="NO" id="rg2-Sm-IMl">
                    <rect key="frame" x="0.0" y="49" width="414" height="813"/>
                </imageView>
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IGU-a3-3zM">
                    <rect key="frame" x="12" y="708" width="389" height="146"/>
                    <rect key="frame" x="12" y="108.5" width="389" height="146"/>
                    <subviews>
                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="D03-85-fDY">
                            <rect key="frame" x="0.0" y="0.0" width="389" height="146"/>
                            <subviews>
                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q73-6Z-efN">
                                    <rect key="frame" x="0.0" y="0.0" width="389" height="48.5"/>
                                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q73-6Z-efN">
                                    <rect key="frame" x="0.0" y="0.0" width="389" height="0.0"/>
                                    <subviews>
                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="特惠购卡" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KAj-0X-yAC">
                                            <rect key="frame" x="162" y="13.5" width="65.5" height="22"/>
                                            <rect key="frame" x="162" y="-11" width="65.5" height="22"/>
                                            <constraints>
                                                <constraint firstAttribute="height" constant="22" id="fG6-Lx-TAt"/>
                                            </constraints>
@@ -55,7 +55,7 @@
                                            <nil key="highlightedColor"/>
                                        </label>
                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_fire" translatesAutoresizingMaskIntoConstraints="NO" id="sEZ-JI-M6v">
                                            <rect key="frame" x="137" y="14" width="16" height="21"/>
                                            <rect key="frame" x="137" y="-10.5" width="16" height="21"/>
                                        </imageView>
                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="top_corner_bg" translatesAutoresizingMaskIntoConstraints="NO" id="ugb-zV-tI0">
                                            <rect key="frame" x="311" y="0.0" width="78" height="21"/>
@@ -82,24 +82,24 @@
                                    </constraints>
                                </view>
                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b26-X9-334">
                                    <rect key="frame" x="0.0" y="48.5" width="389" height="49"/>
                                    <rect key="frame" x="0.0" y="0.0" width="389" height="73"/>
                                    <subviews>
                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L4F-bW-zUR">
                                            <rect key="frame" x="21" y="48" width="319" height="1"/>
                                            <rect key="frame" x="21" y="72" width="319" height="1"/>
                                            <color key="backgroundColor" red="0.15294117647058825" green="0.15686274509803921" blue="0.1764705882352941" alpha="0.059999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                            <constraints>
                                                <constraint firstAttribute="height" constant="0.80000000000000004" id="LhC-PH-YYa"/>
                                            </constraints>
                                        </view>
                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_starting point" translatesAutoresizingMaskIntoConstraints="NO" id="9S4-yp-CP3">
                                            <rect key="frame" x="10" y="17.5" width="14" height="14"/>
                                            <rect key="frame" x="10" y="29.5" width="14" height="14"/>
                                            <constraints>
                                                <constraint firstAttribute="height" constant="14" id="RUd-12-WmU"/>
                                                <constraint firstAttribute="width" constant="14" id="ZkL-eS-17N"/>
                                            </constraints>
                                        </imageView>
                                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请选择起点" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="jEA-eK-Txp">
                                            <rect key="frame" x="32" y="15.5" width="353" height="18.5"/>
                                            <rect key="frame" x="32" y="27.5" width="353" height="18.5"/>
                                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                                            <textInputTraits key="textInputTraits"/>
@@ -121,17 +121,17 @@
                                    </constraints>
                                </view>
                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WAh-WV-b8D">
                                    <rect key="frame" x="0.0" y="97.5" width="389" height="48.5"/>
                                    <rect key="frame" x="0.0" y="73" width="389" height="73"/>
                                    <subviews>
                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_end point" translatesAutoresizingMaskIntoConstraints="NO" id="mQ8-3j-B1y">
                                            <rect key="frame" x="10" y="17" width="14" height="14"/>
                                            <rect key="frame" x="10" y="29.5" width="14" height="14"/>
                                            <constraints>
                                                <constraint firstAttribute="height" constant="14" id="d43-UG-wPw"/>
                                                <constraint firstAttribute="width" constant="14" id="rpj-I8-zf3"/>
                                            </constraints>
                                        </imageView>
                                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="您要去哪儿" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="cq0-NE-KGf">
                                            <rect key="frame" x="32" y="15" width="353" height="18.5"/>
                                            <rect key="frame" x="32" y="27.5" width="353" height="18.5"/>
                                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                                            <textInputTraits key="textInputTraits"/>
@@ -198,7 +198,7 @@
                            </constraints>
                        </stackView>
                        <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4pb-i8-piP">
                            <rect key="frame" x="350" y="82" width="20" height="30"/>
                            <rect key="frame" x="350" y="57.5" width="20" height="30"/>
                            <constraints>
                                <constraint firstAttribute="height" constant="30" id="SkN-63-YMt"/>
                                <constraint firstAttribute="width" constant="20" id="iU5-BC-V4r"/>
@@ -234,7 +234,7 @@
                <constraint firstItem="IGU-a3-3zM" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="12" id="Bhv-Bv-S5k"/>
                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="rg2-Sm-IMl" secondAttribute="bottom" id="JTI-b5-ePQ"/>
                <constraint firstItem="WoA-am-9cY" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="LRx-jq-Bbw"/>
                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="IGU-a3-3zM" secondAttribute="bottom" constant="8" id="a9e-KE-xw0"/>
                <constraint firstItem="IGU-a3-3zM" firstAttribute="top" secondItem="WoA-am-9cY" secondAttribute="bottom" constant="60" id="Wb6-an-rEu"/>
                <constraint firstItem="WoA-am-9cY" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="j7J-Ta-9eY"/>
                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="WoA-am-9cY" secondAttribute="trailing" id="pcB-To-BDd"/>
                <constraint firstItem="rg2-Sm-IMl" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="rI5-Zg-i1s"/>
@@ -245,7 +245,7 @@
        </view>
    </objects>
    <resources>
        <image name="banner" width="375" height="562"/>
        <image name="banner" width="375" height="812"/>
        <image name="icon_end point" width="10" height="10"/>
        <image name="icon_exchange " width="13" height="15"/>
        <image name="icon_fire" width="16" height="21"/>

 OKProject/Tools/Macro/Macro.swift

@@ -32,7 +32,7 @@
let WeiboAppSecret: String = ""

/// 高德key
let AMapApiKey = "5360697eed62e500f544e440174143ed" //【未创建】
let AMapApiKey = "52d73468082edbb1801e73f9667ff807" //【已创建】

/// 是否同意协议
let AgreeNotification = "com.yy.agree"