Skip to content

C
Car-iOS-Merchant
Commit e6bc26cb authored by Sandy's avatar Sandy
Browse files
Options

Merge branch 'customerVersion' 

""
parents 109ae142 e2381724
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 299 additions and 297 deletions
Car Customer-Info.plist 0 → 100644
View file @ e6bc26cb
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>车族通</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.4</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLSchemes</key>
<array>
<string>wx39e5b31bb7b479c7</string>
</array>
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.0.4</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>wechat</string>
<string>weixin</string>
<string>sinaweibohd</string>
<string>sinaweibo</string>
<string>sinaweibosso</string>
<string>weibosdk</string>
<string>weibosdk2.5</string>
<string>mqqapi</string>
<string>mqq</string>
<string>mqqOpensdkSSoLogin</string>
<string>mqqconnect</string>
<string>mqqopensdkdataline</string>
<string>mqqopensdkgrouptribeshare</string>
<string>mqqopensdkfriend</string>
<string>mqqopensdkapi</string>
<string>mqqopensdkapiV2</string>
<string>mqqopensdkapiV3</string>
<string>mqqopensdkapiV4</string>
<string>mqzoneopensdk</string>
<string>wtloginmqq</string>
<string>wtloginmqq2</string>
<string>mqqwpa</string>
<string>mqzone</string>
<string>mqzonev2</string>
<string>mqzoneshare</string>
<string>wtloginqzone</string>
<string>mqzonewx</string>
<string>mqzoneopensdkapiV2</string>
<string>mqzoneopensdkapi19</string>
<string>mqzoneopensdkapi</string>
<string>mqqbrowser</string>
<string>mttbrowser</string>
<string>alipay</string>
<string>alipayshare</string>
<string>dingtalk</string>
<string>dingtalk-open</string>
<string>laiwangsso</string>
<string>yixin</string>
<string>yixinopenapi</string>
<string>instagram</string>
<string>whatsapp</string>
<string>line</string>
<string>fbapi</string>
<string>fb-messenger-api</string>
<string>fbauth2</string>
<string>fbshareextension</string>
<string>kakaofa63a0b2356e923f3edd6512d531f546</string>
<string>kakaokompassauth</string>
<string>storykompassauth</string>
<string>kakaolink</string>
<string>kakaotalk-4.5.0</string>
<string>kakaostory-2.9.0</string>
<string>pinterestsdk.v1</string>
<string>tumblr</string>
<string>evernote</string>
<string>en</string>
<string>enx</string>
<string>evernotecid</string>
<string>evernotemsg</string>
<string>youdaonote</string>
<string>ynotedictfav</string>
<string>com.youdao.note.todayViewNote</string>
<string>ynotesharesdk</string>
<string>gplus</string>
<string>pocket</string>
<string>readitlater</string>
<string>pocket-oauth-v1</string>
<string>fb131450656879143</string>
<string>en-readitlater-5776</string>
<string>com.ideashower.ReadItLaterPro3</string>
<string>com.ideashower.ReadItLaterPro</string>
<string>com.ideashower.ReadItLaterProAlpha</string>
<string>com.ideashower.ReadItLaterProEnterprise</string>
<string>vk</string>
<string>vk-share</string>
<string>vkauthorize</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSAppleMusicUsageDescription</key>
<string>App需要您的同意,才能访问媒体资料库</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>App需要您的同意,才能访问蓝牙</string>
<key>NSCalendarsUsageDescription</key>
<string>App需要您的同意,才能访问日历</string>
<key>NSCameraUsageDescription</key>
<string>App需要您的同意,才能访问相机</string>
<key>NSHealthShareUsageDescription</key>
<string>App需要您的同意,才能访问健康分享</string>
<key>NSHealthUpdateUsageDescription</key>
<string>App需要您的同意,才能访问健康更新 </string>
<key>NSLocationAlwaysUsageDescription</key>
<string>App需要您的同意,才能始终访问位置</string>
<key>NSLocationUsageDescription</key>
<string>App需要您的同意,才能访问位置</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>App需要您的同意,才能在使用期间访问位置</string>
<key>NSMicrophoneUsageDescription</key>
<string>App需要您的同意,才能访问麦克风</string>
<key>NSMotionUsageDescription</key>
<string>App需要您的同意,才能访问运动与健身</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>App需要您的同意,才能访问相册</string>
<key>NSRemindersUsageDescription</key>
<string>App需要您的同意,才能访问提醒事项</string>
<key>UIBackgroundModes</key>
<array>
<string>location</string>
<string>remote-notification</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
</dict>
</plist>
Car.xcodeproj/project.pbxproj
View file @ e6bc26cb
...@@ -151,6 +151,7 @@ ...@@ -151,6 +151,7 @@
1C42A5C44B20710C8551415C /* Pods-car_base-Car.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car.release.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car/Pods-car_base-Car.release.xcconfig"; sourceTree = "<group>"; }; 1C42A5C44B20710C8551415C /* Pods-car_base-Car.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car.release.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car/Pods-car_base-Car.release.xcconfig"; sourceTree = "<group>"; };
34B91CD599A3C8265AB0C96C /* Pods-car_base-Car.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car.debug.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car/Pods-car_base-Car.debug.xcconfig"; sourceTree = "<group>"; }; 34B91CD599A3C8265AB0C96C /* Pods-car_base-Car.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car.debug.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car/Pods-car_base-Car.debug.xcconfig"; sourceTree = "<group>"; };
59F0FD637A5CE430F164395B /* Pods-car_base-Car Release.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car Release.debug.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car Release/Pods-car_base-Car Release.debug.xcconfig"; sourceTree = "<group>"; }; 59F0FD637A5CE430F164395B /* Pods-car_base-Car Release.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car Release.debug.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car Release/Pods-car_base-Car Release.debug.xcconfig"; sourceTree = "<group>"; };
8F0014D61E824650007612D8 /* Car Customer-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Car Customer-Info.plist"; path = "/Users/Javen/Documents/MyProject/Car-iOS/Car Customer-Info.plist"; sourceTree = "<absolute>"; };
8F20954F1E15171600FBED74 /* UMengHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UMengHelper.h; sourceTree = "<group>"; }; 8F20954F1E15171600FBED74 /* UMengHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UMengHelper.h; sourceTree = "<group>"; };
8F2095501E15171600FBED74 /* UMengHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UMengHelper.m; sourceTree = "<group>"; }; 8F2095501E15171600FBED74 /* UMengHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UMengHelper.m; sourceTree = "<group>"; };
8F2095531E15188500FBED74 /* JPushHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPushHelper.h; sourceTree = "<group>"; }; 8F2095531E15188500FBED74 /* JPushHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPushHelper.h; sourceTree = "<group>"; };
...@@ -198,7 +199,7 @@ ...@@ -198,7 +199,7 @@
8F8105701E1101E4009A2AB3 /* NSDate+FormatterAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+FormatterAdditions.h"; sourceTree = "<group>"; }; 8F8105701E1101E4009A2AB3 /* NSDate+FormatterAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+FormatterAdditions.h"; sourceTree = "<group>"; };
8F8105721E1117D2009A2AB3 /* ModifyPswTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyPswTableViewController.h; sourceTree = "<group>"; }; 8F8105721E1117D2009A2AB3 /* ModifyPswTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyPswTableViewController.h; sourceTree = "<group>"; };
8F8105731E1117D2009A2AB3 /* ModifyPswTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyPswTableViewController.m; sourceTree = "<group>"; }; 8F8105731E1117D2009A2AB3 /* ModifyPswTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyPswTableViewController.m; sourceTree = "<group>"; };
8F97C2B81E0CC4BE00D8A57D /* Car.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Car.app; sourceTree = BUILT_PRODUCTS_DIR; }; 8F97C2B81E0CC4BE00D8A57D /* Car-Customer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Car-Customer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
8F97C2BC1E0CC4BE00D8A57D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 8F97C2BC1E0CC4BE00D8A57D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
8F97C2BE1E0CC4BE00D8A57D /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; 8F97C2BE1E0CC4BE00D8A57D /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
8F97C2BF1E0CC4BE00D8A57D /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; }; 8F97C2BF1E0CC4BE00D8A57D /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
...@@ -280,7 +281,7 @@ ...@@ -280,7 +281,7 @@
8FFE3D961E139D9F00BEB6A6 /* CardModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CardModel.m; sourceTree = "<group>"; }; 8FFE3D961E139D9F00BEB6A6 /* CardModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CardModel.m; sourceTree = "<group>"; };
8FFE3D981E13A8AA00BEB6A6 /* car_objc_json_client.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = car_objc_json_client.m; sourceTree = "<group>"; }; 8FFE3D981E13A8AA00BEB6A6 /* car_objc_json_client.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = car_objc_json_client.m; sourceTree = "<group>"; };
8FFE3D991E13A8AA00BEB6A6 /* car_objc_json_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = car_objc_json_client.h; sourceTree = "<group>"; }; 8FFE3D991E13A8AA00BEB6A6 /* car_objc_json_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = car_objc_json_client.h; sourceTree = "<group>"; };
8FFE3E141E14AC6700BEB6A6 /* Car Release.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Car Release.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 8FFE3E141E14AC6700BEB6A6 /* Car-Customer Release.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Car-Customer Release.app"; sourceTree = BUILT_PRODUCTS_DIR; };
8FFE3E151E14AC6700BEB6A6 /* Car Release.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Car Release.plist"; path = "/Users/Javen/Documents/MyProject/Car-iOS/Car Release.plist"; sourceTree = "<absolute>"; }; 8FFE3E151E14AC6700BEB6A6 /* Car Release.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Car Release.plist"; path = "/Users/Javen/Documents/MyProject/Car-iOS/Car Release.plist"; sourceTree = "<absolute>"; };
D84929CB776A620566CE3CB6 /* Pods-car_base-Car Release.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car Release.release.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car Release/Pods-car_base-Car Release.release.xcconfig"; sourceTree = "<group>"; }; D84929CB776A620566CE3CB6 /* Pods-car_base-Car Release.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-car_base-Car Release.release.xcconfig"; path = "Pods/Target Support Files/Pods-car_base-Car Release/Pods-car_base-Car Release.release.xcconfig"; sourceTree = "<group>"; };
E3A60FCFD401BA3D051DAF70 /* libPods-car_base-Car Release.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-car_base-Car Release.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E3A60FCFD401BA3D051DAF70 /* libPods-car_base-Car Release.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-car_base-Car Release.a"; sourceTree = BUILT_PRODUCTS_DIR; };
...@@ -441,16 +442,17 @@ ...@@ -441,16 +442,17 @@
7DD06E672CBD615874B5F18D /* Pods */, 7DD06E672CBD615874B5F18D /* Pods */,
1C9665B4D157E0C4E18F9BC0 /* Frameworks */, 1C9665B4D157E0C4E18F9BC0 /* Frameworks */,
8FFE3E151E14AC6700BEB6A6 /* Car Release.plist */, 8FFE3E151E14AC6700BEB6A6 /* Car Release.plist */,
8F0014D61E824650007612D8 /* Car Customer-Info.plist */,
); );
sourceTree = "<group>"; sourceTree = "<group>";
}; };
8F97C2B91E0CC4BE00D8A57D /* Products */ = { 8F97C2B91E0CC4BE00D8A57D /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
8F97C2B81E0CC4BE00D8A57D /* Car.app */, 8F97C2B81E0CC4BE00D8A57D /* Car-Customer.app */,
8F97C2D11E0CC4BE00D8A57D /* CarTests.xctest */, 8F97C2D11E0CC4BE00D8A57D /* CarTests.xctest */,
8F97C2DC1E0CC4BE00D8A57D /* CarUITests.xctest */, 8F97C2DC1E0CC4BE00D8A57D /* CarUITests.xctest */,
8FFE3E141E14AC6700BEB6A6 /* Car Release.app */, 8FFE3E141E14AC6700BEB6A6 /* Car-Customer Release.app */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -725,9 +727,9 @@ ...@@ -725,9 +727,9 @@
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
8F97C2B71E0CC4BE00D8A57D /* Car */ = { 8F97C2B71E0CC4BE00D8A57D /* Car-Customer */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 8F97C2E51E0CC4BE00D8A57D /* Build configuration list for PBXNativeTarget "Car" */; buildConfigurationList = 8F97C2E51E0CC4BE00D8A57D /* Build configuration list for PBXNativeTarget "Car-Customer" */;
buildPhases = ( buildPhases = (
2A23047584C11A2CB7DD7D44 /* [CP] Check Pods Manifest.lock */, 2A23047584C11A2CB7DD7D44 /* [CP] Check Pods Manifest.lock */,
8F97C2B41E0CC4BE00D8A57D /* Sources */, 8F97C2B41E0CC4BE00D8A57D /* Sources */,
...@@ -740,9 +742,9 @@ ...@@ -740,9 +742,9 @@
); );
dependencies = ( dependencies = (
); );
name = Car; name = "Car-Customer";
productName = Car; productName = Car;
productReference = 8F97C2B81E0CC4BE00D8A57D /* Car.app */; productReference = 8F97C2B81E0CC4BE00D8A57D /* Car-Customer.app */;
productType = "com.apple.product-type.application"; productType = "com.apple.product-type.application";
}; };
8F97C2D01E0CC4BE00D8A57D /* CarTests */ = { 8F97C2D01E0CC4BE00D8A57D /* CarTests */ = {
...@@ -781,9 +783,9 @@ ...@@ -781,9 +783,9 @@
productReference = 8F97C2DC1E0CC4BE00D8A57D /* CarUITests.xctest */; productReference = 8F97C2DC1E0CC4BE00D8A57D /* CarUITests.xctest */;
productType = "com.apple.product-type.bundle.ui-testing"; productType = "com.apple.product-type.bundle.ui-testing";
}; };
8FFE3DDA1E14AC6700BEB6A6 /* Car Release */ = { 8FFE3DDA1E14AC6700BEB6A6 /* Car-Customer Release */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 8FFE3E111E14AC6700BEB6A6 /* Build configuration list for PBXNativeTarget "Car Release" */; buildConfigurationList = 8FFE3E111E14AC6700BEB6A6 /* Build configuration list for PBXNativeTarget "Car-Customer Release" */;
buildPhases = ( buildPhases = (
0D6C8DD9315DBA6E6DC2B066 /* [CP] Check Pods Manifest.lock */, 0D6C8DD9315DBA6E6DC2B066 /* [CP] Check Pods Manifest.lock */,
8FFE3DDC1E14AC6700BEB6A6 /* Sources */, 8FFE3DDC1E14AC6700BEB6A6 /* Sources */,
...@@ -796,9 +798,9 @@ ...@@ -796,9 +798,9 @@
); );
dependencies = ( dependencies = (
); );
name = "Car Release"; name = "Car-Customer Release";
productName = Car; productName = Car;
productReference = 8FFE3E141E14AC6700BEB6A6 /* Car Release.app */; productReference = 8FFE3E141E14AC6700BEB6A6 /* Car-Customer Release.app */;
productType = "com.apple.product-type.application"; productType = "com.apple.product-type.application";
}; };
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
...@@ -853,10 +855,10 @@ ...@@ -853,10 +855,10 @@
projectDirPath = ""; projectDirPath = "";
projectRoot = ""; projectRoot = "";
targets = ( targets = (
8F97C2B71E0CC4BE00D8A57D /* Car */, 8F97C2B71E0CC4BE00D8A57D /* Car-Customer */,
8F97C2D01E0CC4BE00D8A57D /* CarTests */, 8F97C2D01E0CC4BE00D8A57D /* CarTests */,
8F97C2DB1E0CC4BE00D8A57D /* CarUITests */, 8F97C2DB1E0CC4BE00D8A57D /* CarUITests */,
8FFE3DDA1E14AC6700BEB6A6 /* Car Release */, 8FFE3DDA1E14AC6700BEB6A6 /* Car-Customer Release */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
...@@ -1138,12 +1140,12 @@ ...@@ -1138,12 +1140,12 @@
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
8F97C2D31E0CC4BE00D8A57D /* PBXTargetDependency */ = { 8F97C2D31E0CC4BE00D8A57D /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = 8F97C2B71E0CC4BE00D8A57D /* Car */; target = 8F97C2B71E0CC4BE00D8A57D /* Car-Customer */;
targetProxy = 8F97C2D21E0CC4BE00D8A57D /* PBXContainerItemProxy */; targetProxy = 8F97C2D21E0CC4BE00D8A57D /* PBXContainerItemProxy */;
}; };
8F97C2DE1E0CC4BE00D8A57D /* PBXTargetDependency */ = { 8F97C2DE1E0CC4BE00D8A57D /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = 8F97C2B71E0CC4BE00D8A57D /* Car */; target = 8F97C2B71E0CC4BE00D8A57D /* Car-Customer */;
targetProxy = 8F97C2DD1E0CC4BE00D8A57D /* PBXContainerItemProxy */; targetProxy = 8F97C2DD1E0CC4BE00D8A57D /* PBXContainerItemProxy */;
}; };
/* End PBXTargetDependency section */ /* End PBXTargetDependency section */
...@@ -1428,7 +1430,7 @@ ...@@ -1428,7 +1430,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
8F97C2E51E0CC4BE00D8A57D /* Build configuration list for PBXNativeTarget "Car" */ = { 8F97C2E51E0CC4BE00D8A57D /* Build configuration list for PBXNativeTarget "Car-Customer" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
8F97C2E61E0CC4BE00D8A57D /* Debug */, 8F97C2E61E0CC4BE00D8A57D /* Debug */,
...@@ -1455,7 +1457,7 @@ ...@@ -1455,7 +1457,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
8FFE3E111E14AC6700BEB6A6 /* Build configuration list for PBXNativeTarget "Car Release" */ = { 8FFE3E111E14AC6700BEB6A6 /* Build configuration list for PBXNativeTarget "Car-Customer Release" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
8FFE3E121E14AC6700BEB6A6 /* Debug */, 8FFE3E121E14AC6700BEB6A6 /* Debug */,
......
Car/Base.lproj/Main.storyboard
View file @ e6bc26cb
This diff is collapsed.
Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m
View file @ e6bc26cb
...@@ -53,27 +53,13 @@ ...@@ -53,27 +53,13 @@
[tableView deselectRowAtIndexPath:indexPath animated:YES]; [tableView deselectRowAtIndexPath:indexPath animated:YES];
[kGlobal.sideSlipVC showMainView]; [kGlobal.sideSlipVC showMainView];
if (indexPath.row == 0) {//工分账单 if (indexPath.row == 0) {//核销订单
BillListViewController *billVC = [BillListViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
[kGlobal.mainNaVC pushViewController:billVC animated:YES];
}else if (indexPath.row == 1) {//账户
AccountViewController *accoutVC = [AccountViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
CLog(@"--------->%@",kUser.wxOpenId);
if (kUser.wxOpenId.length > 0) {
accoutVC.type = AccountViewControllerTypeBinding;
}else{
accoutVC.type = AccountViewControllerTypeUnBing;
}
[kGlobal.mainNaVC pushViewController:accoutVC animated:YES];
}else if (indexPath.row == 2) {//核销卡券
[self scanCard]; [self scanCard];
}else if (indexPath.row == 3){ }else if (indexPath.row == 1) {//修改密码
[self scanWatchCode];
}else if (indexPath.row == 4) {//修改密码
ModifyPswTableViewController *modifyVC = [ModifyPswTableViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN]; ModifyPswTableViewController *modifyVC = [ModifyPswTableViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
[kGlobal.mainNaVC pushViewController:modifyVC animated:YES]; [kGlobal.mainNaVC pushViewController:modifyVC animated:YES];
}else if (indexPath.row == 5) {//退出登录 }else if (indexPath.row == 2) {//退出登录
[kGlobal.sideSlipVC dismissViewControllerAnimated:YES completion:nil]; [kGlobal.sideSlipVC dismissViewControllerAnimated:YES completion:nil];
} }
......
Car/CodeClass/Login/ViewControllers/LoginViewController.m
View file @ e6bc26cb
...@@ -77,13 +77,10 @@ ...@@ -77,13 +77,10 @@
kCanNotBeNil(self.textFieldUser.text, @"工号不能为空！"); kCanNotBeNil(self.textFieldUser.text, @"工号不能为空！");
kCanNotBeNil(self.textFieldPsw.text, @"密码不能为空！"); kCanNotBeNil(self.textFieldPsw.text, @"密码不能为空！");
kCanNotBeNil(self.longtitude, @"未获取位置信息！");
NSDictionary *myDictionary = @{ NSDictionary *myDictionary = @{
@"userName" : self.textFieldUser.text, @"userName" : self.textFieldUser.text,
@"password" : self.textFieldPsw.text, @"password" : self.textFieldPsw.text
@"longitude" : self.longtitude,
@"latitude" : self.latitute
}; };
WS(weakSelf); WS(weakSelf);
[MBProgressHUD j_loading:@"登录中…"]; [MBProgressHUD j_loading:@"登录中…"];
......
Car/CodeClass/Main/ViewControllers/OrderListFilterViewController.m
View file @ e6bc26cb
...@@ -123,15 +123,16 @@ ...@@ -123,15 +123,16 @@
- (void)hideFilterView { - (void)hideFilterView {
HIDE_KEYBOARD; HIDE_KEYBOARD;
self.isOpen = NO; self.isOpen = NO;
self.constraintHeight.constant = 0; // self.constraintHeight.constant = 0;
[UIView animateWithDuration:0.7 [UIView animateWithDuration:0.7
delay:0 delay:0
usingSpringWithDamping:0.9 usingSpringWithDamping:0.9
initialSpringVelocity:1.0 initialSpringVelocity:1.0
options:UIViewAnimationOptionCurveLinear options:UIViewAnimationOptionCurveLinear
animations:^{ animations:^{
self.board.transform = CGAffineTransformMakeScale(1, 0);
self.shadow.backgroundColor = [UIColor clearColor]; self.shadow.backgroundColor = [UIColor clearColor];
[self.view layoutIfNeeded]; // [self.view layoutIfNeeded];
} }
completion:^(BOOL finished) { completion:^(BOOL finished) {
[self.view removeFromSuperview]; [self.view removeFromSuperview];
...@@ -140,7 +141,7 @@ ...@@ -140,7 +141,7 @@
- (void)showFilterView { - (void)showFilterView {
self.isOpen = YES; self.isOpen = YES;
self.constraintHeight.constant = 320; // self.constraintHeight.constant = 320;
[UIView animateWithDuration:0.7 [UIView animateWithDuration:0.7
delay:0 delay:0
usingSpringWithDamping:0.9 usingSpringWithDamping:0.9
...@@ -148,7 +149,8 @@ ...@@ -148,7 +149,8 @@
options:UIViewAnimationOptionCurveLinear options:UIViewAnimationOptionCurveLinear
animations:^{ animations:^{
self.shadow.backgroundColor = [UIColor colorWithWhite:0.3 alpha:0.3]; self.shadow.backgroundColor = [UIColor colorWithWhite:0.3 alpha:0.3];
[self.view layoutIfNeeded]; // [self.view layoutIfNeeded];
self.board.transform = CGAffineTransformMakeScale(1, 0);
} }
completion:nil]; completion:nil];
} }
......
Car/URL.h
View file @ e6bc26cb
...@@ -10,18 +10,18 @@ ...@@ -10,18 +10,18 @@
#define URL_h #define URL_h
#ifdef test #ifdef test
static NSString *const VersionName = @"车族通测试版"; static NSString *const VersionName = @"车族通客户版测试版";
static NSString *const BASE_IP = @"http://cartest.gomoretech.com"; static NSString *const BASE_IP = @"http://cartest.gomoretech.com";
#else #else
static NSString *const VersionName = @"车族通正式版"; static NSString *const VersionName = @"车族通客户版正式版";
static NSString *const BASE_IP = @"http://whcar.gomoretech.com"; static NSString *const BASE_IP = @"http://whcar.gomoretech.com";
#endif #endif
/** 请求基准地址 */ /** 请求基准地址 */
#define REST_BASE_URL [NSString stringWithFormat:@"%@/car-web/app", BASE_IP] #define REST_BASE_URL [NSString stringWithFormat:@"%@/car-web/app", BASE_IP]
static NSString *const kLoginUrl = @"stationUser/login"; static NSString *const kLoginUrl = @"merchantUser/login";
static NSString *const kUpgradeUrl = @"stationUser/getUpgrade"; static NSString *const kUpgradeUrl = @"merchantUser/getUpgrade";
static NSString *const kModifyPswUrl = @"stationUser/modifyPassword"; static NSString *const kModifyPswUrl = @"stationUser/modifyPassword";
static NSString *const kResetPswUrl = @"stationUser/resetPassword"; static NSString *const kResetPswUrl = @"stationUser/resetPassword";
......
Car/tools/HttpCilent.m
View file @ e6bc26cb
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
//版本号 取的是build //版本号 取的是build
NSString *version = APP_VERSION; NSString *version = APP_VERSION;
NSDictionary *myDictionary = @{@"apptype" : @"ipa", NSDictionary *myDictionary = @{@"apptype" : @"merchant_ios",
@"version" : version}; @"version" : version};
__weak typeof(vc) weakVC = vc; __weak typeof(vc) weakVC = vc;
[[[self class] shareCilent] [[[self class] shareCilent]
......
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