Skip to content

P
Palmwms
Commit c7a59202 authored by 曹云霄's avatar 曹云霄
Browse files
Options

修改项说明：

parent 13280af6
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 45 deletions
Palmwms.xcodeproj/project.pbxproj
View file @ c7a59202
......@@ -44,10 +44,10 @@
29A127641DB09B2C008D4794 /* libstdc++.6.0.9.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 29A127631DB09B2C008D4794 /* libstdc++.6.0.9.tbd */; };
29A127661DB09B37008D4794 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 29A127651DB09B37008D4794 /* libsqlite3.0.tbd */; };
29A127681DB09B41008D4794 /* libz.1.2.5.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 29A127671DB09B41008D4794 /* libz.1.2.5.tbd */; };
29A127771DB0BA83008D4794 /* baiduNaviSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 29A1276A1DB0BA83008D4794 /* baiduNaviSDK.bundle */; };
29A127781DB0BA83008D4794 /* libbaiduNaviSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 29A127741DB0BA83008D4794 /* libbaiduNaviSDK.a */; };
29A1277E1DB0BB6B008D4794 /* NaviManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A1277D1DB0BB6B008D4794 /* NaviManager.m */; };
29A127821DB0D00C008D4794 /* OfflineMapsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A127811DB0D00C008D4794 /* OfflineMapsManager.m */; };
29C30BD31DDC077D00CA3E29 /* baiduNaviSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 29C30BC81DDC077D00CA3E29 /* baiduNaviSDK.bundle */; };
29C30BD41DDC077D00CA3E29 /* libbaiduNaviSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 29C30BD21DDC077D00CA3E29 /* libbaiduNaviSDK.a */; };
29CAE20A1D6ED4BF0011CCE6 /* CustomLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CAE2041D6ED4BF0011CCE6 /* CustomLabel.m */; };
29CAE20C1D6ED4BF0011CCE6 /* UserPaopaoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CAE2081D6ED4BF0011CCE6 /* UserPaopaoView.m */; };
29CAE20F1D6EE34E0011CCE6 /* CustomBMKAnnotationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CAE20E1D6EE34E0011CCE6 /* CustomBMKAnnotationView.m */; };
......@@ -119,20 +119,20 @@
29A127631DB09B2C008D4794 /* libstdc++.6.0.9.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.6.0.9.tbd"; path = "usr/lib/libstdc++.6.0.9.tbd"; sourceTree = SDKROOT; };
29A127651DB09B37008D4794 /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
29A127671DB09B41008D4794 /* libz.1.2.5.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.1.2.5.tbd; path = usr/lib/libz.1.2.5.tbd; sourceTree = SDKROOT; };
29A1276A1DB0BA83008D4794 /* baiduNaviSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = baiduNaviSDK.bundle; sourceTree = "<group>"; };
29A1276C1DB0BA83008D4794 /* BNCommonDef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCommonDef.h; sourceTree = "<group>"; };
29A1276D1DB0BA83008D4794 /* BNCoreServices.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCoreServices.h; sourceTree = "<group>"; };
29A1276E1DB0BA83008D4794 /* BNLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNLocation.h; sourceTree = "<group>"; };
29A1276F1DB0BA83008D4794 /* BNLocationManagerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNLocationManagerProtocol.h; sourceTree = "<group>"; };
29A127701DB0BA83008D4794 /* BNRoutePlanManagerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNRoutePlanManagerProtocol.h; sourceTree = "<group>"; };
29A127711DB0BA83008D4794 /* BNRoutePlanModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNRoutePlanModel.h; sourceTree = "<group>"; };
29A127721DB0BA83008D4794 /* BNStrategyManagerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNStrategyManagerProtocol.h; sourceTree = "<group>"; };
29A127731DB0BA83008D4794 /* BNUIManagerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNUIManagerProtocol.h; sourceTree = "<group>"; };
29A127741DB0BA83008D4794 /* libbaiduNaviSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libbaiduNaviSDK.a; sourceTree = "<group>"; };
29A1277C1DB0BB6B008D4794 /* NaviManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NaviManager.h; sourceTree = "<group>"; };
29A1277D1DB0BB6B008D4794 /* NaviManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NaviManager.m; sourceTree = "<group>"; };
29A127801DB0D00C008D4794 /* OfflineMapsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfflineMapsManager.h; sourceTree = "<group>"; };
29A127811DB0D00C008D4794 /* OfflineMapsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OfflineMapsManager.m; sourceTree = "<group>"; };
29C30BC81DDC077D00CA3E29 /* baiduNaviSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = baiduNaviSDK.bundle; sourceTree = "<group>"; };
29C30BCA1DDC077D00CA3E29 /* BNCommonDef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCommonDef.h; sourceTree = "<group>"; };
29C30BCB1DDC077D00CA3E29 /* BNCoreServices.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCoreServices.h; sourceTree = "<group>"; };
29C30BCC1DDC077D00CA3E29 /* BNLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNLocation.h; sourceTree = "<group>"; };
29C30BCD1DDC077D00CA3E29 /* BNLocationManagerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNLocationManagerProtocol.h; sourceTree = "<group>"; };
29C30BCE1DDC077D00CA3E29 /* BNRoutePlanManagerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNRoutePlanManagerProtocol.h; sourceTree = "<group>"; };
29C30BCF1DDC077D00CA3E29 /* BNRoutePlanModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNRoutePlanModel.h; sourceTree = "<group>"; };
29C30BD01DDC077D00CA3E29 /* BNStrategyManagerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNStrategyManagerProtocol.h; sourceTree = "<group>"; };
29C30BD11DDC077D00CA3E29 /* BNUIManagerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNUIManagerProtocol.h; sourceTree = "<group>"; };
29C30BD21DDC077D00CA3E29 /* libbaiduNaviSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libbaiduNaviSDK.a; sourceTree = "<group>"; };
29CAE2031D6ED4BF0011CCE6 /* CustomLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomLabel.h; sourceTree = "<group>"; };
29CAE2041D6ED4BF0011CCE6 /* CustomLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomLabel.m; sourceTree = "<group>"; };
29CAE2071D6ED4BF0011CCE6 /* UserPaopaoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserPaopaoView.h; sourceTree = "<group>"; };
......@@ -180,7 +180,7 @@
29A127501DB09ACE008D4794 /* CoreMotion.framework in Frameworks */,
29A1274E1DB09AC6008D4794 /* ImageIO.framework in Frameworks */,
29A1274C1DB09ABD008D4794 /* AudioToolbox.framework in Frameworks */,
29A127781DB0BA83008D4794 /* libbaiduNaviSDK.a in Frameworks */,
29C30BD41DDC077D00CA3E29 /* libbaiduNaviSDK.a in Frameworks */,
245A94E8CF106B8484648757 /* libPods.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -244,7 +244,7 @@
2970D1871D6D7BF800ADB311 /* Tools */ = {
isa = PBXGroup;
children = (
29A127691DB0BA83008D4794 /* BaiduNaviSDK */,
29C30BC71DDC077D00CA3E29 /* BaiduNaviSDK */,
2970D1AD1D6D9CA000ADB311 /* BaseModel */,
2970D1951D6D88CB00ADB311 /* HttpManager */,
2970D1961D6D88CB00ADB311 /* LoadingAnimation */,
......@@ -351,47 +351,47 @@
path = BaseModel;
sourceTree = "<group>";
};
29A127691DB0BA83008D4794 /* BaiduNaviSDK */ = {
29A1277B1DB0BB42008D4794 /* BaiduNaviHelp */ = {
isa = PBXGroup;
children = (
29A1276A1DB0BA83008D4794 /* baiduNaviSDK.bundle */,
29A1276B1DB0BA83008D4794 /* inc */,
29A127741DB0BA83008D4794 /* libbaiduNaviSDK.a */,
29A1277C1DB0BB6B008D4794 /* NaviManager.h */,
29A1277D1DB0BB6B008D4794 /* NaviManager.m */,
);
path = BaiduNaviSDK;
path = BaiduNaviHelp;
sourceTree = "<group>";
};
29A1276B1DB0BA83008D4794 /* inc */ = {
29A1277F1DB0CFFD008D4794 /* OfflineMapsHelp */ = {
isa = PBXGroup;
children = (
29A1276C1DB0BA83008D4794 /* BNCommonDef.h */,
29A1276D1DB0BA83008D4794 /* BNCoreServices.h */,
29A1276E1DB0BA83008D4794 /* BNLocation.h */,
29A1276F1DB0BA83008D4794 /* BNLocationManagerProtocol.h */,
29A127701DB0BA83008D4794 /* BNRoutePlanManagerProtocol.h */,
29A127711DB0BA83008D4794 /* BNRoutePlanModel.h */,
29A127721DB0BA83008D4794 /* BNStrategyManagerProtocol.h */,
29A127731DB0BA83008D4794 /* BNUIManagerProtocol.h */,
29A127801DB0D00C008D4794 /* OfflineMapsManager.h */,
29A127811DB0D00C008D4794 /* OfflineMapsManager.m */,
);
path = inc;
path = OfflineMapsHelp;
sourceTree = "<group>";
};
29A1277B1DB0BB42008D4794 /* BaiduNaviHelp */ = {
29C30BC71DDC077D00CA3E29 /* BaiduNaviSDK */ = {
isa = PBXGroup;
children = (
29A1277C1DB0BB6B008D4794 /* NaviManager.h */,
29A1277D1DB0BB6B008D4794 /* NaviManager.m */,
29C30BC81DDC077D00CA3E29 /* baiduNaviSDK.bundle */,
29C30BC91DDC077D00CA3E29 /* inc */,
29C30BD21DDC077D00CA3E29 /* libbaiduNaviSDK.a */,
);
path = BaiduNaviHelp;
path = BaiduNaviSDK;
sourceTree = "<group>";
};
29A1277F1DB0CFFD008D4794 /* OfflineMapsHelp */ = {
29C30BC91DDC077D00CA3E29 /* inc */ = {
isa = PBXGroup;
children = (
29A127801DB0D00C008D4794 /* OfflineMapsManager.h */,
29A127811DB0D00C008D4794 /* OfflineMapsManager.m */,
29C30BCA1DDC077D00CA3E29 /* BNCommonDef.h */,
29C30BCB1DDC077D00CA3E29 /* BNCoreServices.h */,
29C30BCC1DDC077D00CA3E29 /* BNLocation.h */,
29C30BCD1DDC077D00CA3E29 /* BNLocationManagerProtocol.h */,
29C30BCE1DDC077D00CA3E29 /* BNRoutePlanManagerProtocol.h */,
29C30BCF1DDC077D00CA3E29 /* BNRoutePlanModel.h */,
29C30BD01DDC077D00CA3E29 /* BNStrategyManagerProtocol.h */,
29C30BD11DDC077D00CA3E29 /* BNUIManagerProtocol.h */,
);
path = OfflineMapsHelp;
path = inc;
sourceTree = "<group>";
};
29CAE2001D6ED4BF0011CCE6 /* Map */ = {
......@@ -529,7 +529,8 @@
TargetAttributes = {
29CF91721D66B8CC00AE13A8 = {
CreatedOnToolsVersion = 7.2;
DevelopmentTeam = 39XYE6VSP8;
DevelopmentTeam = W54V2VB863;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.BackgroundModes = {
enabled = 1;
......@@ -562,7 +563,7 @@
buildActionMask = 2147483647;
files = (
29CF91861D66B8CC00AE13A8 /* LaunchScreen.storyboard in Resources */,
29A127771DB0BA83008D4794 /* baiduNaviSDK.bundle in Resources */,
29C30BD31DDC077D00CA3E29 /* baiduNaviSDK.bundle in Resources */,
2970D1891D6D7C1000ADB311 /* Images.xcassets in Resources */,
29CF91831D66B8CC00AE13A8 /* Assets.xcassets in Resources */,
2970D18B1D6D7CFE00ADB311 /* PalmwmsMain.storyboard in Resources */,
......@@ -757,8 +758,14 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = W54V2VB863;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_ROOT}/BaiduMapKit/BaiduMapKit\"",
"\"${PODS_ROOT}/UMengAnalytics/umsdk_IOS_analyics_idfa_v4.1.0\"",
);
GCC_PREFIX_HEADER = "$(SRCROOT)/Palmwms/Tools/Macro/PrefixHeader.pch";
HEADER_SEARCH_PATHS = (
"$(inherited)",
......@@ -780,7 +787,8 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.palmwms;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "3f85aed4-daef-463f-be40-80512d051d3a";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
};
......@@ -792,8 +800,14 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = W54V2VB863;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_ROOT}/BaiduMapKit/BaiduMapKit\"",
"\"${PODS_ROOT}/UMengAnalytics/umsdk_IOS_analyics_idfa_v4.1.0\"",
);
GCC_PREFIX_HEADER = "$(SRCROOT)/Palmwms/Tools/Macro/PrefixHeader.pch";
HEADER_SEARCH_PATHS = (
"$(inherited)",
......@@ -815,7 +829,8 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.palmwms;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "3f85aed4-daef-463f-be40-80512d051d3a";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
};
......
Palmwms/Tools/Macro/MacroDefinition.h
View file @ c7a59202
......@@ -55,12 +55,12 @@
///**
// * 服务器正式地址
// */
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://122.228.134.82:8180/palmwms-web/app/%@",URL]
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://122.228.134.82:8180/palmwms-web/app/%@",URL]
/**
* 服务器开发地址
*/
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8091/palmwms-web/app/%@",URL]
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8091/palmwms-web/app/%@",URL]
/**
* 断网标示
......
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