Skip to content

X
xffruit
Commit 4447c6b2 authored by AvatarC's avatar AvatarC
Browse files
Options

info

parent 82ff4889
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 16 deletions
Podfile.lock
View file @ 4447c6b2
...@@ -64,4 +64,4 @@ SPEC CHECKSUMS: ...@@ -64,4 +64,4 @@ SPEC CHECKSUMS:
SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84 SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
COCOAPODS: 0.38.2 COCOAPODS: 0.39.0
XFFruit.xcodeproj/project.pbxproj
View file @ 4447c6b2
...@@ -123,8 +123,8 @@ ...@@ -123,8 +123,8 @@
724171731B9D30660094DF55 /* ChosePersonViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7241716E1B9D30660094DF55 /* ChosePersonViewController.m */; }; 724171731B9D30660094DF55 /* ChosePersonViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7241716E1B9D30660094DF55 /* ChosePersonViewController.m */; };
724171761B9D30DE0094DF55 /* ChooseCostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 724171751B9D30DE0094DF55 /* ChooseCostViewController.m */; }; 724171761B9D30DE0094DF55 /* ChooseCostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 724171751B9D30DE0094DF55 /* ChooseCostViewController.m */; };
7249BDD71BE794640059EB8C /* FinishTimeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7249BDD61BE794640059EB8C /* FinishTimeView.m */; }; 7249BDD71BE794640059EB8C /* FinishTimeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7249BDD61BE794640059EB8C /* FinishTimeView.m */; };
726B2D361C05A46A000D54A7 /* LowerOrgs.m in Sources */ = {isa = PBXBuildFile; fileRef = 726B2D351C05A46A000D54A7 /* LowerOrgs.m */; settings = {ASSET_TAGS = (); }; }; 726B2D361C05A46A000D54A7 /* LowerOrgs.m in Sources */ = {isa = PBXBuildFile; fileRef = 726B2D351C05A46A000D54A7 /* LowerOrgs.m */; };
726BEE831BF220450081360F /* ChooseTansferCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 726BEE821BF220450081360F /* ChooseTansferCell.m */; settings = {ASSET_TAGS = (); }; }; 726BEE831BF220450081360F /* ChooseTansferCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 726BEE821BF220450081360F /* ChooseTansferCell.m */; };
726F4C6D1BDE5F83006A5E6D /* RejectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F4C6C1BDE5F83006A5E6D /* RejectView.m */; }; 726F4C6D1BDE5F83006A5E6D /* RejectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F4C6C1BDE5F83006A5E6D /* RejectView.m */; };
72805CF31BB8E1B0009E1F82 /* TransferViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72805CF21BB8E1B0009E1F82 /* TransferViewController.m */; }; 72805CF31BB8E1B0009E1F82 /* TransferViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72805CF21BB8E1B0009E1F82 /* TransferViewController.m */; };
72805CF61BB8E20B009E1F82 /* NewTransferViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72805CF51BB8E20B009E1F82 /* NewTransferViewController.m */; }; 72805CF61BB8E20B009E1F82 /* NewTransferViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72805CF51BB8E20B009E1F82 /* NewTransferViewController.m */; };
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
728899EB1BEF4233003CC41E /* PassgerPriceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899EA1BEF4233003CC41E /* PassgerPriceViewController.m */; }; 728899EB1BEF4233003CC41E /* PassgerPriceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899EA1BEF4233003CC41E /* PassgerPriceViewController.m */; };
728899EE1BEF4A75003CC41E /* PasengerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899ED1BEF4A75003CC41E /* PasengerCell.m */; }; 728899EE1BEF4A75003CC41E /* PasengerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899ED1BEF4A75003CC41E /* PasengerCell.m */; };
728899F11BEF4A8A003CC41E /* PassengerHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899F01BEF4A8A003CC41E /* PassengerHeaderCell.m */; }; 728899F11BEF4A8A003CC41E /* PassengerHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 728899F01BEF4A8A003CC41E /* PassengerHeaderCell.m */; };
729735C11BFC9B5800F83CEA /* Compass.m in Sources */ = {isa = PBXBuildFile; fileRef = 729735C01BFC9B5800F83CEA /* Compass.m */; settings = {ASSET_TAGS = (); }; }; 729735C11BFC9B5800F83CEA /* Compass.m in Sources */ = {isa = PBXBuildFile; fileRef = 729735C01BFC9B5800F83CEA /* Compass.m */; };
729A2E931BE60C0200493603 /* GeometryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 729A2E921BE60C0200493603 /* GeometryView.m */; }; 729A2E931BE60C0200493603 /* GeometryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 729A2E921BE60C0200493603 /* GeometryView.m */; };
72A8132D1BCA8BBA003631F3 /* ChooseTransportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A8132C1BCA8BBA003631F3 /* ChooseTransportViewController.m */; }; 72A8132D1BCA8BBA003631F3 /* ChooseTransportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A8132C1BCA8BBA003631F3 /* ChooseTransportViewController.m */; };
72A813FA1BCD3205003631F3 /* ReceiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A813F71BCD3205003631F3 /* ReceiveViewController.m */; }; 72A813FA1BCD3205003631F3 /* ReceiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A813F71BCD3205003631F3 /* ReceiveViewController.m */; };
...@@ -168,8 +168,8 @@ ...@@ -168,8 +168,8 @@
72A814151BCF990B003631F3 /* ReceiveProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A814141BCF990B003631F3 /* ReceiveProductViewController.m */; }; 72A814151BCF990B003631F3 /* ReceiveProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A814141BCF990B003631F3 /* ReceiveProductViewController.m */; };
72A814181BCF9CF6003631F3 /* ReceiveProductCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A814171BCF9CF6003631F3 /* ReceiveProductCell.m */; }; 72A814181BCF9CF6003631F3 /* ReceiveProductCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A814171BCF9CF6003631F3 /* ReceiveProductCell.m */; };
72A8141B1BCFD6A1003631F3 /* NewReceiveProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A8141A1BCFD6A1003631F3 /* NewReceiveProductViewController.m */; }; 72A8141B1BCFD6A1003631F3 /* NewReceiveProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A8141A1BCFD6A1003631F3 /* NewReceiveProductViewController.m */; };
72B1BF821BFB5B9100A42056 /* SearchReportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B1BF811BFB5B9100A42056 /* SearchReportViewController.m */; settings = {ASSET_TAGS = (); }; }; 72B1BF821BFB5B9100A42056 /* SearchReportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B1BF811BFB5B9100A42056 /* SearchReportViewController.m */; };
72B1BF851BFB601B00A42056 /* RsearchCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B1BF841BFB601B00A42056 /* RsearchCell.m */; settings = {ASSET_TAGS = (); }; }; 72B1BF851BFB601B00A42056 /* RsearchCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B1BF841BFB601B00A42056 /* RsearchCell.m */; };
72B3C0C11B9D3C7300025D81 /* CostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0AC1B9D3C7300025D81 /* CostViewController.m */; }; 72B3C0C11B9D3C7300025D81 /* CostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0AC1B9D3C7300025D81 /* CostViewController.m */; };
72B3C0C21B9D3C7300025D81 /* NewCostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0AE1B9D3C7300025D81 /* NewCostViewController.m */; }; 72B3C0C21B9D3C7300025D81 /* NewCostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0AE1B9D3C7300025D81 /* NewCostViewController.m */; };
72B3C0C31B9D3C7300025D81 /* NewTransportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0B01B9D3C7300025D81 /* NewTransportViewController.m */; }; 72B3C0C31B9D3C7300025D81 /* NewTransportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0B01B9D3C7300025D81 /* NewTransportViewController.m */; };
...@@ -187,10 +187,10 @@ ...@@ -187,10 +187,10 @@
72B3C0D91B9DB83A00025D81 /* TransportBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0D81B9DB83A00025D81 /* TransportBoltView.m */; }; 72B3C0D91B9DB83A00025D81 /* TransportBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0D81B9DB83A00025D81 /* TransportBoltView.m */; };
72B3C0DC1B9DBD7500025D81 /* TransportCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0DB1B9DBD7500025D81 /* TransportCell.m */; }; 72B3C0DC1B9DBD7500025D81 /* TransportCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0DB1B9DBD7500025D81 /* TransportCell.m */; };
72B3C0DF1B9DC60D00025D81 /* TransportDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0DE1B9DC60D00025D81 /* TransportDetailViewController.m */; }; 72B3C0DF1B9DC60D00025D81 /* TransportDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0DE1B9DC60D00025D81 /* TransportDetailViewController.m */; };
72B56DE41BF57C710078B5C8 /* RSaleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B56DE31BF57C710078B5C8 /* RSaleView.m */; settings = {ASSET_TAGS = (); }; }; 72B56DE41BF57C710078B5C8 /* RSaleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B56DE31BF57C710078B5C8 /* RSaleView.m */; };
72B56DE71BF5925A0078B5C8 /* RPassgerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B56DE61BF5925A0078B5C8 /* RPassgerView.m */; settings = {ASSET_TAGS = (); }; }; 72B56DE71BF5925A0078B5C8 /* RPassgerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B56DE61BF5925A0078B5C8 /* RPassgerView.m */; };
72B56DED1BF5E40B0078B5C8 /* GrossRateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B56DEC1BF5E40B0078B5C8 /* GrossRateViewController.m */; settings = {ASSET_TAGS = (); }; }; 72B56DED1BF5E40B0078B5C8 /* GrossRateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B56DEC1BF5E40B0078B5C8 /* GrossRateViewController.m */; };
72C4C7461BF31BE300EDC3F8 /* ReportDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C4C7451BF31BE300EDC3F8 /* ReportDetailViewController.m */; settings = {ASSET_TAGS = (); }; }; 72C4C7461BF31BE300EDC3F8 /* ReportDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C4C7451BF31BE300EDC3F8 /* ReportDetailViewController.m */; };
72C803521B7B897B00990363 /* DataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C803511B7B897B00990363 /* DataManager.m */; }; 72C803521B7B897B00990363 /* DataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C803511B7B897B00990363 /* DataManager.m */; };
72D645231BF1E9B80029E146 /* ChooseTransferViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D645221BF1E9B80029E146 /* ChooseTransferViewController.m */; }; 72D645231BF1E9B80029E146 /* ChooseTransferViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D645221BF1E9B80029E146 /* ChooseTransferViewController.m */; };
72EDD86E1B96E11700964115 /* ChooseParentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EDD86D1B96E11700964115 /* ChooseParentViewController.m */; }; 72EDD86E1B96E11700964115 /* ChooseParentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EDD86D1B96E11700964115 /* ChooseParentViewController.m */; };
...@@ -2700,6 +2700,7 @@ ...@@ -2700,6 +2700,7 @@
C1F696001AB870B400F9F5DD /* Frameworks */, C1F696001AB870B400F9F5DD /* Frameworks */,
C1F696011AB870B400F9F5DD /* Resources */, C1F696011AB870B400F9F5DD /* Resources */,
1454647E6246AB3D8AAE6FF2 /* Copy Pods Resources */, 1454647E6246AB3D8AAE6FF2 /* Copy Pods Resources */,
B5C1D2A4E2AD146EC3870004 /* Embed Pods Frameworks */,
); );
buildRules = ( buildRules = (
); );
...@@ -2839,6 +2840,21 @@ ...@@ -2839,6 +2840,21 @@
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
B5C1D2A4E2AD146EC3870004 /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */
...@@ -3431,7 +3447,7 @@ ...@@ -3431,7 +3447,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit; PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
PRODUCT_NAME = XFFruit; PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4"; PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**"; USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
}; };
name = Debug; name = Debug;
...@@ -3456,7 +3472,7 @@ ...@@ -3456,7 +3472,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit; PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
PRODUCT_NAME = XFFruit; PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4"; PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**"; USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
}; };
name = Release; name = Release;
......
XFFruit/General/Classes/UIAppearance/ICRUIAppearance.m
View file @ 4447c6b2
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
//[[UITabBar appearance] setBarTintColor:ICR_TABBAR_TINT_COLOR]; //[[UITabBar appearance] setBarTintColor:ICR_TABBAR_TINT_COLOR];
} }
else { else {
[[UITabBar appearance] setTintColor:ICR_TABBAR_TINT_COLOR]; [[UITabBar appearance] setTintColor:ICR_TABBAR_TINT_COLOR];
} }
......
XFFruit/Info.plist
View file @ 4447c6b2
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0.1</string> <string>1.1.0</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.0.1</string> <string>1.1.0</string>
<key>NSAppTransportSecurity</key> <key>NSAppTransportSecurity</key>
<dict> <dict>
<key>NSAllowsArbitraryLoads</key> <key>NSAllowsArbitraryLoads</key>
......
XFFruit/Macro/ICRAppMacro.h
View file @ 4447c6b2
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
#define ICR_IMAGE_BG_COLOR [UIColor colorWithW:242 a:1] #define ICR_IMAGE_BG_COLOR [UIColor colorWithW:242 a:1]
//********阿里云内部测试环境******** //********阿里云内部测试环境********
#define HTTP_REST_API_BASE_URL @"http://218.244.151.129:7580/cruiser-server/rest" //#define HTTP_REST_API_BASE_URL @"http://218.244.151.129:7580/cruiser-server/rest"
//********现场测试环境******** //********现场测试环境********
//#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7280/cruiser-server/rest" //#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7280/cruiser-server/rest"
//********现场正式环境********* //********现场正式环境*********
// #define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7380/cruiser-server/rest" #define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7380/cruiser-server/rest"
// HTTP // HTTP
......
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