Commit 6055b94b authored by lujunye's avatar lujunye

地图

parent b9d654f8
......@@ -34,7 +34,7 @@ zxcvbnm
import UIKit
import ESTabBarController_swift
import JZLocationConverterSwift
@available(iOS 10.0, *)
@UIApplicationMain
......@@ -55,6 +55,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarCon
setting_ShareSDK()
JZLocationConverter.start { (error) in
if error != nil {
print("失败")
}else {
print("成功")
}
}
return true
}
......
{
"images" : [
{
"filename" : "locIcon.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "locIcon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "locIcon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
......@@ -30,6 +30,7 @@ class cityListDataModel: Mappable {
var city_id : Int?
var name_en : String?
required init?( map: Map) {
}
......@@ -301,16 +302,15 @@ class citySearchDataModel: Mappable {
}
}
class citySearchDataPoiModel: Mappable {
var area:String?//地址所属区(县),示例:⻰华区
var uid:String? //地址uid
var name:String?// 地址名称,示例:深圳北站
var address:String? // 地址详情,示例:深圳市⻰华区致远中路28号
var name:String?// 地址名称,示例:深圳北站
var city:String?//地址所属城市名称, 示例:深圳市
var city_id:Int?//地址所属城市ID,示例:1002
var area:String?//地址所属区(县),示例:⻰华区
var distance:String? //距离(将返回与输入参数中经纬度的距离,如果输入参数中没有传经纬度 则返回空)
var location:citySearchDataPoiLocationModel?//地址经纬度(wgs84坐标系)
var children:Array<citySearchDataPoiChildrenModel>?//可选子节点地址
var city_id:Int?//地址所属城市ID,示例:1002
required init?( map: Map) {
......@@ -323,7 +323,8 @@ class citySearchDataPoiModel: Mappable {
city_id <- map["city_id"]
area <- map["area"]
distance <- map["distance"]
children <- map["children"]
location <- map["location"]
}
}
class citySearchDataPoiLocationModel: Mappable {
......
......@@ -21,7 +21,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
}
func ToAndFormSelectViewControllerSelectAdr(dict: Dictionary<String, Any>, idx: Int) {
print(idx)
if idx != 10086 {
if idx != 0 {
if idx == 1 && adrArr.count == 0{
......@@ -370,17 +370,41 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
@IBOutlet weak var rightBtn: UIButton!
var adrDatas:Array<cityListDataModel> = []
@objc func locSelect(){
if adrDatas.count > 0 {
if adrDatas.count == 0 {
HUD.flash(.progress)
cityList(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any], success: { (data) in
let model = data as! cityListModel
HUD.hide()
self.adrDatas.removeAll()
for item in model.data! {
if item.name_en == self.selectLoc.localizedLowercase || item.name == self.selectLoc {
self.loc = item
}
self.adrDatas.append(item)
}
let vc = CityListViewController()
vc.adrDatas = self.adrDatas
vc.locatStr = self.selectLoc
vc.delegate = self
self.navigationController?.pushViewController(vc, animated: true)
}) { (err) in
}
}else{
let vc = CityListViewController()
vc.adrDatas = adrDatas
vc.locatStr = self.selectLoc
vc.delegate = self
self.navigationController?.pushViewController(vc, animated: true)
}
}
var manger:CLLocationManager = CLLocationManager()
var selectLoc = ""
lazy var geoCoder: CLGeocoder = {
......@@ -421,28 +445,44 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
}
func needsLocation(){
manger.delegate = self
manger.requestAlwaysAuthorization()
manger.requestWhenInUseAuthorization()
manger.startUpdatingLocation()
}
var locationIsOpen = false
func checkLocation(){
if(CLLocationManager.authorizationStatus() != .denied) {
print("应用拥有定位权限")
locationIsOpen = true
}else {
let aleat = UIAlertController(title: "打开定位开关", message:"定位服务未开启,请进入系统设置>隐私>定位服务中打开开关,并允许商户端使用定位服务", preferredStyle: .alert)
let tempAction = UIAlertAction(title: "取消", style: .cancel) { (action) in
}
let callAction = UIAlertAction(title: "立即设置", style: .default) { (action) in
let url = NSURL.init(string: UIApplication.openSettingsURLString)
if(UIApplication.shared.canOpenURL(url! as URL)) {
UIApplication.shared.openURL(url! as URL)
}
}
aleat.addAction(tempAction)
aleat.addAction(callAction)
self.present(aleat, animated: true, completion: nil)
}
}
override func viewDidLoad() {
super.viewDidLoad()
cityList(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any], success: { (data) in
let model = data as! cityListModel
self.adrDatas.removeAll()
for item in model.data! {
self.adrDatas.append(item)
}
}) { (err) in
checkLocation()
}
needsLocation()
navbar.title = "运单列表"
self.view.addSubview(navbar)
manger.delegate = self
manger.requestAlwaysAuthorization()
manger.requestWhenInUseAuthorization()
manger.startUpdatingLocation()
getDay()
SetTopFrame(view: topBtnView, height: 44)
......@@ -780,15 +820,49 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
}else{
print("添加")
if locationIsOpen == false {
checkLocation()
return
}
if adrDatas.count == 0 {
HUD.flash(.progress)
cityList(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any], success: { (data) in
let model = data as! cityListModel
HUD.hide()
self.adrDatas.removeAll()
for item in model.data! {
if item.name_en == self.selectLoc.localizedLowercase || item.name == self.selectLoc {
self.loc = item
}
self.adrDatas.append(item)
}
let vc = ToAndFormSelectViewController()
vc.idx = 10086
vc.adrDatas = self.adrDatas
vc.delegate = self
// if self.loc != nil{
// vc.loc = self.loc
self.navigationController?.pushViewController(vc, animated: true)
// }
}) { (err) in
}
}else{
let vc = ToAndFormSelectViewController()
vc.idx = 10086
vc.adrDatas = adrDatas
vc.loc = loc
vc.delegate = self
if adrDatas.count > 0 {
// vc.loc = loc
self.navigationController?.pushViewController(vc, animated: true)
}
}
}
}
@objc func changeCellSortAc(sender:UIButton){
changeCellSortView?.isHidden = true
......@@ -904,10 +978,46 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
print(indexPath.section,indexPath.row)
if indexPath.section == 1 {
if locationIsOpen == false {
checkLocation()
return
}
if adrDatas.count == 0 {
HUD.flash(.progress)
cityList(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any], success: { (data) in
let model = data as! cityListModel
HUD.hide()
self.adrDatas.removeAll()
for item in model.data! {
if item.name_en == self.selectLoc.localizedLowercase || item.name == self.selectLoc {
self.loc = item
}
self.adrDatas.append(item)
}
let vc = ToAndFormSelectViewController()
vc.idx = indexPath.row
vc.adrDatas = self.adrDatas
vc.delegate = self
if self.adrArr.count > indexPath.row {
let dict = self.adrArr[indexPath.row] as! NSDictionary
if dict["locName"] as! String != "空" && dict["locName"] != nil{
vc.nameStr = (dict["shouHuoRen"] as! String)
vc.phoneNum = (dict["phoneNum"] as! String)
vc.adrStr = (dict["menPai"] as! String)
}
}
self.navigationController?.pushViewController(vc, animated: true)
}) { (err) in
}
}else{
let vc = ToAndFormSelectViewController()
vc.idx = indexPath.row
vc.adrDatas = adrDatas
vc.loc = loc
vc.delegate = self
if adrArr.count > indexPath.row {
let dict = adrArr[indexPath.row] as! NSDictionary
......@@ -919,10 +1029,11 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
}
if adrDatas.count > 0 {
self.navigationController?.pushViewController(vc, animated: true)
}
}
}
if indexPath.section == 2 {
if indexPath.row == 1 {
......
......@@ -7,11 +7,19 @@
//
import UIKit
protocol HuoLaLaDiZhiCellDelegate {
func HuoLaLaDiZhiCellBtnClick(model:citySearchDataPoiChildrenModel,cityStr:String)
}
class HuoLaLaDiZhiCell: UITableViewCell {
var delegate:HuoLaLaDiZhiCellDelegate?
var cityStr:String = ""
@IBOutlet weak var btmH: NSLayoutConstraint!
@IBOutlet weak var marginValue: NSLayoutConstraint!
@IBOutlet weak var btnViewBG: UIView!
@IBOutlet weak var btnViewH: NSLayoutConstraint!
@IBOutlet weak var contentLbl: UILabel!
@IBOutlet weak var nameLbl: UILabel!
var children:Array<citySearchDataPoiChildrenModel>?
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
......@@ -19,6 +27,49 @@ class HuoLaLaDiZhiCell: UITableViewCell {
// Initialization code
}
override func layoutSubviews() {
super.layoutSubviews()
for item in btnViewBG.subviews {
item.removeFromSuperview()
}
if children != nil && children!.count > 0 {
for i in 0 ..< children!.count {
setLocUI(index: i, bg: btnViewBG!)
}
}
}
func setLocUI(index:Int,bg:UIView){
let item = children![index]
let width = fullScreenWidth - 40 - bg.frame.minX
let w = width / 3
let cols = 3
let col = index % cols
let row = index / cols
let shopX = CGFloat(col) * (w + 10)
let shopY = CGFloat(row) * (30 + 10)
let btn = UIButton(frame: CGRect(x: shopX , y: shopY , width: w, height: 30))
btn.addTarget(self, action: #selector(locSelect(sender:)), for: .touchUpInside)
btn.tag = index
btn.layer.borderColor = UIColor(named: "提示语字体颜色")?.cgColor
btn.layer.borderWidth = 1
btn.layer.cornerRadius = 3
btn.layer.masksToBounds = true
btn.setTitle(item.address, for: .normal)
btn.titleLabel?.font = UIFont.systemFont(ofSize: 11)
btn.setTitleColor(UIColor(named: "灰色字体颜色"), for: .normal)
bg.addSubview(btn)
}
@objc func locSelect(sender:UIButton){
delegate?.HuoLaLaDiZhiCellBtnClick(model: children![sender.tag],cityStr: cityStr)
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
......
......@@ -19,10 +19,7 @@
<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>
<rect key="frame" x="37" y="15.5" width="276" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
......@@ -31,11 +28,11 @@
<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"/>
<constraint firstAttribute="height" constant="1" id="fLK-EK-WzV"/>
</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"/>
<rect key="frame" x="37" y="38.5" width="276" height="121.5"/>
<attributedString key="attributedText">
<fragment content="Label">
<attributes>
......@@ -47,29 +44,53 @@
</attributedString>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="locIcon" translatesAutoresizingMaskIntoConstraints="NO" id="LiS-tq-479">
<rect key="frame" x="15" y="17" width="12" height="14.5"/>
<constraints>
<constraint firstAttribute="width" constant="12" id="lvI-ij-HIS"/>
<constraint firstAttribute="height" constant="14.5" id="xkU-7I-dJg"/>
</constraints>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hvc-4C-RNf">
<rect key="frame" x="37" y="170" width="271" height="30"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="Qwu-H6-xxW"/>
</constraints>
</view>
</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"/>
<constraint firstItem="xvf-JN-rSb" firstAttribute="top" secondItem="SVj-as-s8v" secondAttribute="bottom" constant="5" id="8FH-0u-H8c"/>
<constraint firstItem="3s8-3x-dnL" firstAttribute="top" secondItem="hvc-4C-RNf" secondAttribute="bottom" constant="5" id="8Qm-f1-nhw"/>
<constraint firstAttribute="trailing" secondItem="3s8-3x-dnL" secondAttribute="trailing" id="BSQ-wj-j2r"/>
<constraint firstItem="hvc-4C-RNf" firstAttribute="leading" secondItem="SVj-as-s8v" secondAttribute="leading" id="JgM-e2-dtt"/>
<constraint firstItem="SVj-as-s8v" firstAttribute="leading" secondItem="LiS-tq-479" secondAttribute="trailing" constant="10" id="QJF-WJ-nWf"/>
<constraint firstItem="LiS-tq-479" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="SJE-6Z-l9N"/>
<constraint firstItem="xvf-JN-rSb" firstAttribute="leading" secondItem="SVj-as-s8v" secondAttribute="leading" id="UPJ-1G-QgX"/>
<constraint firstAttribute="trailingMargin" secondItem="hvc-4C-RNf" secondAttribute="trailing" id="Un6-UV-7MU"/>
<constraint firstAttribute="bottom" secondItem="3s8-3x-dnL" secondAttribute="bottom" id="Wzk-G0-TbQ"/>
<constraint firstItem="SVj-as-s8v" firstAttribute="centerY" secondItem="LiS-tq-479" secondAttribute="centerY" id="e4E-tj-2qG"/>
<constraint firstItem="hvc-4C-RNf" firstAttribute="top" secondItem="xvf-JN-rSb" secondAttribute="bottom" constant="10" id="jTv-GL-HZy"/>
<constraint firstAttribute="trailing" secondItem="SVj-as-s8v" secondAttribute="trailing" constant="15" id="x9A-aJ-BTL"/>
<constraint firstItem="3s8-3x-dnL" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="yNm-Ld-1bK"/>
<constraint firstAttribute="trailing" secondItem="xvf-JN-rSb" secondAttribute="trailing" constant="15" id="z4V-iH-Tu5"/>
<constraint firstItem="LiS-tq-479" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="17" id="z6R-Kr-FEd"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="btmH" destination="8Qm-f1-nhw" id="Unk-ez-xHr"/>
<outlet property="btnViewBG" destination="hvc-4C-RNf" id="w3G-ST-cIG"/>
<outlet property="btnViewH" destination="Qwu-H6-xxW" id="dzy-Mc-iGb"/>
<outlet property="contentLbl" destination="xvf-JN-rSb" id="xG8-yJ-JaO"/>
<outlet property="marginValue" destination="jTv-GL-HZy" id="OMV-xy-gHi"/>
<outlet property="nameLbl" destination="SVj-as-s8v" id="jan-yT-jXv"/>
</connections>
<point key="canvasLocation" x="137.68115942028987" y="168.75"/>
</tableViewCell>
</objects>
<resources>
<image name="locIcon" width="12" height="14.5"/>
<namedColor name="9A9A9A">
<color red="0.60392156862745094" green="0.60392156862745094" blue="0.60392156862745094" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......
......@@ -13,13 +13,29 @@ import AMapFoundationKit
import MAMapKit
import AMapSearchKit
import IQKeyboardManagerSwift
import JZLocationConverterSwift
protocol ToAndFormSelectViewControllerDelegate {
func ToAndFormSelectViewControllerSelectAdr(dict:Dictionary<String,Any>,idx:Int)
}
class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLocationManagerDelegate, AMapSearchDelegate, UISearchBarDelegate, SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource,CityListViewControllerDelegate{
class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLocationManagerDelegate, AMapSearchDelegate, UISearchBarDelegate, SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource,CityListViewControllerDelegate,HuoLaLaDiZhiCellDelegate{
func HuoLaLaDiZhiCellBtnClick(model: citySearchDataPoiChildrenModel,cityStr:String) {
citySelectBtn.setTitle(cityStr, for: .normal)
mapView.centerCoordinate = CLLocationCoordinate2DMake((model.location?.lat)!,(model.location?.lon)!)
searchList.isHidden = true
closeBtn.isHidden = true
listViewBG.isHidden = true
IQKeyboardManager.shared.resignFirstResponder()
print("1")
}
func CityListViewControllerLocSelect(loc: cityListDataModel) {
citySelectBtn.setTitle(loc.name, for: .normal)
self.loc = loc
mapView.centerCoordinate = CLLocationCoordinate2DMake((loc.lat_lon?.lat)!,(loc.lat_lon?.lon)!)
JZLocationConverter.default.gcj02ToBd09(CLLocationCoordinate2DMake((loc.lat_lon?.lat)!,(loc.lat_lon?.lon)!)) { (result) in
self.mapView.centerCoordinate = result
}
print("2")
}
@IBAction func citySelectClick(_ sender: UIButton) {
......@@ -31,13 +47,13 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if tableView == searchList {
return adrArr.count
return searchAdrDatas.count
}
return 5
}
var delegate:ToAndFormSelectViewControllerDelegate?
var dict:Dictionary<String,Any> = Dictionary()
let UserToken = UserDefaults.standard.value(forKey: "user_token")
var loc:cityListDataModel!
var nameStr = ""
var phoneNum = ""
......@@ -45,15 +61,43 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
var idx:Int?
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
if tableView == searchList {
let data = adrArr[indexPath.row]
cell.nameLbl.text = data.name
let model = searchAdrDatas[indexPath.row]
cell.nameLbl.text = model.name!
cell.contentLbl.text = model.city! + model.area! + model.address!
cell.delegate = self
cell.cityStr = model.city!
if model.children != nil {
if model.children!.count == 0 {
cell.marginValue.constant = 0
cell.btnViewH.constant = 0
cell.btnViewBG.isHidden = true
cell.btmH.constant = 12
}else{
cell.btnViewBG.isHidden = false
cell.btmH.constant = 3
cell.children = model.children!
cell.marginValue.constant = 10
let rows = (model.children!.count + 3 - 1) / 3
cell.btnViewH.constant = CGFloat(rows) * 40
}
}
}else{
cell.marginValue.constant = 0
cell.btnViewH.constant = 0
cell.btmH.constant = 12
}
return cell
......@@ -78,7 +122,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
var search: AMapSearchAPI!
var lat:CLLocationDegrees = 0
var lng:CLLocationDegrees = 0
// var manger:CLLocationManager = CLLocationManager()
var manger:CLLocationManager = CLLocationManager()
@IBOutlet weak var lineX: NSLayoutConstraint!
@IBOutlet weak var closeBtn: UIButton!
......@@ -114,13 +158,30 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
listViewBG.layer.maskedCorners = [CACornerMask.layerMinXMinYCorner,CACornerMask.layerMaxXMinYCorner]
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if tableView == searchList {
let model = searchAdrDatas[indexPath.row]
citySelectBtn.setTitle(model.city!, for: .normal)
print("3",model.location!.lat,model.location!.lon)
JZLocationConverter.default.wgs84ToGcj02(CLLocationCoordinate2D(latitude: (model.location?.lat)!, longitude: (model.location?.lon)!)) { (data) in
self.lat = data.latitude
self.lng = data.longitude
}
print("3.1",lat,lng)
mapView.setCenter(CLLocationCoordinate2DMake(23.142059,113.240747), animated: false)
// mapView.setCenter(CLLocationCoordinate2DMake(lat,lng), animated: false)
searchList.isHidden = true
closeBtn.isHidden = true
listViewBG.isHidden = true
IQKeyboardManager.shared.resignFirstResponder()
}
}
override func viewDidLoad() {
super.viewDidLoad()
citySelectBtn.setTitle(loc.name, for: .normal)
// citySelectBtn.setTitle(loc.name, for: .normal)
let searchBr = SearchBarView.init()
navBgView.addSubview(searchBr)
......@@ -134,6 +195,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
searchBr.cornerRadius = 35/2.0
searchBr.delegate = self
searchBr.delegateL = self
// searchBr.returnKeyType = .done
if idx != 0 {
sureSelectLbl.text = "确认收货地"
......@@ -146,21 +208,26 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
AMapServices.shared().apiKey = "ca417b43e3d031db9c29382cc09a174a"
manger.delegate = self
manger.requestAlwaysAuthorization()
manger.requestWhenInUseAuthorization()
manger.startUpdatingLocation()
initMapView()
initSearch()
// manger.delegate = self
// manger.requestAlwaysAuthorization()
// manger.requestWhenInUseAuthorization()
// manger.startUpdatingLocation()
searchList.layer.cornerRadius = 5
searchList.layer.maskedCorners = [CACornerMask.layerMinXMinYCorner,CACornerMask.layerMaxXMinYCorner]
searchList.register(UINib(nibName: "HuoLaLaDiZhiCell", bundle: nil), forCellReuseIdentifier: "HuoLaLaDiZhiCell")
nameTF.text = nameStr
phoneTF.text = phoneNum
addressDetailTF.text = adrStr
print("8")
}
func initMapView(){
......@@ -169,22 +236,29 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
mapView.delegate = self
mapView.zoomLevel = 16
mapView.isZoomEnabled = true
mapView.centerCoordinate = CLLocationCoordinate2DMake((loc.lat_lon?.lat)!,(loc.lat_lon?.lon)!)
// JZLocationConverter.default.gcj02ToWgs84(CLLocationCoordinate2DMake((loc.lat_lon?.lat)!,(loc.lat_lon?.lon)!)) { (result) in
// self.mapView.centerCoordinate = result
// }
self.mapView.centerCoordinate = CLLocationCoordinate2DMake(lat,lng)
print("==",lat,lng)
MapBgView.addSubview(mapView!)
let tap = UITapGestureRecognizer(target: self, action: #selector(cancelKeyboard))
mapView.addGestureRecognizer(tap)
print("4")
}
// 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
//
// }
// func setMapCenter(lat:CLLocationDegrees,lng:CLLocationDegrees) {
// mapView.setCenter(CLLocationCoordinate2D(latitude: lat, longitude: lng), animated: false)
// }
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
mapView.centerCoordinate = CLLocationCoordinate2DMake((lat),(lng))
}
func setMapCenter(lat:CLLocationDegrees,lng:CLLocationDegrees) {
mapView.setCenter(CLLocationCoordinate2D(latitude: lat, longitude: lng), animated: false)
}
@objc func cancelKeyboard(){
IQKeyboardManager.shared.resignFirstResponder()
......@@ -195,6 +269,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
search.delegate = self
let request = AMapPOIAroundSearchRequest()
//地址
print("5")
request.location = AMapGeoPoint.location(withLatitude: CGFloat(mapView.centerCoordinate.latitude), longitude: CGFloat(mapView.centerCoordinate.longitude))
request.requireExtension = true
search.aMapPOIAroundSearch(request)
......@@ -226,7 +301,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
var introView:UIView?
var titleLbl:UILabel?
var contentLbl:UILabel?
var adrArr:Array<AMapPOI> = []
// var adrArr:Array<AMapPOI> = []
var keyword = ""
var locName = ""
func onPOISearchDone(_ request: AMapPOISearchBaseRequest!, response: AMapPOISearchResponse!) {
......@@ -235,16 +310,11 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
return
}
//解析response获取POI信息,具体解析见 Demo
adrArr.removeAll()
response.pois.forEach { (poi) in
adrArr.append(poi)
}
if keyword.count > 0 {
searchList.isHidden = false
searchList.reloadData()
}
// adrArr.removeAll()
// response.pois.forEach { (poi) in
// adrArr.append(poi)
// }
print("run",response.pois.first?.location.latitude)
if introView == nil {
introView = UIView()
MapBgView.addSubview(introView!)
......@@ -263,10 +333,13 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
contentLbl?.lineBreakMode = .byCharWrapping
introView?.addSubview(contentLbl!)
}
titleLbl!.text = response.pois.first?.name
cityName = response.pois.first?.city as! NSString
locName = response.pois.first?.name as! String
if loc == nil {
citySelectBtn.setTitle(cityName as String, for: .normal)
}
//通过富文本来设置行间距
let paraph = NSMutableParagraphStyle()
//将行间距设置为28
......@@ -343,9 +416,13 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
func mapView(_ mapView: MAMapView!, mapDidMoveByUser wasUserAction: Bool) {
let req = AMapPOIAroundSearchRequest()
//地址
print("CLLocationDegrees = ",mapView.centerCoordinate.latitude,lat,CGFloat(mapView.centerCoordinate.latitude))
req.location = AMapGeoPoint.location(withLatitude: CGFloat(mapView.centerCoordinate.latitude), longitude: CGFloat(mapView.centerCoordinate.longitude))
req.requireExtension = true
search.aMapPOIAroundSearch(req)
print("6")
}
......@@ -353,7 +430,9 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
func mapViewRegionChanged(_ mapView: MAMapView!) {
let request = AMapReGeocodeSearchRequest()
request.location = AMapGeoPoint.location(withLatitude: CGFloat(mapView.centerCoordinate.latitude), longitude: CGFloat(mapView.centerCoordinate.longitude))
print("7",mapView.centerCoordinate.latitude)
search.aMapReGoecodeSearch(request)
request.requireExtension = true
......@@ -399,6 +478,8 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
print("清楚搜索文字")
}
var searchAdrDatas:Array<citySearchDataPoiModel> = []
func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
keyword = searchBar.text!
......@@ -407,15 +488,29 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
searchList.isHidden = true
}
searchBar.resignFirstResponder()
let request = AMapPOIKeywordsSearchRequest()
request.keywords = searchBar.text
request.requireExtension = true
request.cityLimit = true
request.requireSubPOIs = true
search.aMapPOIKeywordsSearch(request)
let dict = ["user_token":UserToken as Any,
"nonce_str":String.randomStr(len: 30) as Any,
"kw":keyword as Any
]
citySearch(dict, success: { (data) in
let model = data as! citySearchModel
self.searchAdrDatas.removeAll()
if (model.data?.poi!.count)! > 0 {
for item in model.data!.poi! {
self.searchAdrDatas.append(item)
}
self.searchList.isHidden = false
self.searchList.reloadData()
}
}) { (err) in
}
}
func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
// keyword = searchText
}
func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
print("调起搜索后添加个蒙版本")
......@@ -424,4 +519,5 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
return true
}
}
......@@ -61,12 +61,12 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ADf-bf-b5w">
<rect key="frame" x="56" y="13.5" width="60" height="18"/>
<rect key="frame" x="46" y="13.5" width="80" height="18"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="1ot-j5-ieI"/>
<constraint firstAttribute="width" constant="80" id="1ot-j5-ieI"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<state key="normal" title="广州" image="xiala">
<state key="normal" title=" " image="xiala">
<color key="titleColor" name="标题字颜色"/>
</state>
<connections>
......@@ -90,7 +90,7 @@
<constraint firstAttribute="trailing" secondItem="QHB-sv-BsU" secondAttribute="trailing" id="NNc-Tm-Iye"/>
<constraint firstItem="ADf-bf-b5w" firstAttribute="centerY" secondItem="gLT-4M-bfs" secondAttribute="centerY" id="OYn-qq-QJP"/>
<constraint firstItem="mc4-mS-8P7" firstAttribute="leading" secondItem="gLT-4M-bfs" secondAttribute="leading" id="QbR-Uv-mj9"/>
<constraint firstItem="ADf-bf-b5w" firstAttribute="leading" secondItem="mc4-mS-8P7" secondAttribute="trailing" constant="10" id="Sy5-bj-ulv"/>
<constraint firstItem="ADf-bf-b5w" firstAttribute="leading" secondItem="mc4-mS-8P7" secondAttribute="trailing" id="Sy5-bj-ulv"/>
<constraint firstAttribute="bottom" secondItem="QHB-sv-BsU" secondAttribute="bottom" id="rT4-u8-EiK"/>
<constraint firstItem="LY7-wU-8ih" firstAttribute="centerY" secondItem="gLT-4M-bfs" secondAttribute="centerY" id="tdR-GU-ZsW"/>
<constraint firstAttribute="height" constant="45" id="ze9-Uw-zVl"/>
......
......@@ -28,6 +28,7 @@ pod 'ViewAnimator'
pod 'SkeletonView'
pod 'SnapKit'
pod 'LGButton'
pod 'JZLocationConverterSwift'
pod 'WYAutoLayout'
end
This source diff could not be displayed because it is too large. You can view the blob instead.
//
// JZAreaManager.swift
// JZLocationConverterDemo
//
// Created by jack zhou on 23/08/2017.
// Copyright © 2017 Jack. All rights reserved.
//
import Foundation
import CoreLocation
public enum JZFileError: Error {
case FileNotFound
case EmptyData
case invalidData
}
open class JZAreaManager {
private(set) var points:Array<Array<Double>>?
fileprivate let queue = DispatchQueue(label: "JZ.LocationConverter.AreaManager")
public static let `default`: JZAreaManager = {
return JZAreaManager()
}()
public static func start(finished:((_ error:JZFileError?) -> Void)?) {
guard let filePath = Bundle(for:JZAreaManager.self).path(forResource: "GCJ02", ofType: "json") else {
DispatchQueue.main.async {
if finished != nil {
finished!(JZFileError.FileNotFound)
}
}
return
}
start(filePath: filePath) { error in
if finished != nil{
finished!(error)
}
}
}
public static func start(filePath:String!,finished:((_ error:JZFileError?) -> Void)?) {
JZAreaManager.default.queue.async {
guard let jsonString = try? String(contentsOfFile: filePath) else {
DispatchQueue.main.async {
if finished != nil {
finished!(JZFileError.EmptyData)
}
}
return
}
guard let data = jsonString.data(using: .utf8) else {
DispatchQueue.main.async {
if finished != nil {
finished!(JZFileError.invalidData)
}
}
return
}
guard let array = try? JSONSerialization.jsonObject(with: data, options: []) else {
DispatchQueue.main.async {
if finished != nil {
finished!(JZFileError.invalidData)
}
}
return
}
JZAreaManager.default.points = array as? Array<Array<Double>>
DispatchQueue.main.async {
if finished != nil {
finished!(nil)
}
}
}
}
public func isOutOfArea(gcj02Point:CLLocationCoordinate2D,result:@escaping ((_ result:Bool)->Void)) -> Void {
self.queue.async {
var flag = false
if JZAreaManager.default.points != nil {
let length = (JZAreaManager.default.points?.count)!
for idx in 0 ..< length {
let nextIdx = (idx + 1) == length ? 0 : idx + 1
let edgePoint = JZAreaManager.default.points![idx]
let nextPoint = JZAreaManager.default.points![nextIdx]
let pointX = edgePoint[1]
let pointY = edgePoint[0]
let nextPointX = nextPoint[1]
let nextPointY = nextPoint[0]
if (gcj02Point.longitude == pointX && gcj02Point.latitude == pointY) ||
(gcj02Point.longitude == nextPointX && gcj02Point.latitude == nextPointY) {
flag = true
}
if((nextPointY < gcj02Point.latitude && pointY >= gcj02Point.latitude) ||
(nextPointY >= gcj02Point.latitude && pointY < gcj02Point.latitude)) {
let thX = nextPointX + (gcj02Point.latitude - nextPointY) * (pointX - nextPointX) / (pointY - nextPointY)
if(thX == gcj02Point.longitude) {
flag = true
break
}
if(thX > gcj02Point.longitude) {
flag = !flag
}
}
}
}
DispatchQueue.main.async {
result(!flag)
}
}
}
}
//
// JZLocationConverter.swift
// JZLocationConverter-Swift
//
// Created by jack zhou on 21/07/2017.
// Copyright © 2017 Jack. All rights reserved.
//
import Foundation
import CoreLocation
extension CLLocationCoordinate2D {
struct JZConstant {
static let A = 6378245.0
static let EE = 0.00669342162296594323
}
func gcj02Offset() -> CLLocationCoordinate2D {
let x = self.longitude - 105.0
let y = self.latitude - 35.0
let latitude = (-100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * sqrt(fabs(x))) +
((20.0 * sin(6.0 * x * .pi) + 20.0 * sin(2.0 * x * .pi)) * 2.0 / 3.0) +
((20.0 * sin(y * .pi) + 40.0 * sin(y / 3.0 * .pi)) * 2.0 / 3.0) +
((160.0 * sin(y / 12.0 * .pi) + 320 * sin(y * .pi / 30.0)) * 2.0 / 3.0)
let longitude = (300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * sqrt(fabs(x))) +
((20.0 * sin(6.0 * x * .pi) + 20.0 * sin(2.0 * x * .pi)) * 2.0 / 3.0) +
((20.0 * sin(x * .pi) + 40.0 * sin(x / 3.0 * .pi)) * 2.0 / 3.0) +
((150.0 * sin(x / 12.0 * .pi) + 300.0 * sin(x / 30.0 * .pi)) * 2.0 / 3.0)
let radLat = 1 - self.latitude / 180.0 * .pi;
var magic = sin(radLat);
magic = 1 - JZConstant.EE * magic * magic
let sqrtMagic = sqrt(magic);
let dLat = (latitude * 180.0) / ((JZConstant.A * (1 - JZConstant.EE)) / (magic * sqrtMagic) * .pi);
let dLon = (longitude * 180.0) / (JZConstant.A / sqrtMagic * cos(radLat) * .pi);
return CLLocationCoordinate2DMake(dLat, dLon);
}
}
open class JZLocationConverter {
fileprivate let queue = DispatchQueue(label: "JZ.LocationConverter.Converter")
public static let `default`: JZLocationConverter = {
return JZLocationConverter()
}()
public static func start(filePath:String!,finished:((_ error:JZFileError?) -> Void)?) {
JZAreaManager.start(filePath: filePath, finished: finished)
}
public static func start(finished:((_ error:JZFileError?) -> Void)?) {
JZAreaManager.start(finished: finished)
}
}
//GCJ02
extension JZLocationConverter {
fileprivate func gcj02Encrypt(_ wgs84Point:CLLocationCoordinate2D,result:@escaping (_ gcj02Point:CLLocationCoordinate2D) -> Void) {
self.queue.async {
let offsetPoint = wgs84Point.gcj02Offset()
let resultPoint = CLLocationCoordinate2DMake(wgs84Point.latitude + offsetPoint.latitude, wgs84Point.longitude + offsetPoint.longitude)
JZAreaManager.default.isOutOfArea(gcj02Point: resultPoint, result: { (isOut:Bool) in
DispatchQueue.main.async {
if isOut {
result(wgs84Point)
}else {
result(resultPoint)
}
}
})
}
}
fileprivate func gcj02Decrypt(_ gcj02Point:CLLocationCoordinate2D,result:@escaping (_ wgs84Point:CLLocationCoordinate2D) -> Void) {
JZAreaManager.default.isOutOfArea(gcj02Point: gcj02Point, result: { (isOut:Bool) in
if isOut {
DispatchQueue.main.async {
result(gcj02Point)
}
}else {
self.gcj02Encrypt(gcj02Point) { (mgPoint:CLLocationCoordinate2D) in
self.queue.async {
let resultPoint = CLLocationCoordinate2DMake(gcj02Point.latitude * 2 - mgPoint.latitude,gcj02Point.longitude * 2 - mgPoint.longitude)
DispatchQueue.main.async {
result(resultPoint)
}
}
}
}
})
}
}
//BD09
extension JZLocationConverter {
fileprivate func bd09Encrypt(_ gcj02Point:CLLocationCoordinate2D,result:@escaping (_ bd09Point:CLLocationCoordinate2D) -> Void) {
self.queue.async {
let x = gcj02Point.longitude
let y = gcj02Point.latitude
let z = sqrt(x * x + y * y) + 0.00002 * sin(y * .pi);
let theta = atan2(y, x) + 0.000003 * cos(x * .pi);
let resultPoint = CLLocationCoordinate2DMake(z * sin(theta) + 0.006, z * cos(theta) + 0.0065)
DispatchQueue.main.async {
result(resultPoint)
}
}
}
fileprivate func bd09Decrypt(_ bd09Point:CLLocationCoordinate2D,result:@escaping (_ gcj02Point:CLLocationCoordinate2D) -> Void) {
self.queue.async {
let x = bd09Point.longitude - 0.0065
let y = bd09Point.latitude - 0.006
let z = sqrt(x * x + y * y) - 0.00002 * sin(y * .pi);
let theta = atan2(y, x) - 0.000003 * cos(x * .pi);
let resultPoint = CLLocationCoordinate2DMake(z * sin(theta), z * cos(theta))
DispatchQueue.main.async {
result(resultPoint)
}
}
}
}
extension JZLocationConverter {
public func wgs84ToGcj02(_ wgs84Point:CLLocationCoordinate2D,result:@escaping (_ gcj02Point:CLLocationCoordinate2D) -> Void) {
self.gcj02Encrypt(wgs84Point, result: result)
}
public func wgs84ToBd09(_ wgs84Point:CLLocationCoordinate2D,result:@escaping (_ bd09Point:CLLocationCoordinate2D) -> Void) {
self.gcj02Encrypt(wgs84Point) { (gcj02Point:CLLocationCoordinate2D) in
self.bd09Encrypt(gcj02Point, result: result);
}
}
public func gcj02ToWgs84(_ gcj02Point:CLLocationCoordinate2D,result:@escaping (_ wgs84Point:CLLocationCoordinate2D) -> Void) {
self.gcj02Decrypt(gcj02Point, result: result)
}
public func gcj02ToBd09(_ gcj02Point:CLLocationCoordinate2D,result:@escaping (_ bd09Point:CLLocationCoordinate2D) -> Void) {
self.bd09Encrypt(gcj02Point, result: result);
}
public func bd09ToGcj02(_ bd09Point:CLLocationCoordinate2D,result:@escaping (_ gcj02Point:CLLocationCoordinate2D) -> Void) {
self.bd09Decrypt(bd09Point, result: result)
}
public func bd09ToWgs84(_ bd09Point:CLLocationCoordinate2D,result:@escaping (_ wgs84Point:CLLocationCoordinate2D) -> Void) {
self.bd09Decrypt(bd09Point) { (gcj02Point:CLLocationCoordinate2D) in
self.gcj02Decrypt(gcj02Point, result: result);
}
}
}
WGS-84世界标准坐标、GCJ-02中国国测局(火星坐标)、BD-09百度坐标系转换
===================
[![iOS](https://img.shields.io/badge/iOS-8.0%2B-green.svg)](https://apple.com)
[![Swift](https://img.shields.io/badge/Swift-3.1-orange.svg)](https://swift.org)
[![Xcode](https://img.shields.io/badge/Xcode-8.3-blue.svg)](https://developer.apple.com/xcode)
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
[![CocoaPods](https://img.shields.io/cocoapods/v/JZLocationConverter-Swift.svg)](https://cocoapods.org)
# Demo
<img src="1.gif" width="50%" height="50%">
# 使用
### 支持 [Carthage](https://github.com/Carthage/Carthage),添加以下代码到你的Cartfile文件中:
```
github "JackZhouCn/JZLocationConverter-Swift"
```
## 1、在APP启动时加载[大陆边境线数据](#关于大陆边境线数据):
```swift
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
JZLocationConverter.start(filePath: Bundle(for:JZAreaManager.self).path(forResource: "GCJ02", ofType: "json")) { (error:JZFileError?) in
if error != nil {
print("失败")
}else {
print("成功")
}
}
return true
}
```
## 2、转换方法都在转换工具单例类内
```swift
JZLocationConverter.default
```
## 3、目前有:
### WGS-84 -> GCJ-02
### 此接口当输入坐标为中国大陆以外时,仍旧返回WGS-84坐标
```swift
public func wgs84ToGcj02(_ wgs84Point:CLLocationCoordinate2D,result:@escaping (_ gcj02Point:CLLocationCoordinate2D) -> Void)
```
### GCJ-02 -> WGS-84
### 此接口有1-2米左右的误差,需要精确的场景慎用
```swift
public func gcj02ToWgs84(_ gcj02Point:CLLocationCoordinate2D,result:@escaping (_ wgs84Point:CLLocationCoordinate2D) -> Void)
```
### WGS-84 -> BD-09
```swift
public func wgs84ToBd09(_ wgs84Point:CLLocationCoordinate2D,result:@escaping (_ bd09Point:CLLocationCoordinate2D) -> Void)
```
### BD-09 -> WGS-84
```swift
public func bd09ToWgs84(_ bd09Point:CLLocationCoordinate2D,result:@escaping (_ wgs84Point:CLLocationCoordinate2D) -> Void)
```
## GCJ-02 -> BD-09
```swift
public func gcj02ToBd09(_ gcj02Point:CLLocationCoordinate2D,result:@escaping (_ bd09Point:CLLocationCoordinate2D) -> Void)
```
### BD-09 -> GCJ-02
### 此接口有1-2米左右的误差,需要精确的场景慎用
```swift
public func bd09ToGcj02(_ bd09Point:CLLocationCoordinate2D,result:@escaping (_ gcj02Point:CLLocationCoordinate2D) -> Void)
```
# 关于大陆边境线数据
### 1、默认的边境线数据位于项目的GCJ02.json文件中
### 2、默认的边境线数据来自「百度地图」API并转换到GCJ02
### 3、如果你需要使用自己的边境线数据(需要GCJ02坐标),只需要在[启动](#1%E5%9C%A8app%E5%90%AF%E5%8A%A8%E6%97%B6%E5%8A%A0%E8%BD%BD%E8%BE%B9%E5%A2%83%E7%BA%BF%E6%95%B0%E6%8D%AE)时加载自己的数据即可
### 4、默认的大陆边境线数据范围
<img src="FAF6739F-A027-411B-BAA8-4B6B1485E374.png" width="100%" height="100%">
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -14,9 +14,9 @@
buildForArchiving = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "68494F30B4A13F8E5E88BCCAEC25B0A4"
BuildableName = "Realm.framework"
BlueprintName = "Realm"
BlueprintIdentifier = "8A1DC7C9992BBE1D1BB615909F3A1A42"
BuildableName = "JZLocationConverterSwift.framework"
BlueprintName = "JZLocationConverterSwift"
ReferencedContainer = "container:Pods.xcodeproj">
</BuildableReference>
</BuildActionEntry>
......
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForAnalyzing = "YES"
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "782725687624F8665247B84AB581BEB1"
BuildableName = "RealmSwift.framework"
BlueprintName = "RealmSwift"
ReferencedContainer = "container:Pods.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
buildConfiguration = "Debug"
allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
......@@ -8,158 +8,101 @@
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>BabyBluetooth.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>21</integer>
</dict>
<key>CryptoSwift.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>Dollar.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>ESTabBarController-swift.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>Hue.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>IQKeyboardManagerSwift.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>JZLocationConverterSwift.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
</dict>
<key>Kingfisher.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>6</integer>
</dict>
<key>LGButton.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>7</integer>
</dict>
<key>MJRefresh.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>8</integer>
</dict>
<key>ObjectMapper.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>9</integer>
</dict>
<key>Pods-GeliBusinessPlatform.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>10</integer>
</dict>
<key>ReachabilitySwift.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>11</integer>
</dict>
<key>Realm.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>12</integer>
</dict>
<key>RealmSwift.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>13</integer>
</dict>
<key>SVProgressHUD.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>22</integer>
</dict>
<key>SkeletonView.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>14</integer>
</dict>
<key>SnapKit.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>15</integer>
</dict>
<key>SwiftDate.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>16</integer>
</dict>
<key>SwifterSwift.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>17</integer>
</dict>
<key>SwiftyJSON.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>18</integer>
</dict>
<key>ViewAnimator.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>19</integer>
</dict>
<key>WYAutoLayout.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>20</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.3.1</string>
<string>1.3.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${CURRENT_PROJECT_VERSION}</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
#import <Foundation/Foundation.h>
@interface PodsDummy_JZLocationConverterSwift : NSObject
@end
@implementation PodsDummy_JZLocationConverterSwift
@end
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
FOUNDATION_EXPORT double JZLocationConverterSwiftVersionNumber;
FOUNDATION_EXPORT const unsigned char JZLocationConverterSwiftVersionString[];
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/JZLocationConverterSwift
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -suppress-warnings
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}
PODS_TARGET_SRCROOT = ${PODS_ROOT}/JZLocationConverterSwift
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES
USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES
framework module JZLocationConverterSwift {
umbrella header "JZLocationConverterSwift-umbrella.h"
export *
module * { export * }
}
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/JZLocationConverterSwift
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -suppress-warnings
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}
PODS_TARGET_SRCROOT = ${PODS_ROOT}/JZLocationConverterSwift
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES
USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.4.3</string>
<string>3.4.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>4.2.0</string>
<string>3.5.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -203,6 +203,7 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
install_framework "${BUILT_PRODUCTS_DIR}/ESTabBarController-swift/ESTabBarController_swift.framework"
install_framework "${BUILT_PRODUCTS_DIR}/Hue/Hue.framework"
install_framework "${BUILT_PRODUCTS_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.framework"
install_framework "${BUILT_PRODUCTS_DIR}/JZLocationConverterSwift/JZLocationConverterSwift.framework"
install_framework "${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework"
install_framework "${BUILT_PRODUCTS_DIR}/LGButton/LGButton.framework"
install_framework "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework"
......@@ -223,6 +224,7 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
install_framework "${BUILT_PRODUCTS_DIR}/ESTabBarController-swift/ESTabBarController_swift.framework"
install_framework "${BUILT_PRODUCTS_DIR}/Hue/Hue.framework"
install_framework "${BUILT_PRODUCTS_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.framework"
install_framework "${BUILT_PRODUCTS_DIR}/JZLocationConverterSwift/JZLocationConverterSwift.framework"
install_framework "${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework"
install_framework "${BUILT_PRODUCTS_DIR}/LGButton/LGButton.framework"
install_framework "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework"
......
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" "${PODS_CONFIGURATION_BUILD_DIR}/Dollar" "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift" "${PODS_CONFIGURATION_BUILD_DIR}/Hue" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift" "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher" "${PODS_CONFIGURATION_BUILD_DIR}/LGButton" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate" "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON" "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator" "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" "${PODS_CONFIGURATION_BUILD_DIR}/Dollar" "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift" "${PODS_CONFIGURATION_BUILD_DIR}/Hue" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift" "${PODS_CONFIGURATION_BUILD_DIR}/JZLocationConverterSwift" "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher" "${PODS_CONFIGURATION_BUILD_DIR}/LGButton" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate" "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON" "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator" "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Dollar/Dollar.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift/ESTabBarController_swift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Hue/Hue.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/LGButton/LGButton.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper/ObjectMapper.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView/SkeletonView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate/SwiftDate.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON/SwiftyJSON.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator/ViewAnimator.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout/WYAutoLayout.framework/Headers"
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Dollar/Dollar.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift/ESTabBarController_swift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Hue/Hue.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/JZLocationConverterSwift/JZLocationConverterSwift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/LGButton/LGButton.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper/ObjectMapper.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView/SkeletonView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate/SwiftDate.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON/SwiftyJSON.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator/ViewAnimator.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout/WYAutoLayout.framework/Headers"
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
OTHER_CFLAGS = $(inherited) -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Dollar/Dollar.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift/ESTabBarController_swift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Hue/Hue.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/LGButton/LGButton.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper/ObjectMapper.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView/SkeletonView.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate/SwiftDate.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON/SwiftyJSON.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator/ViewAnimator.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout/WYAutoLayout.framework/Headers" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Dollar" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Hue" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/LGButton" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout"
OTHER_LDFLAGS = $(inherited) -framework "Alamofire" -framework "CFNetwork" -framework "CoreGraphics" -framework "CoreTelephony" -framework "CryptoSwift" -framework "Dollar" -framework "ESTabBarController_swift" -framework "Foundation" -framework "Hue" -framework "IQKeyboardManagerSwift" -framework "Kingfisher" -framework "LGButton" -framework "MJRefresh" -framework "ObjectMapper" -framework "QuartzCore" -framework "Reachability" -framework "SkeletonView" -framework "SnapKit" -framework "SwiftDate" -framework "SwifterSwift" -framework "SwiftyJSON" -framework "SystemConfiguration" -framework "UIKit" -framework "ViewAnimator" -framework "WYAutoLayout"
OTHER_CFLAGS = $(inherited) -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Dollar/Dollar.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift/ESTabBarController_swift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Hue/Hue.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/JZLocationConverterSwift/JZLocationConverterSwift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/LGButton/LGButton.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper/ObjectMapper.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView/SkeletonView.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate/SwiftDate.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON/SwiftyJSON.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator/ViewAnimator.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout/WYAutoLayout.framework/Headers" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Dollar" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Hue" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/JZLocationConverterSwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/LGButton" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout"
OTHER_LDFLAGS = $(inherited) -framework "Alamofire" -framework "CFNetwork" -framework "CoreGraphics" -framework "CoreTelephony" -framework "CryptoSwift" -framework "Dollar" -framework "ESTabBarController_swift" -framework "Foundation" -framework "Hue" -framework "IQKeyboardManagerSwift" -framework "JZLocationConverterSwift" -framework "Kingfisher" -framework "LGButton" -framework "MJRefresh" -framework "ObjectMapper" -framework "QuartzCore" -framework "Reachability" -framework "SkeletonView" -framework "SnapKit" -framework "SwiftDate" -framework "SwifterSwift" -framework "SwiftyJSON" -framework "SystemConfiguration" -framework "UIKit" -framework "ViewAnimator" -framework "WYAutoLayout"
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
......
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" "${PODS_CONFIGURATION_BUILD_DIR}/Dollar" "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift" "${PODS_CONFIGURATION_BUILD_DIR}/Hue" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift" "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher" "${PODS_CONFIGURATION_BUILD_DIR}/LGButton" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate" "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON" "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator" "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" "${PODS_CONFIGURATION_BUILD_DIR}/Dollar" "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift" "${PODS_CONFIGURATION_BUILD_DIR}/Hue" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift" "${PODS_CONFIGURATION_BUILD_DIR}/JZLocationConverterSwift" "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher" "${PODS_CONFIGURATION_BUILD_DIR}/LGButton" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate" "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON" "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator" "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Dollar/Dollar.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift/ESTabBarController_swift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Hue/Hue.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/LGButton/LGButton.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper/ObjectMapper.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView/SkeletonView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate/SwiftDate.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON/SwiftyJSON.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator/ViewAnimator.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout/WYAutoLayout.framework/Headers"
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Dollar/Dollar.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift/ESTabBarController_swift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Hue/Hue.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/JZLocationConverterSwift/JZLocationConverterSwift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/LGButton/LGButton.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper/ObjectMapper.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView/SkeletonView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate/SwiftDate.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON/SwiftyJSON.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator/ViewAnimator.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout/WYAutoLayout.framework/Headers"
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
OTHER_CFLAGS = $(inherited) -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Dollar/Dollar.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift/ESTabBarController_swift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Hue/Hue.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/LGButton/LGButton.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper/ObjectMapper.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView/SkeletonView.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate/SwiftDate.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON/SwiftyJSON.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator/ViewAnimator.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout/WYAutoLayout.framework/Headers" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Dollar" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Hue" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/LGButton" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout"
OTHER_LDFLAGS = $(inherited) -framework "Alamofire" -framework "CFNetwork" -framework "CoreGraphics" -framework "CoreTelephony" -framework "CryptoSwift" -framework "Dollar" -framework "ESTabBarController_swift" -framework "Foundation" -framework "Hue" -framework "IQKeyboardManagerSwift" -framework "Kingfisher" -framework "LGButton" -framework "MJRefresh" -framework "ObjectMapper" -framework "QuartzCore" -framework "Reachability" -framework "SkeletonView" -framework "SnapKit" -framework "SwiftDate" -framework "SwifterSwift" -framework "SwiftyJSON" -framework "SystemConfiguration" -framework "UIKit" -framework "ViewAnimator" -framework "WYAutoLayout"
OTHER_CFLAGS = $(inherited) -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Dollar/Dollar.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift/ESTabBarController_swift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Hue/Hue.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/JZLocationConverterSwift/JZLocationConverterSwift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/LGButton/LGButton.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper/ObjectMapper.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView/SkeletonView.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate/SwiftDate.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON/SwiftyJSON.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator/ViewAnimator.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout/WYAutoLayout.framework/Headers" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Dollar" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Hue" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/JZLocationConverterSwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/LGButton" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout"
OTHER_LDFLAGS = $(inherited) -framework "Alamofire" -framework "CFNetwork" -framework "CoreGraphics" -framework "CoreTelephony" -framework "CryptoSwift" -framework "Dollar" -framework "ESTabBarController_swift" -framework "Foundation" -framework "Hue" -framework "IQKeyboardManagerSwift" -framework "JZLocationConverterSwift" -framework "Kingfisher" -framework "LGButton" -framework "MJRefresh" -framework "ObjectMapper" -framework "QuartzCore" -framework "Reachability" -framework "SkeletonView" -framework "SnapKit" -framework "SwiftDate" -framework "SwifterSwift" -framework "SwiftyJSON" -framework "SystemConfiguration" -framework "UIKit" -framework "ViewAnimator" -framework "WYAutoLayout"
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.1.0</string>
<string>1.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
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