Skip to content

F
FastService
Commit b652a1df by xuning
Options

搜索

parent f70a0a84
Showing with 2321 additions and 180 deletions
FastService.xcodeproj/project.pbxproj
......@@ -7,6 +7,16 @@
objects = {
/* Begin PBXBuildFile section */
79267A9C2DBA8E0F000D2180 /* WMDragView.m in Sources */ = {isa = PBXBuildFile; fileRef = 79267A9A2DBA8E0F000D2180 /* WMDragView.m */; };
79267AA02DBBCEE2000D2180 /* XVOrderSearchView.m in Sources */ = {isa = PBXBuildFile; fileRef = 79267A9F2DBBCEE2000D2180 /* XVOrderSearchView.m */; };
798136512DB7AD84004BC05B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 798136502DB7AD84004BC05B /* CoreGraphics.framework */; };
798136532DB7AD90004BC05B /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 798136522DB7AD90004BC05B /* CoreLocation.framework */; };
798136572DB7ADB6004BC05B /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 798136562DB7ADB6004BC05B /* OpenGLES.framework */; };
798136592DB7ADC1004BC05B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 798136582DB7ADC1004BC05B /* QuartzCore.framework */; };
7981365B2DB7ADC7004BC05B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7981365A2DB7ADC7004BC05B /* Security.framework */; };
7981365D2DB7ADCD004BC05B /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7981365C2DB7ADCD004BC05B /* SystemConfiguration.framework */; };
798136602DB7ADF9004BC05B /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7981365F2DB7ADF9004BC05B /* Accelerate.framework */; };
798136622DB7AE03004BC05B /* AVFAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 798136612DB7AE03004BC05B /* AVFAudio.framework */; };
7981EAB72B6E669000F357E7 /* UIScrollView+XVAdd.m in Sources */ = {isa = PBXBuildFile; fileRef = 7981EAB62B6E669000F357E7 /* UIScrollView+XVAdd.m */; };
7981EABA2B6E670200F357E7 /* UIView+XVAdd.m in Sources */ = {isa = PBXBuildFile; fileRef = 7981EAB92B6E670200F357E7 /* UIView+XVAdd.m */; };
7981EABD2B6E675F00F357E7 /* NSString+XVAdd.m in Sources */ = {isa = PBXBuildFile; fileRef = 7981EABC2B6E675F00F357E7 /* NSString+XVAdd.m */; };
......@@ -60,6 +70,50 @@
08D109EE60B32403F3655A70 /* Pods_fastservice.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_fastservice.framework; sourceTree = BUILT_PRODUCTS_DIR; };
0A560A1F356C4AB4EE319B53 /* Pods-fastservice.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-fastservice.debug.xcconfig"; path = "Target Support Files/Pods-fastservice/Pods-fastservice.debug.xcconfig"; sourceTree = "<group>"; };
6102ECAEC07A0BE24F1B6143 /* Pods-fastservice.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-fastservice.release.xcconfig"; path = "Target Support Files/Pods-fastservice/Pods-fastservice.release.xcconfig"; sourceTree = "<group>"; };
79267A992DBA8E0F000D2180 /* WMDragView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WMDragView.h; sourceTree = "<group>"; };
79267A9A2DBA8E0F000D2180 /* WMDragView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WMDragView.m; sourceTree = "<group>"; };
79267A9E2DBBCEE2000D2180 /* XVOrderSearchView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XVOrderSearchView.h; sourceTree = "<group>"; };
79267A9F2DBBCEE2000D2180 /* XVOrderSearchView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XVOrderSearchView.m; sourceTree = "<group>"; };
798136262DB7AD09004BC05B /* BaiduMapAPI_Map.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BaiduMapAPI_Map.framework; path = "Pods/BaiduNaviKit-All/BaiduNaviKit-All/MapSDK/BaiduMapAPI_Map.framework"; sourceTree = "<group>"; };
798136272DB7AD09004BC05B /* BaiduMapAPI_WalkNavi.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BaiduMapAPI_WalkNavi.framework; path = "Pods/BaiduNaviKit-All/BaiduNaviKit-All/MapSDK/BaiduMapAPI_WalkNavi.framework"; sourceTree = "<group>"; };
798136282DB7AD09004BC05B /* BaiduMapAPI_Base.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BaiduMapAPI_Base.framework; path = "Pods/BaiduNaviKit-All/BaiduNaviKit-All/MapSDK/BaiduMapAPI_Base.framework"; sourceTree = "<group>"; };
798136322DB7AD45004BC05B /* BNRoutePlanModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNRoutePlanModel.h; sourceTree = "<group>"; };
798136332DB7AD45004BC05B /* BNLightRoutesModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNLightRoutesModel.h; sourceTree = "<group>"; };
798136342DB7AD45004BC05B /* BNLightNaviManagerProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNLightNaviManagerProtocol.h; sourceTree = "<group>"; };
798136352DB7AD45004BC05B /* BNNaviProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNNaviProtocol.h; sourceTree = "<group>"; };
798136362DB7AD45004BC05B /* BNLocation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNLocation.h; sourceTree = "<group>"; };
798136372DB7AD45004BC05B /* BNCarRouteData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNCarRouteData.h; sourceTree = "<group>"; };
798136382DB7AD45004BC05B /* BNaviService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNaviService.h; sourceTree = "<group>"; };
798136392DB7AD45004BC05B /* BNaviFinishPageModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNaviFinishPageModel.h; sourceTree = "<group>"; };
7981363A2DB7AD45004BC05B /* BNDriveRouteProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNDriveRouteProtocol.h; sourceTree = "<group>"; };
7981363B2DB7AD45004BC05B /* BNRoutePlanManagerProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNRoutePlanManagerProtocol.h; sourceTree = "<group>"; };
7981363C2DB7AD45004BC05B /* BNNaviMessageInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNNaviMessageInfo.h; sourceTree = "<group>"; };
7981363D2DB7AD45004BC05B /* BNCommonDef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNCommonDef.h; sourceTree = "<group>"; };
7981363E2DB7AD45004BC05B /* BNStrategyManagerProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNStrategyManagerProtocol.h; sourceTree = "<group>"; };
7981363F2DB7AD45004BC05B /* BNSoundProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNSoundProtocol.h; sourceTree = "<group>"; };
798136402DB7AD45004BC05B /* BMTruckInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BMTruckInfoModel.h; sourceTree = "<group>"; };
798136412DB7AD45004BC05B /* BNDigitDogManagerProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNDigitDogManagerProtocol.h; sourceTree = "<group>"; };
798136422DB7AD45004BC05B /* BNUtility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNUtility.h; sourceTree = "<group>"; };
798136432DB7AD45004BC05B /* BNUIManagerProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNUIManagerProtocol.h; sourceTree = "<group>"; };
798136442DB7AD45004BC05B /* BNLocationManagerProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNLocationManagerProtocol.h; sourceTree = "<group>"; };
798136452DB7AD45004BC05B /* BNMapOverlayProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNMapOverlayProtocol.h; sourceTree = "<group>"; };
798136462DB7AD45004BC05B /* BNaviModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNaviModel.h; sourceTree = "<group>"; };
798136482DB7AD45004BC05B /* libbaiduNaviOpenSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libbaiduNaviOpenSDK.a; sourceTree = "<group>"; };
7981364A2DB7AD45004BC05B /* mode.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = mode.bundle; sourceTree = "<group>"; };
7981364B2DB7AD45004BC05B /* baiduNaviSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = baiduNaviSDK.bundle; sourceTree = "<group>"; };
7981364C2DB7AD57004BC05B /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "Pods/BaiduNaviKit-All/BaiduNaviKit-All/MapSDK/thirdlibs/libssl.a"; sourceTree = "<group>"; };
7981364D2DB7AD57004BC05B /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "Pods/BaiduNaviKit-All/BaiduNaviKit-All/MapSDK/thirdlibs/libcrypto.a"; sourceTree = "<group>"; };
798136502DB7AD84004BC05B /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
798136522DB7AD90004BC05B /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
798136542DB7ADA5004BC05B /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
798136552DB7ADAE004BC05B /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
798136562DB7ADB6004BC05B /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
798136582DB7ADC1004BC05B /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
7981365A2DB7ADC7004BC05B /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
7981365C2DB7ADCD004BC05B /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
7981365E2DB7ADE6004BC05B /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
7981365F2DB7ADF9004BC05B /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
798136612DB7AE03004BC05B /* AVFAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFAudio.framework; path = System/Library/Frameworks/AVFAudio.framework; sourceTree = SDKROOT; };
7981EAB52B6E669000F357E7 /* UIScrollView+XVAdd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIScrollView+XVAdd.h"; sourceTree = "<group>"; };
7981EAB62B6E669000F357E7 /* UIScrollView+XVAdd.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+XVAdd.m"; sourceTree = "<group>"; };
7981EAB82B6E670200F357E7 /* UIView+XVAdd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+XVAdd.h"; sourceTree = "<group>"; };
......@@ -159,7 +213,15 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
798136592DB7ADC1004BC05B /* QuartzCore.framework in Frameworks */,
798136602DB7ADF9004BC05B /* Accelerate.framework in Frameworks */,
FA5E55D5A48FDC04BA4CCD08 /* Pods_fastservice.framework in Frameworks */,
7981365B2DB7ADC7004BC05B /* Security.framework in Frameworks */,
798136512DB7AD84004BC05B /* CoreGraphics.framework in Frameworks */,
798136622DB7AE03004BC05B /* AVFAudio.framework in Frameworks */,
798136532DB7AD90004BC05B /* CoreLocation.framework in Frameworks */,
7981365D2DB7ADCD004BC05B /* SystemConfiguration.framework in Frameworks */,
798136572DB7ADB6004BC05B /* OpenGLES.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -175,6 +237,71 @@
path = Pods;
sourceTree = "<group>";
};
79267A9B2DBA8E0F000D2180 /* WMDragView */ = {
isa = PBXGroup;
children = (
79267A992DBA8E0F000D2180 /* WMDragView.h */,
79267A9A2DBA8E0F000D2180 /* WMDragView.m */,
);
path = WMDragView;
sourceTree = "<group>";
};
798136302DB7AD45004BC05B /* NaviSDK */ = {
isa = PBXGroup;
children = (
798136312DB7AD45004BC05B /* inc */,
798136472DB7AD45004BC05B /* lib */,
798136492DB7AD45004BC05B /* resource */,
);
name = NaviSDK;
path = "Pods/BaiduNaviKit-All/BaiduNaviKit-All/NaviSDK";
sourceTree = "<group>";
};
798136312DB7AD45004BC05B /* inc */ = {
isa = PBXGroup;
children = (
798136322DB7AD45004BC05B /* BNRoutePlanModel.h */,
798136332DB7AD45004BC05B /* BNLightRoutesModel.h */,
798136342DB7AD45004BC05B /* BNLightNaviManagerProtocol.h */,
798136352DB7AD45004BC05B /* BNNaviProtocol.h */,
798136362DB7AD45004BC05B /* BNLocation.h */,
798136372DB7AD45004BC05B /* BNCarRouteData.h */,
798136382DB7AD45004BC05B /* BNaviService.h */,
798136392DB7AD45004BC05B /* BNaviFinishPageModel.h */,
7981363A2DB7AD45004BC05B /* BNDriveRouteProtocol.h */,
7981363B2DB7AD45004BC05B /* BNRoutePlanManagerProtocol.h */,
7981363C2DB7AD45004BC05B /* BNNaviMessageInfo.h */,
7981363D2DB7AD45004BC05B /* BNCommonDef.h */,
7981363E2DB7AD45004BC05B /* BNStrategyManagerProtocol.h */,
7981363F2DB7AD45004BC05B /* BNSoundProtocol.h */,
798136402DB7AD45004BC05B /* BMTruckInfoModel.h */,
798136412DB7AD45004BC05B /* BNDigitDogManagerProtocol.h */,
798136422DB7AD45004BC05B /* BNUtility.h */,
798136432DB7AD45004BC05B /* BNUIManagerProtocol.h */,
798136442DB7AD45004BC05B /* BNLocationManagerProtocol.h */,
798136452DB7AD45004BC05B /* BNMapOverlayProtocol.h */,
798136462DB7AD45004BC05B /* BNaviModel.h */,
);
path = inc;
sourceTree = "<group>";
};
798136472DB7AD45004BC05B /* lib */ = {
isa = PBXGroup;
children = (
798136482DB7AD45004BC05B /* libbaiduNaviOpenSDK.a */,
);
path = lib;
sourceTree = "<group>";
};
798136492DB7AD45004BC05B /* resource */ = {
isa = PBXGroup;
children = (
7981364A2DB7AD45004BC05B /* mode.bundle */,
7981364B2DB7AD45004BC05B /* baiduNaviSDK.bundle */,
);
path = resource;
sourceTree = "<group>";
};
7981EABE2B6E7B3700F357E7 /* View */ = {
isa = PBXGroup;
children = (
......@@ -227,6 +354,8 @@
79DC8B7A2B7AF42800DBD8EA /* XVOrderInfoTopView.m */,
79DC8B7C2B88DC3B00DBD8EA /* XVOrderInfoViewCell.h */,
79DC8B7D2B88DC3B00DBD8EA /* XVOrderInfoViewCell.m */,
79267A9E2DBBCEE2000D2180 /* XVOrderSearchView.h */,
79267A9F2DBBCEE2000D2180 /* XVOrderSearchView.m */,
);
path = View;
sourceTree = "<group>";
......@@ -357,6 +486,7 @@
799DF0E22B6BDA1300680907 /* Libs */ = {
isa = PBXGroup;
children = (
79267A9B2DBA8E0F000D2180 /* WMDragView */,
799DF1082B6D25B400680907 /* UINavigation+SXFixSpace */,
799DF0E32B6BDA1300680907 /* NSString+Unicode */,
799DF0E62B6BDA1300680907 /* FDFullscreenPopGesture */,
......@@ -454,6 +584,23 @@
C642CCEC71A6009B069B11C8 /* Frameworks */ = {
isa = PBXGroup;
children = (
798136612DB7AE03004BC05B /* AVFAudio.framework */,
7981365F2DB7ADF9004BC05B /* Accelerate.framework */,
7981365E2DB7ADE6004BC05B /* libz.tbd */,
7981365C2DB7ADCD004BC05B /* SystemConfiguration.framework */,
7981365A2DB7ADC7004BC05B /* Security.framework */,
798136582DB7ADC1004BC05B /* QuartzCore.framework */,
798136562DB7ADB6004BC05B /* OpenGLES.framework */,
798136552DB7ADAE004BC05B /* libsqlite3.0.tbd */,
798136542DB7ADA5004BC05B /* libc++.tbd */,
798136522DB7AD90004BC05B /* CoreLocation.framework */,
798136502DB7AD84004BC05B /* CoreGraphics.framework */,
7981364D2DB7AD57004BC05B /* libcrypto.a */,
7981364C2DB7AD57004BC05B /* libssl.a */,
798136302DB7AD45004BC05B /* NaviSDK */,
798136282DB7AD09004BC05B /* BaiduMapAPI_Base.framework */,
798136262DB7AD09004BC05B /* BaiduMapAPI_Map.framework */,
798136272DB7AD09004BC05B /* BaiduMapAPI_WalkNavi.framework */,
08D109EE60B32403F3655A70 /* Pods_fastservice.framework */,
);
name = Frameworks;
......@@ -471,7 +618,6 @@
799DF0BE2B6BD8AF00680907 /* Frameworks */,
799DF0BF2B6BD8AF00680907 /* Resources */,
506875D30F248ADA9D597215 /* [CP] Embed Pods Frameworks */,
0E031AF4528A115B388210F8 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
......@@ -529,23 +675,6 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
0E031AF4528A115B388210F8 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-fastservice/Pods-fastservice-resources-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-fastservice/Pods-fastservice-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-fastservice/Pods-fastservice-resources.sh\"\n";
showEnvVarsInLog = 0;
};
1EDAD11ABC36164D02C41945 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
......@@ -593,6 +722,7 @@
buildActionMask = 2147483647;
files = (
79DC8B6F2B74A8E600DBD8EA /* XVPersonalFooterView.m in Sources */,
79267AA02DBBCEE2000D2180 /* XVOrderSearchView.m in Sources */,
79DC8B752B74B69600DBD8EA /* XVOrderDetailsViewController.m in Sources */,
79DC8B962B8DB05900DBD8EA /* XVGetOrderAlterButtonView.m in Sources */,
79DC8B872B8CD5F000DBD8EA /* XVOrderSettingView.m in Sources */,
......@@ -629,6 +759,7 @@
7981EAD92B6FB53E00F357E7 /* XVNewJobViewController.m in Sources */,
7981EAFC2B71272D00F357E7 /* XVNewJobViewCell.m in Sources */,
799DF11A2B6D2B3200680907 /* XVLoginViewController.m in Sources */,
79267A9C2DBA8E0F000D2180 /* WMDragView.m in Sources */,
7981EAED2B6FC05B00F357E7 /* XVCategoryTitleView.m in Sources */,
799DF1102B6D25B400680907 /* UIBarButtonItem+SXCreate.m in Sources */,
79DC8B8D2B8D887000DBD8EA /* XVDispatchOrderAlter.m in Sources */,
......@@ -772,22 +903,33 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = S3SN9ALHA9;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Pods/BaiduNaviKit-All/BaiduNaviKit-All/MapSDK",
);
GCC_INPUT_FILETYPE = automatic;
GCC_PREFIX_HEADER = "$(SRCROOT)/fastservice/PrefixHeader.pch";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = fastservice/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "快服务";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "此APP需要访问您的位置,用于展示当前定位";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "我们需要通过您的地理位置信息获取您附近的商家信息，以便获取更多订单";
INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "我们需要通过您的地理位置信息获取您附近的商家信息，以便获取更多订单";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "我们需要通过您的地理位置信息获取您附近的商家信息，以便获取更多订单";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "此APP需要访问您的相册,用于上传附件";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
INFOPLIST_KEY_UIRequiredDeviceCapabilities = armv7;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Pods/BaiduNaviKit-All/BaiduNaviKit-All/MapSDK/thirdlibs",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.bendiyun.fastservice;
PRODUCT_NAME = "$(TARGET_NAME)";
......@@ -805,22 +947,33 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = S3SN9ALHA9;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Pods/BaiduNaviKit-All/BaiduNaviKit-All/MapSDK",
);
GCC_INPUT_FILETYPE = automatic;
GCC_PREFIX_HEADER = "$(SRCROOT)/fastservice/PrefixHeader.pch";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = fastservice/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "快服务";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "此APP需要访问您的位置,用于展示当前定位";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "我们需要通过您的地理位置信息获取您附近的商家信息，以便获取更多订单";
INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "我们需要通过您的地理位置信息获取您附近的商家信息，以便获取更多订单";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "我们需要通过您的地理位置信息获取您附近的商家信息，以便获取更多订单";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "此APP需要访问您的相册,用于上传附件";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
INFOPLIST_KEY_UIRequiredDeviceCapabilities = armv7;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Pods/BaiduNaviKit-All/BaiduNaviKit-All/MapSDK/thirdlibs",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.bendiyun.fastservice;
PRODUCT_NAME = "$(TARGET_NAME)";
......
FastService.xcodeproj/xcuserdata/xuning.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,7 +7,7 @@
<key>fastservice.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>19</integer>
<integer>18</integer>
</dict>
</dict>
</dict>
......
FastService/AppDelegate+ThirdParty.m
......@@ -9,7 +9,8 @@
#import "AppDelegate+ThirdParty.h"
#import <IQKeyboardManager/IQKeyboardManager.h>
@interface AppDelegate(ThirdParty)<BMKGeneralDelegate,BMKLocationAuthDelegate>
@interface AppDelegate(ThirdParty)
//<BMKGeneralDelegate,BMKLocationAuthDelegate>
@end
......@@ -18,7 +19,7 @@
-(void)thirdPartyConfig:(UIApplication *)application WithOption:(NSDictionary *)launchOptions {
[self setupIQKeyboard];
[self setupMapConfig];
// [self setupMapConfig];
}
- (void)setupIQKeyboard {
......@@ -31,29 +32,29 @@
[IQKeyboardManager sharedManager].shouldResignOnTouchOutside = YES;
}
- (void)setupMapConfig {
// 地图
_mapManager = [[BMKMapManager alloc]init];
BOOL ret = [_mapManager start:BAIDU_APPKEY generalDelegate:self];
if(!ret){
Log(@"哎呦，百度地图没有注册成功哦~");
}
// 定位
[[BMKLocationAuth sharedInstance] checkPermisionWithKey:BAIDU_APPKEY authDelegate:self];
// 导航
[BNaviService_Instance initNaviService:nil success:^{
[BNaviService_Instance authorizeNaviAppKey:BAIDU_APPKEY
completion:^(BOOL suc) {
Log(@"authorizeNaviAppKey ret = %d",suc);
}];
} fail:^{
Log(@"哎呦，百度地图导航没有注册成功哦~");
}];
}
//- (void)setupMapConfig {
//
// // 地图
// _mapManager = [[BMKMapManager alloc]init];
// BOOL ret = [_mapManager start:BAIDU_APPKEY generalDelegate:self];
// if(!ret){
// Log(@"哎呦，百度地图没有注册成功哦~");
// }
//
// // 定位
// [[BMKLocationAuth sharedInstance] checkPermisionWithKey:BAIDU_APPKEY authDelegate:self];
//
// // 导航
// [BNaviService_Instance initNaviService:nil success:^{
// [BNaviService_Instance authorizeNaviAppKey:BAIDU_APPKEY
// completion:^(BOOL suc) {
// Log(@"authorizeNaviAppKey ret = %d",suc);
// }];
//
// } fail:^{
// Log(@"哎呦，百度地图导航没有注册成功哦~");
// }];
//}
- (void)onGetNetworkState:(int)iError{
if (0 == iError) {
Log(@"联网成功");
......
FastService/AppDelegate.h
......@@ -8,7 +8,7 @@
#import <UIKit/UIKit.h>
@interface AppDelegate : UIResponder <UIApplicationDelegate>{
BMKMapManager *_mapManager;
// BMKMapManager *_mapManager;
}
@property (strong, nonatomic) UIWindow *window;
......
FastService/AppDelegate.m
......@@ -44,7 +44,7 @@
[XVNewOrderAlter show];
// [XVNewOrderAlter show];
return YES;
}
......
FastService/Assets.xcassets/APP设置/Contents.json 0 → 100644
{
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/md-notifications.imageset/Contents.json → FastService/Assets.xcassets/APP设置/tubiao.imageset/Contents.json
{
......@@ -5,11 +5,11 @@
"scale" : "1x"
},
{
"filename" : "md-notifications@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "tubiao@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
FastService/Assets.xcassets/semiDesign-semi-icons-route.imageset/Contents.json → FastService/Assets.xcassets/APP设置/图标 15.imageset/Contents.json
{
......@@ -5,11 +5,11 @@
"scale" : "1x"
},
{
"filename" : "semiDesign-semi-icons-route@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "图标 15@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
FastService/Assets.xcassets/APP设置/图标 2.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "图标 2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/Contents.json 0 → 100644
{
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/antOutline-insurance J9bTxqJ Copy 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "antOutline-insurance J9bTxqJ Copy 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/antOutline-read wT8SVT4.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "antOutline-read wT8SVT4@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/antOutline-user-add 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "antOutline-user-add 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/antOutline-usergroup-delete 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "antOutline-usergroup-delete 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/ceshi.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ceshi@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/fa5-address-card-fas 1 Copy 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fa5-address-card-fas 1 Copy 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/fa5-address-card-fas 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fa5-address-card-fas 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/iconPark-editor 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "iconPark-editor 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/iconPark-mark QpyYz9F.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "iconPark-mark QpyYz9F@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/iconPark-ranking m7fyuQM.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "iconPark-ranking m7fyuQM@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/jinpai.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "jinpai@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/riFill-shield-user-fill 1 Copy 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "riFill-shield-user-fill 1 Copy 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/riFill-shield-user-fill 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "riFill-shield-user-fill 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/riLine-settings-line 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "riLine-settings-line 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/riLine-star-line 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "riLine-star-line 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/stLine-write-l 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "stLine-write-l 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/tiepai.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "tiepai@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/tongpai3x.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"filename" : "tongpai3x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/yinpai.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "yinpai@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/zhuansong.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "zhuansong@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/zuanshi.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "zuanshi@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/个人中心/图标 19.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "图标 19@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/健康证/Contents.json 0 → 100644
{
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/健康证/if-close-circled 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "if-close-circled 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/健康证/riFill-camera-fill 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "riFill-camera-fill 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/健康证/图标 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "图标 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/健康证/图标 2.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "图标 2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/健康证/图标 3.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "图标 3@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/健康证/群组 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "群组 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/消息中心/Contents.json 0 → 100644
{
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/消息中心/gonggao.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "gonggao@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/消息中心/tongzhi.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "tongzhi@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/消息中心/touxiang-1 (2).imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "touxiang-1@3x (2).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/消息中心/touxiang-2.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "touxiang-2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/消息中心/xiaoxi.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "xiaoxi@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/用户默认头像/Contents.json 0 → 100644
{
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/用户默认头像/man.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "man@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/用户默认头像/qishi-head.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"filename" : "qishi-head.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/用户默认头像/weizhi-head.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "weizhi-head@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/用户默认头像/woman.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "woman@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/首页/Contents.json 0 → 100644
{
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/首页/DvTTSAI.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : " DvTTSAI@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/首页/YTSBAz7.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : " YTSBAz7@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/首页/antFill-stop yTPnBNx.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "antFill-stop yTPnBNx@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/首页/if-settings HvWOZIe.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "if-settings HvWOZIe@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/首页/sosuo-1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "sosuo-1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/首页/sousuo-2.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "sousuo-2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/首页/wrHblyX.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "wrHblyX@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/首页/ze-checked 62AhkST.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ze-checked 62AhkST@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/首页/ze-checked Copy ngqla6s.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ze-checked Copy ngqla6s@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/骑手信息/Contents.json 0 → 100644
{
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/骑手信息/fa5-address-card-fas 1 Copy 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fa5-address-card-fas 1 Copy 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/骑手信息/fa5-address-card-fas 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fa5-address-card-fas 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/骑手信息/riFill-shield-user-fill 1 Copy 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "riFill-shield-user-fill 1 Copy 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/骑手信息/riFill-shield-user-fill 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "riFill-shield-user-fill 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/骑手信息/群组 1.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "群组 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/骑手信息/群组 12.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "群组 12@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/骑手信息/群组 13.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "群组 13@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/骑手信息/群组 18.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "群组 18@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/骑手信息/群组 2.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "群组 2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/骑手信息/群组 23.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "群组 23@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/骑手信息/群组 24.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "群组 24@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/骑手信息/群组 25.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "群组 25@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Assets.xcassets/骑手信息/群组 3.imageset/Contents.json 0 → 100644
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "群组 3@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FastService/Common/Libs/WMDragView/WMDragView.h 0 → 100644
//
// WMDragView.h
// WMDragView
//
// Created by zhengwenming on 2016/12/16.
//
//
#import <UIKit/UIKit.h>
// 拖曳view的方向
typedef NS_ENUM(NSInteger, WMDragDirection) {
WMDragDirectionAny, /**< 任意方向 */
WMDragDirectionHorizontal, /**< 水平方向 */
WMDragDirectionVertical, /**< 垂直方向 */
};
// 拖曳view的方向
typedef NS_ENUM(NSInteger, WMKeepDirection) {
WMKeepDirectionNearby, /**< 就近方向 */
WMKeepDirectionInitialize, /**< 初始位置方向 */
};
@interface WMDragView : UIView
/**
是不是能拖曳，默认为YES
YES，能拖曳
NO，不能拖曳
*/
@property (nonatomic,assign) BOOL dragEnable;
/**
活动范围，默认为父视图的frame范围内（因为拖出父视图后无法点击，也没意义）
如果设置了，则会在给定的范围内活动
如果没设置，则会在父视图范围内活动
注意：设置的frame不要大于父视图范围
注意：设置的frame为0，0，0，0表示活动的范围为默认的父视图frame，如果想要不能活动，请设置dragEnable这个属性为NO
*/
@property (nonatomic,assign) CGRect freeRect;
/**
拖曳的方向，默认为any，任意方向
*/
@property (nonatomic,assign) WMDragDirection dragDirection;
/**
停靠的方向，默认为any，任意方向
*/
@property (nonatomic,assign) WMKeepDirection keepDirection;
/**
contentView内部懒加载的一个UIImageView
开发者也可以自定义控件添加到本view中
注意：最好不要同时使用内部的imageView和button
*/
@property (nonatomic,strong) UIImageView *imageView;
/**
contentView内部懒加载的一个UIButton
开发者也可以自定义控件添加到本view中
注意：最好不要同时使用内部的imageView和button
*/
@property (nonatomic,strong) UIButton *button;
/**
是不是总保持在父视图边界，默认为NO,没有黏贴边界效果
isKeepBounds = YES，它将自动黏贴边界，而且是最近的边界
isKeepBounds = NO， 它将不会黏贴在边界，它是free(自由)状态，跟随手指到任意位置，但是也不可以拖出给定的范围frame
*/
@property (nonatomic,assign) BOOL isKeepBounds;
/**
点击的回调block
*/
@property (nonatomic,copy) void(^clickDragViewBlock)(WMDragView *dragView);
/**
开始拖动的回调block
*/
@property (nonatomic,copy) void(^beginDragBlock)(WMDragView *dragView);
/**
拖动中的回调block
*/
@property (nonatomic,copy) void(^duringDragBlock)(WMDragView *dragView);
/**
结束拖动的回调block
*/
@property (nonatomic,copy) void(^endDragBlock)(WMDragView *dragView);
@end
FastService/Common/Libs/WMDragView/WMDragView.m 0 → 100644
//
// WMDragView.m
// WMDragView
//
// Created by zhengwenming on 2016/12/16.
//
//
#import "WMDragView.h"
@interface WMDragView ()<UIGestureRecognizerDelegate>
/**
内容view，命名为contentViewForDrag，因为很多其他开源的第三方的库，里面同样有contentView这个属性
，这里特意命名为contentViewForDrag以防止冲突
*/
@property (nonatomic,strong) UIView *contentViewForDrag;
@property (nonatomic,assign) CGPoint startPoint;
@property (nonatomic,strong) UIPanGestureRecognizer *panGestureRecognizer;
@property (nonatomic,assign) CGFloat previousScale;
@end
@implementation WMDragView
-(UIImageView *)imageView{
if (_imageView==nil) {
_imageView = [[UIImageView alloc]init];
_imageView.userInteractionEnabled = YES;
_imageView.clipsToBounds = YES;
[self.contentViewForDrag addSubview:_imageView];
}
return _imageView;
}
-(UIButton *)button{
if (_button==nil) {
_button = [UIButton buttonWithType:UIButtonTypeCustom];
_button.clipsToBounds = YES;
_button.userInteractionEnabled = NO;
[self.contentViewForDrag addSubview:_button];
}
return _button;
}
-(UIView *)contentViewForDrag{
if (_contentViewForDrag==nil) {
_contentViewForDrag = [[UIView alloc]init];
_contentViewForDrag.clipsToBounds = YES;
}
return _contentViewForDrag;
}
- (instancetype)initWithFrame:(CGRect)frame{
self = [super initWithFrame:frame];
if (self) {
[self addSubview:self.contentViewForDrag];
[self setUp];
}
return self;
}
- (instancetype)initWithCoder:(NSCoder *)coder{
self = [super initWithCoder:coder];
if (self) {
[self setUp];
}
return self;
}
-(void)layoutSubviews{
[super layoutSubviews];
if (self.freeRect.origin.x!=0||self.freeRect.origin.y!=0||self.freeRect.size.height!=0||self.freeRect.size.width!=0) {
//设置了freeRect--活动范围
}else{
//没有设置freeRect--活动范围，则设置默认的活动范围为父视图的frame
self.freeRect = (CGRect){CGPointZero,self.superview.bounds.size};
}
_imageView.frame = (CGRect){CGPointZero,self.bounds.size};
_button.frame = (CGRect){CGPointZero,self.bounds.size};
self.contentViewForDrag.frame = (CGRect){CGPointZero,self.bounds.size};
}
-(void)setUp{
self.dragEnable = YES;//默认可以拖曳
self.clipsToBounds = YES;
self.isKeepBounds = NO;
self.backgroundColor = [UIColor lightGrayColor];
UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(clickDragView)];
[self addGestureRecognizer:singleTap];
//添加移动手势可以拖动
self.panGestureRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(dragAction:)];
self.panGestureRecognizer.minimumNumberOfTouches = 1;
self.panGestureRecognizer.maximumNumberOfTouches = 1;
self.panGestureRecognizer.delegate = self;
[self addGestureRecognizer:self.panGestureRecognizer];
}
- (void)setIsKeepBounds:(BOOL)isKeepBounds{
_isKeepBounds = isKeepBounds;
if(isKeepBounds){
// [self keepBounds];
}
}
-(void)setFreeRect:(CGRect)freeRect{
_freeRect = freeRect;
[self keepBounds];
}
//-(BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer{
// return self.dragEnable;
//}
/**
拖动事件
@param pan 拖动手势
*/
-(void)dragAction:(UIPanGestureRecognizer *)pan{
if(self.dragEnable==NO)return;
switch (pan.state) {
case UIGestureRecognizerStateBegan:{//开始拖动
if (self.beginDragBlock) {
self.beginDragBlock(self);
}
//注意完成移动后，将translation重置为0十分重要。否则translation每次都会叠加
[pan setTranslation:CGPointZero inView:self];
//保存触摸起始点位置
self.startPoint = [pan translationInView:self];
break;
}
case UIGestureRecognizerStateChanged:{//拖动中
//计算位移 = 当前位置 - 起始位置
if (self.duringDragBlock) {
self.duringDragBlock(self);
}
CGPoint point = [pan translationInView:self];
float dx;
float dy;
switch (self.dragDirection) {
case WMDragDirectionAny:
dx = point.x - self.startPoint.x;
dy = point.y - self.startPoint.y;
break;
case WMDragDirectionHorizontal:
dx = point.x - self.startPoint.x;
dy = 0;
break;
case WMDragDirectionVertical:
dx = 0;
dy = point.y - self.startPoint.y;
break;
default:
dx = point.x - self.startPoint.x;
dy = point.y - self.startPoint.y;
break;
}
//计算移动后的view中心点
CGPoint newCenter = CGPointMake(self.center.x + dx, self.center.y + dy);
//移动view
self.center = newCenter;
// 注意完成上述移动后，将translation重置为0十分重要。否则translation每次都会叠加
[pan setTranslation:CGPointZero inView:self];
break;
}
case UIGestureRecognizerStateEnded:{//拖动结束
[self keepBounds];
if (self.endDragBlock) {
self.endDragBlock(self);
}
break;
}
default:
break;
}
}
//单击事件
-(void)clickDragView{
if (self.clickDragViewBlock) {
self.clickDragViewBlock(self);
}
}
//黏贴边界效果
- (void)keepBounds{
//中心点判断
float centerX = self.freeRect.origin.x+(self.freeRect.size.width - self.frame.size.width)/2;
CGRect rect = self.frame;
if (self.isKeepBounds==NO) {//没有设置黏贴边界的效果
if (self.frame.origin.x < self.freeRect.origin.x) {
CGContextRef context = UIGraphicsGetCurrentContext();
[UIView beginAnimations:@"leftMove" context:context];
[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
[UIView setAnimationDuration:0.5];
rect.origin.x = self.freeRect.origin.x;
self.frame = rect;
[UIView commitAnimations];
} else if(self.freeRect.origin.x+self.freeRect.size.width < self.frame.origin.x+self.frame.size.width){
CGContextRef context = UIGraphicsGetCurrentContext();
[UIView beginAnimations:@"rightMove" context:context];
[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
[UIView setAnimationDuration:0.5];
rect.origin.x = self.freeRect.origin.x+self.freeRect.size.width-self.frame.size.width;
self.frame = rect;
[UIView commitAnimations];
}
}else if(self.isKeepBounds==YES){//设置了自动粘边的效果
if (self.keepDirection == WMKeepDirectionNearby) {
if (self.frame.origin.x< centerX) {
CGContextRef context = UIGraphicsGetCurrentContext();
[UIView beginAnimations:@"leftMove" context:context];
[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
[UIView setAnimationDuration:0.5];
rect.origin.x = self.freeRect.origin.x;
self.frame = rect;
[UIView commitAnimations];
} else {
CGContextRef context = UIGraphicsGetCurrentContext();
[UIView beginAnimations:@"rightMove" context:context];
[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
[UIView setAnimationDuration:0.5];
rect.origin.x =self.freeRect.origin.x+self.freeRect.size.width - self.frame.size.width;
self.frame = rect;
[UIView commitAnimations];
}
if (self.frame.origin.y < self.freeRect.origin.y) {
CGContextRef context = UIGraphicsGetCurrentContext();
[UIView beginAnimations:@"topMove" context:context];
[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
[UIView setAnimationDuration:0.5];
rect.origin.y = self.freeRect.origin.y;
self.frame = rect;
[UIView commitAnimations];
} else if(self.freeRect.origin.y+self.freeRect.size.height< self.frame.origin.y+self.frame.size.height){
CGContextRef context = UIGraphicsGetCurrentContext();
[UIView beginAnimations:@"bottomMove" context:context];
[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
[UIView setAnimationDuration:0.5];
rect.origin.y = self.freeRect.origin.y+self.freeRect.size.height-self.frame.size.height;
self.frame = rect;
[UIView commitAnimations];
}
}else{
// TODO:暂时只能靠右，
CGFloat x = self.freeRect.origin.x+self.freeRect.size.width - self.frame.size.width;
// 保持动画时间一致
CGFloat duration = x / SCREEN_WIDTH;// 假设每100单位宽度需要1秒
CGContextRef context = UIGraphicsGetCurrentContext();
[UIView beginAnimations:@"rightMove" context:context];
[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
[UIView setAnimationDuration:duration];
rect.origin.x = x;
self.frame = rect;
[UIView commitAnimations];
if (self.frame.origin.y < self.freeRect.origin.y) {
CGContextRef context = UIGraphicsGetCurrentContext();
[UIView beginAnimations:@"topMove" context:context];
[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
[UIView setAnimationDuration:duration];
rect.origin.y = self.freeRect.origin.y;
self.frame = rect;
[UIView commitAnimations];
} else if(self.freeRect.origin.y+self.freeRect.size.height< self.frame.origin.y+self.frame.size.height){
CGContextRef context = UIGraphicsGetCurrentContext();
[UIView beginAnimations:@"bottomMove" context:context];
[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
[UIView setAnimationDuration:duration];
rect.origin.y = self.freeRect.origin.y+self.freeRect.size.height-self.frame.size.height;
self.frame = rect;
[UIView commitAnimations];
}
}
}
}
@end
FastService/Info.plist
......@@ -7,19 +7,13 @@
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>UIFileSharingEnabled</key>
<true/>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>我们需要通过您的地理位置信息获取您附近的商家信息，以便获取更多订单</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>我们需要通过您的地理位置信息获取您附近的商家信息，以便获取更多订单</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>我们需要通过您的地理位置信息获取您附近的商家信息，以便获取更多订单</string>
<key>UIBackgroundModes</key>
<array>
<string>fetch</string>
<string>location</string>
<string>remote-notification</string>
</array>
<key>UIFileSharingEnabled</key>
<true/>
</dict>
</plist>
FastService/Main/Controller/XVMainJobViewController.m
......@@ -13,6 +13,9 @@
#import "XVOrderSortView.h"
#import "XVPersonalViewController.h"
#import <UIViewController+CWLateralSlide.h>
#import <TXScrollLabelView.h>
#import "WMDragView.h"
#import "XVOrderSearchView.h"
@interface XVMainJobViewController ()<JXCategoryViewDelegate,JXCategoryListContainerViewDelegate>
......@@ -26,6 +29,12 @@
@property (nonatomic,assign) NSInteger currentIndex;
@property(nonatomic, strong) TXScrollLabelView *marqueeView;
@property(nonatomic,strong) WMDragView *dragView;
@property (nonatomic, strong) XVOrderSearchView *searchView;
@end
......@@ -41,9 +50,37 @@
[self.view addSubview:self.barView];
[self.view addSubview:self.categoryView];
[self.view addSubview:self.marqueeView];
[self.view addSubview:self.listContainerView];
[self.view addSubview:self.sortView];
[self.sortView addRoundedCorners:(UIRectCornerBottomLeft | UIRectCornerBottomRight) withRadii:CGSizeMake(10, 10)];
CGFloat h = (SCREEN_HEIGHT - self.listContainerView.tx_y) / 2;
self.dragView = [[WMDragView alloc] initWithFrame:CGRectMake(SCREEN_WIDTH-48, h, 48, 48)];
self.dragView.imageView.image = IMG(@"sosuo-1");
kViewBorderRadius(self.dragView, 24, 0, [UIColor whiteColor]);
[self.view addSubview:self.dragView];
self.dragView.isKeepBounds = YES;
self.dragView.freeRect = CGRectMake(SCREEN_WIDTH/2, self.listContainerView.top, SCREEN_WIDTH/2, h-100);
self.dragView.keepDirection = WMKeepDirectionInitialize;
WS(weakSelf)
self.dragView.clickDragViewBlock = ^(WMDragView *dragView) {
weakSelf.searchView.top = dragView.top;
[UIView animateWithDuration:0.8 animations:^{
dragView.hidden = YES;
[weakSelf.searchView show];
}];
};
[self.view addSubview:self.searchView];
}
......@@ -56,9 +93,8 @@
- (void)categoryView:(JXCategoryBaseView *)categoryView didClickSelectedItemAtIndex:(NSInteger)index {
if (self.currentIndex == 0 && index == 0 && categoryView.selectedIndex == 0) {
self.sortView.backgroundColor = [UIColor whiteColor];
if(self.sortView.hidden) {
if(self.sortView.hidden) {
self.sortView.hidden = NO;
......@@ -130,32 +166,52 @@
_categoryView.delegate = self;
_categoryView.titles = @[@"新任务", @"待取货", @"配送中",@"已取消",@"路线"];
_categoryView.titles = @[@"新任务", @"待取货", @"配送中",@"今日完成",@"已取消"];
_categoryView.uiTypes = @{@(0) : @(XVCategoryTitleUIType_SingleImage),
@(1) : @(XVCategoryTitleUIType_None),
@(2) : @(XVCategoryTitleUIType_None),
@(1) : @(XVCategoryTitleUIType_SingleImage),
@(2) : @(XVCategoryTitleUIType_SingleImage),
@(3) : @(XVCategoryTitleUIType_None),
@(4) : @(XVCategoryTitleUIType_SingleImage)}.mutableCopy;
@(4) : @(XVCategoryTitleUIType_None)}.mutableCopy;
_categoryView.imageLocations = @{@(0) : @(XVCategoryTitleImageLocation_Right),
@(1) : @(XVCategoryTitleImageLocation_Right),
@(2) : @(XVCategoryTitleImageLocation_Right),
@(4) : @(XVCategoryTitleImageLocation_Left)}.mutableCopy;
_categoryView.singleImages = @{@(0) : [UIImage imageNamed:@"fas fa-sort"],
@(4) : [UIImage imageNamed:@"semiDesign-semi-icons-route"]}.mutableCopy;
@(1) : [UIImage imageNamed:@"fas fa-sort"],
@(2) : [UIImage imageNamed:@"fas fa-sort"],}.mutableCopy;
JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init];
lineView.indicatorColor = COLOR_THEMEGRENN;
lineView.verticalMargin = 6;
lineView.indicatorWidth = JXCategoryViewAutomaticDimension;
_categoryView.indicators = @[lineView];
_categoryView.listContainer = self.listContainerView;
}
return _categoryView;
}
- (TXScrollLabelView *)marqueeView {
if (_marqueeView == nil) {
_marqueeView = [TXScrollLabelView scrollWithTitle:@"测试跑马灯" type:0];
_marqueeView.font = [UIFont systemFontOfSize:12];
_marqueeView.scrollSpace = 100;
_marqueeView.backgroundColor = kHexRGB(0xDBDBDB);
_marqueeView.scrollTitleColor = [UIColor whiteColor];
_marqueeView.frame = CGRectMake(10, self.barView.height + self.categoryView.height, SCREEN_WIDTH-20, 31);
kViewBorderRadius(_marqueeView, 8, 0, kHexRGB(0xDBDBDB));
}
return _marqueeView;
}
- (JXCategoryListContainerView *)listContainerView {
if(_listContainerView == nil) {
_listContainerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self];
_listContainerView.frame = CGRectMake(0, self.barView.height + 50, SCREEN_WIDTH, SCREEN_HEIGHT-self.barView.height - 50);
CGFloat h = self.barView.height + self.categoryView.height + self.marqueeView.height + 6;
_listContainerView.frame = CGRectMake(0, h, SCREEN_WIDTH, SCREEN_HEIGHT - h);
_listContainerView.scrollView.scrollEnabled = NO;
}
return _listContainerView;
......@@ -163,10 +219,22 @@
- (XVOrderSortView *)sortView {
if(_sortView == nil) {
_sortView = [[XVOrderSortView alloc]initWithFrame:CGRectMake(0, self.barView.height + self.categoryView.height, SCREEN_WIDTH, 115)];
_sortView.backgroundColor = [UIColor whiteColor];
_sortView = [[XVOrderSortView alloc]initWithFrame:CGRectMake(0, self.barView.height + self.categoryView.height, SCREEN_WIDTH, SCREEN_HEIGHT)];
_sortView.hidden = YES;
}
return _sortView;
}
- (XVOrderSearchView *)searchView {
if (_searchView == nil) {
_searchView = [[XVOrderSearchView alloc]initWithFrame:CGRectMake(SCREEN_WIDTH, self.dragView.top, 311, 48)];
WS(weakSelf);
_searchView.cancelBlock = ^{
weakSelf.dragView.hidden = NO;
};
}
return _searchView;
}
@end
FastService/Main/Controller/XVNewJobViewController.m
......@@ -13,7 +13,7 @@
@interface XVNewJobViewController ()<UITextFieldDelegate>
@property (nonatomic, strong) UITextField *searchField;
@property (nonatomic, strong) XVJobStatusToolView *toolView;
......@@ -40,13 +40,6 @@
- (void)setupUI {
[self.view addSubview:self.searchField];
[self.searchField mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.view).mas_offset(6);
make.centerX.mas_equalTo(self.view);
make.width.mas_equalTo(SCREEN_WIDTH-24);
make.height.mas_equalTo(35);
}];
[self.view addSubview:self.toolView];
[self.toolView mas_makeConstraints:^(MASConstraintMaker *make) {
......@@ -58,7 +51,7 @@
[self.view addSubview:self.tableView];
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.searchField.mas_bottom).mas_offset(6);
make.top.mas_equalTo(self.view);
make.left.right.mas_equalTo(self.view);
make.bottom.mas_equalTo(self.view.mas_safeAreaLayoutGuideBottom).mas_offset(-61);
}];
......@@ -88,26 +81,6 @@
}
- (UITextField *)searchField {
if(_searchField == nil) {
_searchField = [[UITextField alloc]init];
[_searchField setValue: F_BBBBBB_COLOR forKeyPath:@"placeholderLabel.textColor"];
[_searchField setValue:[UIFont systemFontOfSize:14] forKeyPath:@"placeholderLabel.font"];
_searchField.font = [UIFont systemFontOfSize:14.0f];
_searchField.placeholder = @"输入订单号手机号地址商户信息快速查找";
_searchField.textColor = [UIColor blackColor];
_searchField.delegate = self;
_searchField.backgroundColor = [UIColor whiteColor];
_searchField.leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, 20, 35)];
_searchField.leftViewMode = UITextFieldViewModeAlways;
_searchField.returnKeyType = UIReturnKeySearch;
_searchField.clearButtonMode = UITextFieldViewModeAlways;
[_searchField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
kViewBorderRadius(self.searchField, 35/2, 0, [UIColor clearColor]);
}
return _searchField;
}
- (XVJobStatusToolView *)toolView {
if(_toolView == nil) {
......
FastService/Main/View/OrderAlter/XVDispatchOrderAlter.m
......@@ -230,7 +230,7 @@
- (UILabel *)orderTypeLabel {
if(_orderTypeLabel == nil) {
_orderTypeLabel = [[UILabel alloc]initWithText:@"文件"textColor:[UIColor colorWithHexString:@"#F0EFEF"] textAlignment:(NSTextAlignmentCenter) fontSize:14];
_orderTypeLabel = [[UILabel alloc]initWithText:@"文件" textColor:[UIColor colorWithHexString:@"#F0EFEF"] textAlignment:(NSTextAlignmentCenter) fontSize:14];
}
return _orderTypeLabel;
}
......
FastService/Main/View/OrderAlter/XVNewOrderAlter.m
......@@ -8,10 +8,11 @@
#import "XVNewOrderAlter.h"
@interface XVNewOrderAlter()<BMKMapViewDelegate>
@interface XVNewOrderAlter()
//<BMKMapViewDelegate>
@property (nonatomic, strong) UIView *bottomView;
@property (nonatomic, strong) BMKMapView *mapView;
//@property (nonatomic, strong) BMKMapView *mapView;
@end
......@@ -44,10 +45,10 @@
}
- (void)dealloc {
Log(@"XVNewOrderAlter dealloc");
if (_mapView) {
_mapView.delegate = nil;
_mapView = nil;
}
// if (_mapView) {
// _mapView.delegate = nil;
// _mapView = nil;
// }
}
- (instancetype)initWithFrame:(CGRect)frame {
......@@ -59,15 +60,15 @@
- (void)setupUI {
self.backgroundColor = [UIColor redColor];
[self addSubview:self.mapView];
self.mapView.zoomLevel = 17;
[self addSubview:self.bottomView];
[self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.mas_equalTo(self);
make.top.mas_equalTo(self.mapView.mas_bottom);
make.height.mas_equalTo(318);
}];
// [self addSubview:self.mapView];
//// self.mapView.zoomLevel = 17;
//
// [self addSubview:self.bottomView];
// [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.left.right.bottom.mas_equalTo(self);
// make.top.mas_equalTo(self.mapView.mas_bottom);
// make.height.mas_equalTo(318);
// }];
kViewBorderRadius(self.bottomView, 20, 0, [UIColor whiteColor]);
......@@ -80,11 +81,11 @@
}
return _bottomView;
}
- (BMKMapView *)mapView {
if(_mapView == nil) {
_mapView = [[BMKMapView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth-16, 166)];
_mapView.delegate = self;
}
return _mapView;
}
//- (BMKMapView *)mapView {
// if(_mapView == nil) {
// _mapView = [[BMKMapView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth-16, 166)];
// _mapView.delegate = self;
// }
// return _mapView;
//}
@end
FastService/Main/View/XVCustomBarView.m
......@@ -83,7 +83,7 @@
- (UIButton *)centerButton {
if(_centerButton == nil) {
_centerButton = [[UIButton alloc]init];
[_centerButton setImage:IMG(@"fas fa-user") forState:UIControlStateNormal];
[_centerButton setImage:IMG(@"YTSBAz7") forState:UIControlStateNormal];
_centerButton.backgroundColor = F7_3_COLOR;
}
return _centerButton;
......@@ -92,7 +92,7 @@
- (UIButton *)remindButton {
if(_remindButton == nil) {
_remindButton = [[UIButton alloc]init];
[_remindButton setImage:IMG(@"md-notifications") forState:UIControlStateNormal];
[_remindButton setImage:IMG(@"DvTTSAI") forState:UIControlStateNormal];
_remindButton.backgroundColor = F7_3_COLOR;
}
return _remindButton;
......@@ -101,7 +101,7 @@
- (UIButton *)locationButton {
if(_locationButton == nil) {
_locationButton = [[UIButton alloc]init];
[_locationButton setImage:IMG(@"ze-map-marked") forState:UIControlStateNormal];
[_locationButton setImage:IMG(@"wrHblyX") forState:UIControlStateNormal];
_locationButton.backgroundColor = F7_3_COLOR;
}
return _locationButton;
......@@ -117,7 +117,7 @@
- (YYLabel *)statusLabel {
if(_statusLabel == nil) {
_statusLabel = [[YYLabel alloc]init];
_statusLabel.attributedText = [self setStatus:@" 已停工" imageName:@"antFill-stop"];
_statusLabel.attributedText = [self setStatus:@" 已停工" imageName:@"antFill-stop yTPnBNx"];
}
return _statusLabel;
}
......
FastService/Main/View/XVOrderSearchView.h 0 → 100644
//
// XVOrderSearchView.h
// fastservice
//
// Created by xuning on 4/25/25.
// Copyright © 2025 FastService. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface XVOrderSearchView : UIView
@property (nonatomic,copy) EventVoidHandler cancelBlock;
- (void)show;
- (void)cancle;
@end
NS_ASSUME_NONNULL_END
FastService/Main/View/XVOrderSearchView.m 0 → 100644
//
// XVOrderSearchView.m
// fastservice
//
// Created by xuning on 4/25/25.
// Copyright © 2025 FastService. All rights reserved.
//
#import "XVOrderSearchView.h"
@interface XVOrderSearchView()
@property (nonatomic, strong) UIButton *searchButton;
@property (nonatomic, strong) UIView *bgView;
@property (nonatomic, strong) UITextField *searchField;
@end
@implementation XVOrderSearchView
- (instancetype)initWithFrame:(CGRect)frame {
if (self = [super initWithFrame:frame]) {
[self setupUI];
}
return self;
}
- (void)setupUI {
self.backgroundColor = [[UIColor whiteColor]colorWithAlphaComponent:0];
[self addSubview:self.searchButton];
[self.searchButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self);
make.centerY.mas_equalTo(self);
make.size.mas_equalTo(CGSizeMake(48,48));
}];
kViewBorderRadius(self.searchButton, 29, 0, BB_3_COLOR);
self.searchButton.layer.shadowColor = BB_3_COLOR.CGColor;
//剪切边界 如果视图上的子视图layer超出视图layer部分就截取掉 如果添加阴影这个属性必须是NO 不然会把阴影切掉
self.searchButton.layer.masksToBounds = NO;
//阴影半径，默认3
self.searchButton.layer.shadowRadius = 5;
//shadowOffset阴影偏移，默认(0, -3),这个跟shadowRadius配合使用
self.searchButton.layer.shadowOffset = CGSizeMake(0.0f,0.0f);
// 阴影透明度，默认0
self.searchButton.layer.shadowOpacity = 0.9f;
[self addSubview:self.bgView];
[self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.searchButton.mas_right).mas_offset(5);
make.right.mas_equalTo(self);
make.height.mas_equalTo(48);
make.centerY.mas_equalTo(self);
}];
[self.bgView layoutIfNeeded];
[self.bgView addRoundedCorners:(UIRectCornerTopLeft | UIRectCornerBottomLeft) withRadii:CGSizeMake(24, 24)];
[self.bgView addSubview:self.searchField];
[self.searchField mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.bgView).mas_offset(5);
make.right.mas_equalTo(self.bgView).mas_offset(-5);
make.centerY.mas_equalTo(self);
make.height.mas_equalTo(36);
}];
}
- (void)show{
self.left = SCREEN_WIDTH - self.width;
[self.searchField becomeFirstResponder];
}
- (void)cancle {
[UIView animateWithDuration:1 animations:^{
self.left = SCREEN_WIDTH;
}];
[self.searchField resignFirstResponder];
BlockCallWithVoidArg(self.cancelBlock);
}
- (void)searchButtonClick {
[self cancle];
}
- (void)textFieldDidChange:(UITextField *)textField {
}
- (UIButton *)searchButton {
if (_searchButton == nil) {
_searchButton = [[UIButton alloc]initWithNormalImageName:@"sousuo-2" selectedImgName:@"sousuo-2"];
[_searchButton addTarget:self action:@selector(searchButtonClick) forControlEvents:(UIControlEventTouchUpInside)];
}
return _searchButton;
}
- (UIView *)bgView {
if (_bgView == nil) {
_bgView = [[UIView alloc]init];
_bgView.backgroundColor = EF_3_COLOR;
}
return _bgView;
}
- (UITextField *)searchField {
if(_searchField == nil) {
_searchField = [[UITextField alloc]init];
_searchField.font = [UIFont systemFontOfSize:14.0f];
_searchField.textColor = [UIColor blackColor];
NSAttributedString *attr = [[NSAttributedString alloc]initWithString:@"输入订单号手机号地址商户信息快速查找" attributes:@{NSForegroundColorAttributeName : BB_3_COLOR,NSFontAttributeName:[UIFont systemFontOfSize:12]}];
_searchField.attributedPlaceholder = attr;
_searchField.backgroundColor = [UIColor whiteColor];
_searchField.leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, 10, 35)];
_searchField.leftViewMode = UITextFieldViewModeAlways;
_searchField.returnKeyType = UIReturnKeySearch;
_searchField.clearButtonMode = UITextFieldViewModeAlways;
[_searchField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
kViewBorderRadius(self.searchField, 36/2, 0, [UIColor clearColor]);
}
return _searchField;
}
@end
FastService/Main/View/XVOrderSortView.m
......@@ -23,6 +23,10 @@
@property (nonatomic, strong) UIButton *timeAscButton;
@property (nonatomic, strong) UIButton *timeDescButton;
@property (nonatomic, strong) UIView *maskView;
@property (nonatomic, strong) UIView *alertView;
@end
......@@ -37,14 +41,21 @@
- (void)setupUI {
[self addSubview:self.titleLabel];
self.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:.3];
// [self addSubview:self.maskView];
[self addSubview:self.alertView];
[self.alertView addSubview:self.titleLabel];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self).mas_offset(9);
make.left.mas_equalTo(self).mas_offset(16);
make.top.mas_equalTo(self.alertView).mas_offset(9);
make.left.mas_equalTo(self.alertView).mas_offset(16);
}];
[self addSubview:self.systemButton];
[self.alertView addSubview:self.systemButton];
[self.systemButton sizeToFit];
[self.systemButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.titleLabel);
......@@ -53,22 +64,23 @@
make.height.mas_equalTo(15);
}];
kViewBorderRadius(self.systemButton, 4, 0, [UIColor clearColor]);
[self addSubview:self.distanceLabel];
[self.alertView addSubview:self.distanceLabel];
[self.distanceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.titleLabel);
make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(20);
}];
[self addSubview:self.timeLabel];
[self.alertView addSubview:self.timeLabel];
[self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.titleLabel);
make.top.mas_equalTo(self.distanceLabel.mas_bottom).mas_offset(18);
}];
[self addSubview:self.distanceAscButton];
[self addSubview:self.distanceDescButton];
[self.alertView addSubview:self.distanceAscButton];
[self.alertView addSubview:self.distanceDescButton];
[self.distanceAscButton sizeToFit];
[self.distanceDescButton sizeToFit];
......@@ -84,8 +96,8 @@
}];
[self addSubview:self.timeAscButton];
[self addSubview:self.timeDescButton];
[self.alertView addSubview:self.timeAscButton];
[self.alertView addSubview:self.timeDescButton];
[self.timeAscButton sizeToFit];
[self.timeDescButton sizeToFit];
......@@ -101,6 +113,11 @@
}];
self.userInteractionEnabled = YES;
UITapGestureRecognizer *myTap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(didTapMaskView)];
[self addGestureRecognizer:myTap];
}
- (UILabel *)titleLabel {
......@@ -158,4 +175,27 @@
return _timeDescButton;
}
- (UIView *)alertView {
if (!_alertView) {
_alertView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 115)];
_alertView.backgroundColor = [UIColor whiteColor];
[_alertView addRoundedCorners:(UIRectCornerBottomLeft | UIRectCornerBottomRight) withRadii:CGSizeMake(10, 10)];
}
return _alertView;
}
#pragma mark - 蒙层视图
- (UIView *)maskView {
if (!_maskView) {
_maskView = [[UIView alloc]initWithFrame:self.bounds];
_maskView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:.3];;
// 设置子视图的大小随着父视图变化
_maskView.autoresizingMask = UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
}
return _maskView;
}
- (void)didTapMaskView {
self.hidden = YES;
}
@end
FastService/PrefixHeader.pch
......@@ -23,14 +23,15 @@
#import "UIBarButtonItem+SXCreate.h"
#import<BaiduMapAPI_Base/BMKBaseComponent.h>
#import<BMKLocationKit/BMKLocationComponent.h>
#import<BaiduMapAPI_Map/BMKMapComponent.h>
#import<BaiduMapAPI_Search/BMKSearchComponent.h>
#import<BaiduMapAPI_Utils/BMKUtilsComponent.h>
#import <BaiduMapAPI_WalkNavi/BMKWalkNaviComponent.h>
#import <BaiduNaviKit-All/BNaviService.h>
#import<BaiduMapAPI_Map/BMKMapView.h>
//#import<BMKLocationKit/BMKLocationComponent.h>
//#import<BaiduMapAPI_Base/BMKBaseComponent.h>
//#import<BaiduMapAPI_Map/BMKMapComponent.h>
//#import<BaiduMapAPI_Search/BMKSearchComponent.h>
//#import<BaiduMapAPI_Utils/BMKUtilsComponent.h>
//#import <BaiduMapAPI_WalkNavi/BMKWalkNaviComponent.h>
//#import <BaiduNaviKit-All/BNaviService.h>
#import "UIScrollView+XVAdd.h"
#import "UIView+XVAdd.h"
......@@ -132,4 +133,33 @@ isPhoneX;\
#define WS(weakSelf) __weak __typeof(&*self)weakSelf = self;
typedef void(^EventHandler)(id sender);
typedef void(^EventVoidHandler)(void);
typedef void(^EventTwoHandler)(id sender,id sender1);
typedef void(^EventThreeHandler)(id sender,id sender1,id sender2);
typedef void(^RightActionBlock)(id sender,id sender1);
/**
调用一个block,会判断block不为空
*/
#define BlockCallWithVoidArg(block) if(block){block();}
/**
调用一个block,会判断block不为空
*/
#define BlockCallWithOneArg(block,arg) if(block){block(arg);}
/**
调用一个block,会判断block不为空
*/
#define BlockCallWithTwoArg(block,arg1,arg2) if(block){block(arg1,arg2);}
/**
调用一个block,会判断block不为空
*/
#define BlockCallWithThreeArg(block,arg1,arg2,arg3) if(block){block(arg1,arg2,arg3);}
#endif /* PrefixHeader_pch */
Podfile
# Uncomment the next line to define a global platform for your project
platform :ios, '9.0'
source 'https://github.com/CocoaPods/Specs.git'
platform :ios,'10.0'
#use_frameworks!
## ignore warning
inhibit_all_warnings!
post_install do |installer|
installer.pods_project.build_configurations.each do |config|
config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
end
end
target 'fastservice' do
# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!
......@@ -22,18 +30,11 @@ target 'fastservice' do
pod 'BRPickerView'
pod 'JXCategoryView'
pod 'Bugly'
pod 'TXScrollLabelView'
pod 'BMKLocationKit'
pod 'BaiduNaviKit-All/Map', '6.4.0' # 集成地图Map包
pod 'BaiduNaviKit-All/Navi', '6.4.0' # 集成Navi包
pod 'BaiduNaviKit-All/WalkNavi', '6.4.0' # 集成WalkNavi包
# pod 'BaiduNaviKit-All/TTS', '6.0.0' # 集成TTS包
pod 'BaiduNaviKit-All/Search', '6.4.0' # 集成地图Search包
# pod 'BaiduNaviKit-All/Cloud', '6.0.0' # 集成地图Cloud包
pod 'BaiduNaviKit-All/Utils', '6.4.0' # 集成地图Utils包
# pod 'BMKLocationKit'
# pod 'BaiduNaviKit-All', '6.4.0' # 集成地图Map包
pod 'CWLateralSlide', '~> 1.6.3'
end
Podfile.lock
......@@ -15,18 +15,6 @@ PODS:
- AFNetworking/UIKit (4.0.1):
- AFNetworking/NSURLSession
- AvoidCrash (2.5.2)
- BaiduNaviKit-All/Base (6.4.0)
- BaiduNaviKit-All/Map (6.4.0):
- BaiduNaviKit-All/Base
- BaiduNaviKit-All/Navi (6.4.0):
- BaiduNaviKit-All/Map
- BaiduNaviKit-All/Search (6.4.0):
- BaiduNaviKit-All/Base
- BaiduNaviKit-All/Utils (6.4.0):
- BaiduNaviKit-All/Base
- BaiduNaviKit-All/WalkNavi (6.4.0):
- BaiduNaviKit-All/Map
- BMKLocationKit (2.0.6)
- BRPickerView (2.8.0):
- BRPickerView/AddressPickerView (= 2.8.0)
- BRPickerView/Base (= 2.8.0)
......@@ -53,6 +41,7 @@ PODS:
- SDWebImage (5.15.2):
- SDWebImage/Core (= 5.15.2)
- SDWebImage/Core (5.15.2)
- TXScrollLabelView (1.3.2)
- YYKit (1.0.9):
- YYKit/no-arc (= 1.0.9)
- YYKit/no-arc (1.0.9)
......@@ -60,12 +49,6 @@ PODS:
DEPENDENCIES:
- AFNetworking
- AvoidCrash
- BaiduNaviKit-All/Map (= 6.4.0)
- BaiduNaviKit-All/Navi (= 6.4.0)
- BaiduNaviKit-All/Search (= 6.4.0)
- BaiduNaviKit-All/Utils (= 6.4.0)
- BaiduNaviKit-All/WalkNavi (= 6.4.0)
- BMKLocationKit
- BRPickerView
- Bugly
- CWLateralSlide (~> 1.6.3)
......@@ -79,14 +62,13 @@ DEPENDENCIES:
- MJRefresh
- SAMKeychain
- SDWebImage
- TXScrollLabelView
- YYKit
SPEC REPOS:
https://github.com/CocoaPods/Specs.git:
- AFNetworking
- AvoidCrash
- BaiduNaviKit-All
- BMKLocationKit
- BRPickerView
- Bugly
- CWLateralSlide
......@@ -100,13 +82,12 @@ SPEC REPOS:
- MJRefresh
- SAMKeychain
- SDWebImage
- TXScrollLabelView
- YYKit
SPEC CHECKSUMS:
AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
AvoidCrash: 28c6916fe19bd2b84126b8dec7cbe61c9a12741d
BaiduNaviKit-All: 3024385b17c2d024e6be53d0ef46d4b50b032214
BMKLocationKit: 058df3f51b379be4b2865ee19bfb58c32398dc8a
BRPickerView: a0ff460bf092bc069db5a54153395b1f7e8f5300
Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da
CWLateralSlide: 8939c8dea91a24e40d0793553118cb57cd67f64b
......@@ -120,8 +101,9 @@ SPEC CHECKSUMS:
MJRefresh: fdf5e979eb406a0341468932d1dfc8b7f9fce961
SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
SDWebImage: 8ab87d4b3e5cc4927bd47f78db6ceb0b94442577
TXScrollLabelView: 0e1650caf61198bf5dc0938ea6493254aeb80f90
YYKit: 7cda43304a8dc3696c449041e2cb3107b4e236e7
PODFILE CHECKSUM: 30267728a5db79ee8e4505697e6db6b6d31e8dfc
PODFILE CHECKSUM: 1ccacdc7739911b47feda2664cf720c410e4a9fb
COCOAPODS: 1.11.3
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