Skip to content

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

显示定位按钮

parent fd7464d2
Show whitespace changes
Inline Side-by-side
Showing with 176 additions and 2 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ e742f359
...@@ -191,6 +191,8 @@ ...@@ -191,6 +191,8 @@
E07B1E6F245929060055BA3C /* GYSGLViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E07B1E6D245929060055BA3C /* GYSGLViewController.swift */; }; E07B1E6F245929060055BA3C /* GYSGLViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E07B1E6D245929060055BA3C /* GYSGLViewController.swift */; };
E07B1E70245929060055BA3C /* GYSGLViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07B1E6E245929060055BA3C /* GYSGLViewController.xib */; }; E07B1E70245929060055BA3C /* GYSGLViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07B1E6E245929060055BA3C /* GYSGLViewController.xib */; };
E07C20CC24B301CD006CAB9D /* AuthenticationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E07C20CB24B301CD006CAB9D /* AuthenticationServices.framework */; }; E07C20CC24B301CD006CAB9D /* AuthenticationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E07C20CB24B301CD006CAB9D /* AuthenticationServices.framework */; };
E07C2FFA24ECCD4D0043649B /* GLMessageAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E07C2FF924ECCD4D0043649B /* GLMessageAlertView.swift */; };
E07C2FFC24ECCD590043649B /* GLMessageAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07C2FFB24ECCD590043649B /* GLMessageAlertView.xib */; };
E0833B8524D8F6A00014F3E9 /* PaymentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0833B8424D8F6A00014F3E9 /* PaymentView.xib */; }; E0833B8524D8F6A00014F3E9 /* PaymentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0833B8424D8F6A00014F3E9 /* PaymentView.xib */; };
E0833B8724D8F96D0014F3E9 /* PaymentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0833B8624D8F96D0014F3E9 /* PaymentView.swift */; }; E0833B8724D8F96D0014F3E9 /* PaymentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0833B8624D8F96D0014F3E9 /* PaymentView.swift */; };
E088CC8D24470BF0000DAA8A /* CodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E088CC8C24470BF0000DAA8A /* CodeView.swift */; }; E088CC8D24470BF0000DAA8A /* CodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E088CC8C24470BF0000DAA8A /* CodeView.swift */; };
...@@ -818,6 +820,8 @@ ...@@ -818,6 +820,8 @@
E07B1E6D245929060055BA3C /* GYSGLViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GYSGLViewController.swift; sourceTree = "<group>"; }; E07B1E6D245929060055BA3C /* GYSGLViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GYSGLViewController.swift; sourceTree = "<group>"; };
E07B1E6E245929060055BA3C /* GYSGLViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GYSGLViewController.xib; sourceTree = "<group>"; }; E07B1E6E245929060055BA3C /* GYSGLViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GYSGLViewController.xib; sourceTree = "<group>"; };
E07C20CB24B301CD006CAB9D /* AuthenticationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AuthenticationServices.framework; path = System/Library/Frameworks/AuthenticationServices.framework; sourceTree = SDKROOT; }; E07C20CB24B301CD006CAB9D /* AuthenticationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AuthenticationServices.framework; path = System/Library/Frameworks/AuthenticationServices.framework; sourceTree = SDKROOT; };
E07C2FF924ECCD4D0043649B /* GLMessageAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GLMessageAlertView.swift; sourceTree = "<group>"; };
E07C2FFB24ECCD590043649B /* GLMessageAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GLMessageAlertView.xib; sourceTree = "<group>"; };
E0833B8424D8F6A00014F3E9 /* PaymentView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PaymentView.xib; sourceTree = "<group>"; }; E0833B8424D8F6A00014F3E9 /* PaymentView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PaymentView.xib; sourceTree = "<group>"; };
E0833B8624D8F96D0014F3E9 /* PaymentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentView.swift; sourceTree = "<group>"; }; E0833B8624D8F96D0014F3E9 /* PaymentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentView.swift; sourceTree = "<group>"; };
E088CC8C24470BF0000DAA8A /* CodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeView.swift; sourceTree = "<group>"; }; E088CC8C24470BF0000DAA8A /* CodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeView.swift; sourceTree = "<group>"; };
...@@ -2867,6 +2871,8 @@ ...@@ -2867,6 +2871,8 @@
F93E320E2473DF2300524DFC /* GeliAlertTextView.xib */, F93E320E2473DF2300524DFC /* GeliAlertTextView.xib */,
F9697247248F88C70010D39B /* GeliAltetCodeView.swift */, F9697247248F88C70010D39B /* GeliAltetCodeView.swift */,
F9697245248F88BB0010D39B /* GeliAltetCodeView.xib */, F9697245248F88BB0010D39B /* GeliAltetCodeView.xib */,
E07C2FF924ECCD4D0043649B /* GLMessageAlertView.swift */,
E07C2FFB24ECCD590043649B /* GLMessageAlertView.xib */,
); );
path = AlertView; path = AlertView;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -3345,6 +3351,7 @@ ...@@ -3345,6 +3351,7 @@
F9B9FAC424DE3BA200ACDC8F /* LalamoveBillTableViewCell.xib in Resources */, F9B9FAC424DE3BA200ACDC8F /* LalamoveBillTableViewCell.xib in Resources */,
F95A9ED9245520E500867849 /* OrderListVC.xib in Resources */, F95A9ED9245520E500867849 /* OrderListVC.xib in Resources */,
E099B589246BF8FA009F587F /* OrderDViewController.xib in Resources */, E099B589246BF8FA009F587F /* OrderDViewController.xib in Resources */,
E07C2FFC24ECCD590043649B /* GLMessageAlertView.xib in Resources */,
E0BE8A91245A9B9600E80134 /* YingFuZhangKuanCell.xib in Resources */, E0BE8A91245A9B9600E80134 /* YingFuZhangKuanCell.xib in Resources */,
E0EFB9C724930C0D005FB0CD /* CGDListViewController.xib in Resources */, E0EFB9C724930C0D005FB0CD /* CGDListViewController.xib in Resources */,
E02DDD9A24501A5B00ABB707 /* DelGuiGeCell.xib in Resources */, E02DDD9A24501A5B00ABB707 /* DelGuiGeCell.xib in Resources */,
...@@ -3646,6 +3653,7 @@ ...@@ -3646,6 +3653,7 @@
F950FDD724518B9500C40530 /* FSCalendarCollectionView.m in Sources */, F950FDD724518B9500C40530 /* FSCalendarCollectionView.m in Sources */,
E02C88262456B24F00925766 /* WuLiuGenZongViewController.swift in Sources */, E02C88262456B24F00925766 /* WuLiuGenZongViewController.swift in Sources */,
E09B03C62445BF6700211A51 /* NavBarView.swift in Sources */, E09B03C62445BF6700211A51 /* NavBarView.swift in Sources */,
E07C2FFA24ECCD4D0043649B /* GLMessageAlertView.swift in Sources */,
E0A409D02464041200CFF109 /* ThirdCell.swift in Sources */, E0A409D02464041200CFF109 /* ThirdCell.swift in Sources */,
F956D59F246A2D9C003FF510 /* LMNPhotoCollectionCell.m in Sources */, F956D59F246A2D9C003FF510 /* LMNPhotoCollectionCell.m in Sources */,
F950FDE424518B9500C40530 /* FSCalendarTransitionCoordinator.m in Sources */, F950FDE424518B9500C40530 /* FSCalendarTransitionCoordinator.m in Sources */,
......
GeliBusinessPlatform/View/AlertView/GLMessageAlertView.swift 0 → 100644
View file @ e742f359
//
// GLMessageAlertView.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/8/19.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
protocol GLMessageAlertViewDelegate {
func GLMessageAlertViewCloseAction()
}
class GLMessageAlertView: UIView {
var contentView:UIView!
var delegate:GLMessageAlertViewDelegate?
@IBAction func submitAction(_ sender: Any) {
delegate?.GLMessageAlertViewCloseAction()
}
var datasArr:Array<Any> = []
@IBOutlet weak var btnLbl: UILabel!
@IBAction func closeAction(_ sender: UIButton) {
sender.removeFromSuperview()
delegate?.GLMessageAlertViewCloseAction()
}
//初始化时将xib中的view添加进来
override init(frame: CGRect) {
super.init(frame: frame)
contentView = loadViewFromNib()
addSubview(contentView)
contentView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
}
// /初始化时将xib中的view添加进来
required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
contentView = loadViewFromNib()
addSubview(contentView)
contentView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
}
//加载xib
func loadViewFromNib() -> UIView {
let className = type(of: self)
let bundle = Bundle(for: className)
let name = NSStringFromClass(className).components(separatedBy: ".").last
let nib = UINib(nibName: name!, bundle: bundle)
let view = nib.instantiate(withOwner: self, options: nil).first as! UIView
return view
}
}
GeliBusinessPlatform/View/AlertView/GLMessageAlertView.xib 0 → 100644
View file @ e742f359
<?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" customClass="GLMessageAlertView" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="btnLbl" destination="J4M-4x-wWQ" id="L5R-bG-Rv3"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" alpha="0.40000000000000002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6IR-Z3-KFf">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<color key="backgroundColor" name="标题字颜色"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="Button"/>
<connections>
<action selector="closeAction:" destination="-1" eventType="touchUpInside" id="2ne-5u-y8n"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2v6-Uq-44p" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="813" width="414" height="83"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
<color key="value" name="按钮渐变色上"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="gradientEndColor">
<color key="value" name="按钮渐变色下,字体颜色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="submitAction:" destination="-1" eventType="touchUpInside" id="HCI-rY-Mg8"/>
</connections>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确定" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J4M-4x-wWQ">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<constraints>
<constraint firstAttribute="height" constant="49" id="eGu-Pm-Iy5"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="17"/>
<color key="textColor" name="白色背景色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="6IR-Z3-KFf" secondAttribute="trailing" id="1St-sF-4tf"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="J4M-4x-wWQ" secondAttribute="bottom" id="9Ct-Qj-noH"/>
<constraint firstItem="6IR-Z3-KFf" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Bje-CU-4R6"/>
<constraint firstAttribute="bottom" secondItem="2v6-Uq-44p" secondAttribute="bottom" id="JqB-jb-6JL"/>
<constraint firstItem="J4M-4x-wWQ" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="LoT-OL-eaf"/>
<constraint firstItem="2v6-Uq-44p" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Pff-UQ-MdA"/>
<constraint firstAttribute="trailing" secondItem="2v6-Uq-44p" secondAttribute="trailing" id="SIE-fO-goD"/>
<constraint firstAttribute="bottom" secondItem="6IR-Z3-KFf" secondAttribute="bottom" id="lc5-5I-4Nm"/>
<constraint firstItem="6IR-Z3-KFf" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="ty5-uJ-slj"/>
<constraint firstItem="2v6-Uq-44p" firstAttribute="top" secondItem="J4M-4x-wWQ" secondAttribute="top" id="vII-n5-kU6"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="J4M-4x-wWQ" secondAttribute="trailing" id="zmi-XG-FAL"/>
</constraints>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<point key="canvasLocation" x="131.8840579710145" y="112.5"/>
</view>
</objects>
<resources>
<namedColor name="按钮渐变色上">
<color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮渐变色下,字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" 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="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift
View file @ e742f359
...@@ -895,7 +895,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -895,7 +895,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
self.locBtn.setTitle(" " + (firstPL?.postalAddress?.city)!, for: .normal) self.locBtn.setTitle(" " + (firstPL?.postalAddress?.city)!, for: .normal)
self.selectLoc = (firstPL?.postalAddress?.city)! self.selectLoc = (firstPL?.postalAddress?.city)!
self.locBtn.sizeToFit() self.locBtn.sizeToFit()
self.view.addSubview(self.locBtn)
self.locBtn.snp_makeConstraints({ (make) in self.locBtn.snp_makeConstraints({ (make) in
make.right.equalTo(-15) make.right.equalTo(-15)
...@@ -968,6 +967,23 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -968,6 +967,23 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
hListView.register(UINib(nibName: "WayBillAddressCanDelItemCell", bundle: nil), forCellReuseIdentifier: "WayBillAddressCanDelItemCell") hListView.register(UINib(nibName: "WayBillAddressCanDelItemCell", bundle: nil), forCellReuseIdentifier: "WayBillAddressCanDelItemCell")
lenyunAppointmentTime() lenyunAppointmentTime()
self.locBtn.isUserInteractionEnabled = false
self.locBtn.setImage(UIImage(named: "dzdingwei"), for: .normal)
self.locBtn.setTitleColor(UIColor(named: "蓝色字体颜色"), for: .normal)
self.locBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
self.locBtn.addTarget(self, action: #selector(self.locSelect), for: .touchUpInside)
self.locBtn.setTitle(" " + "未定位", for: .normal)
self.locBtn.sizeToFit()
self.view.addSubview(self.locBtn)
self.locBtn.snp_makeConstraints({ (make) in
make.right.equalTo(-15)
make.bottom.equalTo(self.navbar.snp_bottom).offset(-7)
make.height.equalTo(30)
make.width.equalTo(self.locBtn.bounds.size.width)
})
} }
//MARK:--//冷运请求期望上门时间 //MARK:--//冷运请求期望上门时间
......
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ e742f359
...@@ -565,9 +565,11 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -565,9 +565,11 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
return return
case 90: //下运单 case 90: //下运单
// HUD.flash(.label("敬请期待"),delay: 1.2) // HUD.flash(.label("敬请期待"),delay: 1.2)
// let view = GLMessageAlertView(frame: self.view.bounds)
// self.view.addSubview(view)
let vc = XiaYunDanViewController() let vc = XiaYunDanViewController()
// let vc = WaybillDetailViewController()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 92: //采购订单管理 case 92: //采购订单管理
......
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