Skip to content

G
GeliBusinessPlatform
Commit 67b30ebf authored by lujunye's avatar lujunye
Browse files
Options

添加更改地址顺序

parent 4a0f8916
Expand all Show whitespace changes
Inline Side-by-side
Showing with 162 additions and 15 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 67b30ebf
......@@ -258,6 +258,8 @@
E0AA3A89248F3E1400CBFC27 /* StatisticsInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AA3A88248F3E1400CBFC27 /* StatisticsInterface.swift */; };
E0AA3A91248F626400CBFC27 /* XinCaiGouViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AA3A8F248F626400CBFC27 /* XinCaiGouViewController.swift */; };
E0AA3A92248F626400CBFC27 /* XinCaiGouViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0AA3A90248F626400CBFC27 /* XinCaiGouViewController.xib */; };
E0B28DAC24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B28DAA24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift */; };
E0B28DAD24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B28DAB24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib */; };
E0B5307E247266F400FFCC15 /* DKXDAdrCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */; };
E0B5307F247266F400FFCC15 /* DKXDAdrCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B5307D247266F400FFCC15 /* DKXDAdrCell.xib */; };
E0B5308424728D7E00FFCC15 /* ShopWarehouseListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B5308324728D7E00FFCC15 /* ShopWarehouseListModel.swift */; };
......@@ -871,6 +873,8 @@
E0AA3A88248F3E1400CBFC27 /* StatisticsInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatisticsInterface.swift; sourceTree = "<group>"; };
E0AA3A8F248F626400CBFC27 /* XinCaiGouViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XinCaiGouViewController.swift; sourceTree = "<group>"; };
E0AA3A90248F626400CBFC27 /* XinCaiGouViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = XinCaiGouViewController.xib; sourceTree = "<group>"; };
E0B28DAA24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HuoLaLaDiZhiCell.swift; sourceTree = "<group>"; };
E0B28DAB24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HuoLaLaDiZhiCell.xib; sourceTree = "<group>"; };
E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DKXDAdrCell.swift; sourceTree = "<group>"; };
E0B5307D247266F400FFCC15 /* DKXDAdrCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DKXDAdrCell.xib; sourceTree = "<group>"; };
E0B5308324728D7E00FFCC15 /* ShopWarehouseListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopWarehouseListModel.swift; sourceTree = "<group>"; };
......@@ -3006,6 +3010,8 @@
children = (
F9D44E8624CBC6A400FBD8DB /* ToAndFormSelectViewController.swift */,
F9D44E8724CBC6A400FBD8DB /* ToAndFormSelectViewController.xib */,
E0B28DAA24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift */,
E0B28DAB24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib */,
);
path = "收发货地址";
sourceTree = "<group>";
......@@ -3159,6 +3165,7 @@
E0B9461F24566B3100FBEC9A /* TitleAndTFAndBtnCell.xib in Resources */,
E08A7ADD246505F000F934F2 /* KeHuListViewController.xib in Resources */,
E0DDCB10244AD8C500DF54C7 /* DaiQueRenCell.xib in Resources */,
E0B28DAD24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib in Resources */,
F94A31652462B21700FEC38E /* EditWorkCViewController.xib in Resources */,
E0BE8A9D245A9E5900E80134 /* YingFuZhangKuanXQCell.xib in Resources */,
F96A5856247BBFFF0070A057 /* AddGuiGeCell.xib in Resources */,
......@@ -3696,6 +3703,7 @@
E02DDD952450106C00ABB707 /* PuTongJieTiCell.swift in Sources */,
E0BE8A8B245A7D3300E80134 /* BtmBtnCell.swift in Sources */,
E0CC848424823B72009B1FE9 /* InGoodsDetailModel.swift in Sources */,
E0B28DAC24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift in Sources */,
F9531F452465108800724BEE /* JXPhotoBrowserLog.swift in Sources */,
F956D5A3246A2D9C003FF510 /* LMNImageInputViewController.m in Sources */,
F9956B1E2463D94E001A617D /* WorkSelectTimeView.swift in Sources */,
......
GeliBusinessPlatform/ViewController/货拉拉/收发货地址/HuoLaLaDiZhiCell.swift 0 → 100644
View file @ 67b30ebf
//
// HuoLaLaDiZhiCell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/7/31.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class HuoLaLaDiZhiCell: UITableViewCell {
@IBOutlet weak var contentLbl: UILabel!
@IBOutlet weak var nameLbl: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/货拉拉/收发货地址/HuoLaLaDiZhiCell.xib 0 → 100644
View file @ 67b30ebf
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" 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="16087"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="206" id="KGk-i7-Jjw" customClass="HuoLaLaDiZhiCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="328" height="206"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="328" height="206"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SVj-as-s8v">
<rect key="frame" x="15" y="15" width="298" height="18.5"/>
<constraints>
<constraint firstAttribute="height" constant="18.5" id="X4e-gb-qKp"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3s8-3x-dnL">
<rect key="frame" x="15" y="205" width="313" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="NXr-Wv-9vF"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xvf-JN-rSb">
<rect key="frame" x="15" y="38.5" width="298" height="151.5"/>
<attributedString key="attributedText">
<fragment content="Label">
<attributes>
<color key="NSColor" name="9A9A9A"/>
<font key="NSFont" metaFont="system"/>
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="3" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="3s8-3x-dnL" secondAttribute="trailing" id="24Y-o3-crE"/>
<constraint firstAttribute="bottom" secondItem="3s8-3x-dnL" secondAttribute="bottom" id="Blx-oo-mcC"/>
<constraint firstItem="xvf-JN-rSb" firstAttribute="top" secondItem="SVj-as-s8v" secondAttribute="bottom" constant="5" id="RhK-r4-M8n"/>
<constraint firstItem="SVj-as-s8v" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="WF1-iZ-ieb"/>
<constraint firstItem="SVj-as-s8v" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="goD-EA-cfh"/>
<constraint firstItem="xvf-JN-rSb" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="jTf-fa-heK"/>
<constraint firstAttribute="trailing" secondItem="SVj-as-s8v" secondAttribute="trailing" constant="15" id="l0H-rf-a8U"/>
<constraint firstItem="3s8-3x-dnL" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="rSn-7l-jpO"/>
<constraint firstItem="3s8-3x-dnL" firstAttribute="top" secondItem="xvf-JN-rSb" secondAttribute="bottom" constant="15" id="yQs-Ud-Iuf"/>
<constraint firstAttribute="trailing" secondItem="xvf-JN-rSb" secondAttribute="trailing" constant="15" id="zMV-5p-xYy"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="contentLbl" destination="xvf-JN-rSb" id="xG8-yJ-JaO"/>
<outlet property="nameLbl" destination="SVj-as-s8v" id="jan-yT-jXv"/>
</connections>
<point key="canvasLocation" x="137.68115942028987" y="168.75"/>
</tableViewCell>
</objects>
<resources>
<namedColor name="9A9A9A">
<color red="0.60392156862745094" green="0.60392156862745094" blue="0.60392156862745094" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/货拉拉/收发货地址/ToAndFormSelectViewController.swift
View file @ 67b30ebf
......@@ -14,7 +14,23 @@ import MAMapKit
import AMapSearchKit
import IQKeyboardManagerSwift
class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLocationManagerDelegate, AMapSearchDelegate, UISearchBarDelegate, SearchBarViewDelegate {
class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLocationManagerDelegate, AMapSearchDelegate, UISearchBarDelegate, SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource{
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 5
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return UITableView.automaticDimension
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "HuoLaLaDiZhiCell") as! HuoLaLaDiZhiCell
cell.nameLbl.text = "测试"
cell.contentLbl.text = "adasf"
if indexPath.row == 0 {
cell.contentLbl.text = "asfdasldfkj;alsjdf;lasjfasl;jfda;lskjfda;lsfjals;kfjasl;fjasl;fjasl;fjasl;fdjasl;fjaslfdjaslfdjaslfkjasfdlkajsflsajfdlk"
}
return cell
}
@IBOutlet weak var navBgView: UIView!
@IBOutlet weak var citySelectBtn: UIButton!
......@@ -28,6 +44,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
@IBOutlet weak var sureSelectLbl: UILabel!
@IBOutlet weak var MapBgView: UIView!
@IBOutlet weak var selectListV: UITableView!
//高德地图
var mapView: MAMapView!
var search: AMapSearchAPI!
......@@ -86,35 +103,40 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
searchBr.delegate = self
searchBr.delegateL = self
selectListV.register(UINib(nibName: "HuoLaLaDiZhiCell", bundle: nil), forCellReuseIdentifier: "HuoLaLaDiZhiCell")
selectListV.separatorStyle = .none
AMapServices.shared().apiKey = "ca417b43e3d031db9c29382cc09a174a"
initMapView()
initSearch()
manger.delegate = self
manger.requestAlwaysAuthorization()
manger.requestWhenInUseAuthorization()
manger.startUpdatingLocation()
}
func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
manger.stopUpdatingLocation()
let location = locations.last
lat = location?.coordinate.latitude as! CLLocationDegrees
lng = location?.coordinate.longitude as! CLLocationDegrees
initMapView(lat: lat, lng: lng)
initSearch()
}
func initMapView(lat:CLLocationDegrees,lng:CLLocationDegrees) {
func initMapView(){
AMapServices.shared().enableHTTPS = true
mapView = MAMapView(frame:MapBgView.bounds)
mapView.delegate = self
mapView.zoomLevel = 16
mapView.isZoomEnabled = true
mapView.setCenter(CLLocationCoordinate2D(latitude: lat, longitude: lng), animated: false)
MapBgView.addSubview(mapView!)
let tap = UITapGestureRecognizer(target: self, action: #selector(cancelKeyboard))
mapView.addGestureRecognizer(tap)
}
func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
manger.stopUpdatingLocation()
let location = locations.last
lat = location?.coordinate.latitude as! CLLocationDegrees
lng = location?.coordinate.longitude as! CLLocationDegrees
setMapCenter(lat: lat, lng: lng)
}
func setMapCenter(lat:CLLocationDegrees,lng:CLLocationDegrees) {
mapView.setCenter(CLLocationCoordinate2D(latitude: lat, longitude: lng), animated: false)
}
@objc func cancelKeyboard(){
......@@ -325,6 +347,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
print("调起搜索后添加个蒙版本")
closeBtn.isHidden = false
listViewBG.isHidden = false
return true
}
}
GeliBusinessPlatform/ViewController/货拉拉/收发货地址/ToAndFormSelectViewController.xib
View file @ 67b30ebf
......@@ -22,6 +22,7 @@
<outlet property="navBgView" destination="gLT-4M-bfs" id="fjx-Hf-4GS"/>
<outlet property="phoneTF" destination="zpG-8r-dzl" id="nwC-VM-snC"/>
<outlet property="rightBtn" destination="pS2-lL-cUp" id="HGP-qi-64L"/>
<outlet property="selectListV" destination="FkD-95-sVW" id="wNv-R5-d7Z"/>
<outlet property="sureSelectLbl" destination="nZK-ad-fmq" id="5gq-Yd-d6B"/>
<outlet property="toFormTitleLbl" destination="kjg-a9-QU1" id="8Fc-oo-P93"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
......@@ -298,9 +299,13 @@
<action selector="backToUserLocation:" destination="-1" eventType="touchUpInside" id="fzl-eo-JNZ"/>
</connections>
</button>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="FkD-95-sVW">
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="FkD-95-sVW">
<rect key="frame" x="0.0" y="101.5" width="414" height="646.5"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="0q6-BW-cvc"/>
<outlet property="delegate" destination="-1" id="Abz-vu-2hp"/>
</connections>
</tableView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="maR-I9-Ohr">
<rect key="frame" x="0.0" y="50" width="206.5" height="2.5"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment