Skip to content

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

加油单列表金额数据改为支付金额

parent 91105394
Hide whitespace changes
Inline Side-by-side
Showing with 538 additions and 105 deletions
Car Release.plist 0 → 100644
View file @ 8be817f7
<?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.0</string>
<key>CFBundleVersion</key>
<string>1.0.0</string>
<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 @ 8be817f7
......@@ -8,6 +8,10 @@
/* Begin PBXBuildFile section */
19413CC62AA7F91BAA93A7AC /* libPods-car_base-Car.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5E1689EFB8A98572A90A6D3 /* libPods-car_base-Car.a */; };
8F2095511E15171600FBED74 /* UMengHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2095501E15171600FBED74 /* UMengHelper.m */; };
8F2095521E15171600FBED74 /* UMengHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2095501E15171600FBED74 /* UMengHelper.m */; };
8F2095551E15188500FBED74 /* JPushHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2095541E15188500FBED74 /* JPushHelper.m */; };
8F2095561E15188500FBED74 /* JPushHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2095541E15188500FBED74 /* JPushHelper.m */; };
8F21E8F51E0D052F0066533F /* HttpCilent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F21E8F41E0D052F0066533F /* HttpCilent.m */; };
8F21E8F71E0D052F0066533F /* HttpCilent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F21E8F41E0D052F0066533F /* HttpCilent.m */; };
8F42BFFB1E0D208C00A54D40 /* GlobalInstance.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F42BFFA1E0D208C00A54D40 /* GlobalInstance.m */; };
......@@ -62,6 +66,54 @@
8FFE3D941E139D8C00BEB6A6 /* CardJEModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFE3D921E139D8C00BEB6A6 /* CardJEModel.m */; };
8FFE3D971E139D9F00BEB6A6 /* CardModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFE3D961E139D9F00BEB6A6 /* CardModel.m */; };
8FFE3D9A1E13A8AA00BEB6A6 /* car_objc_json_client.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFE3D981E13A8AA00BEB6A6 /* car_objc_json_client.m */; };
8FFE3DDD1E14AC6700BEB6A6 /* UIView+Category.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8105641E10ECC3009A2AB3 /* UIView+Category.m */; };
8FFE3DDE1E14AC6700BEB6A6 /* ScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BD901E125F0500A879C1 /* ScanViewController.m */; };
8FFE3DDF1E14AC6700BEB6A6 /* CardView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDC51E13847800A879C1 /* CardView.m */; };
8FFE3DE01E14AC6700BEB6A6 /* LBXScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDAD1E12840300A879C1 /* LBXScanViewController.m */; };
8FFE3DE11E14AC6700BEB6A6 /* CardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDC81E13884000A879C1 /* CardViewController.m */; };
8FFE3DE21E14AC6700BEB6A6 /* DateTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F81056D1E110174009A2AB3 /* DateTextField.m */; };
8FFE3DE31E14AC6700BEB6A6 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F42BFFF1E0D255200A54D40 /* BaseViewController.m */; };
8FFE3DE41E14AC6700BEB6A6 /* LBXScanNetAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDA51E12840300A879C1 /* LBXScanNetAnimation.m */; };
8FFE3DE51E14AC6700BEB6A6 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F97C2F41E0CCD8200D8A57D /* LoginViewController.m */; };
8FFE3DE61E14AC6700BEB6A6 /* UITableView+Addtions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F42C0051E0D265E00A54D40 /* UITableView+Addtions.m */; };
8FFE3DE71E14AC6700BEB6A6 /* OrderListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F42C00C1E10BF2900A54D40 /* OrderListModel.m */; };
8FFE3DE81E14AC6700BEB6A6 /* CardModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFE3D961E139D9F00BEB6A6 /* CardModel.m */; };
8FFE3DE91E14AC6700BEB6A6 /* BaseListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F42C0021E0D263200A54D40 /* BaseListViewController.m */; };
8FFE3DEA1E14AC6700BEB6A6 /* LBXScanLineAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDA11E12840300A879C1 /* LBXScanLineAnimation.m */; };
8FFE3DEB1E14AC6700BEB6A6 /* BillHeaderModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FED4FC11E1251F800591647 /* BillHeaderModel.m */; };
8FFE3DEC1E14AC6700BEB6A6 /* HttpCilent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F21E8F41E0D052F0066533F /* HttpCilent.m */; };
8FFE3DED1E14AC6700BEB6A6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F97C2BF1E0CC4BE00D8A57D /* AppDelegate.m */; };
8FFE3DEE1E14AC6700BEB6A6 /* LBXScanWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDB11E12840300A879C1 /* LBXScanWrapper.m */; };
8FFE3DEF1E14AC6700BEB6A6 /* BillListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FED4FBB1E1246BC00591647 /* BillListViewController.m */; };
8FFE3DF01E14AC6700BEB6A6 /* LBXScanResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDA71E12840300A879C1 /* LBXScanResult.m */; };
8FFE3DF11E14AC6700BEB6A6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F97C2BC1E0CC4BE00D8A57D /* main.m */; };
8FFE3DF21E14AC6700BEB6A6 /* WWSideslipViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F97C32A1E0CF15C00D8A57D /* WWSideslipViewController.m */; };
8FFE3DF31E14AC6700BEB6A6 /* LBXZXCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDB31E12840300A879C1 /* LBXZXCapture.m */; };
8FFE3DF41E14AC6700BEB6A6 /* NSDate+FormatterAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F81056F1E1101E4009A2AB3 /* NSDate+FormatterAdditions.m */; };
8FFE3DF51E14AC6700BEB6A6 /* BillListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FED4FBE1E124BFE00591647 /* BillListTableViewCell.m */; };
8FFE3DF61E14AC6700BEB6A6 /* OrderListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F42C0091E10BC5400A54D40 /* OrderListTableViewCell.m */; };
8FFE3DF71E14AC6700BEB6A6 /* GuideViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FED4FB81E1223D900591647 /* GuideViewController.m */; };
8FFE3DF81E14AC6700BEB6A6 /* LBXScanViewStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDAF1E12840300A879C1 /* LBXScanViewStyle.m */; };
8FFE3DF91E14AC6700BEB6A6 /* OrderDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F725CB21E120649006B597D /* OrderDetailViewController.m */; };
8FFE3DFA1E14AC6700BEB6A6 /* GlobalInstance.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F42BFFA1E0D208C00A54D40 /* GlobalInstance.m */; };
8FFE3DFB1E14AC6700BEB6A6 /* OrderListFilterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8105671E10F58A009A2AB3 /* OrderListFilterViewController.m */; };
8FFE3DFC1E14AC6700BEB6A6 /* CalculateHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FED4FC41E1252F200591647 /* CalculateHelper.m */; };
8FFE3DFD1E14AC6700BEB6A6 /* car_objc_json_client.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFE3D981E13A8AA00BEB6A6 /* car_objc_json_client.m */; };
8FFE3DFE1E14AC6700BEB6A6 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F97C31C1E0CEBBB00D8A57D /* MainViewController.m */; };
8FFE3DFF1E14AC6700BEB6A6 /* MBProgressHUD+Addtions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FA789441E0D0A7D005EF4F0 /* MBProgressHUD+Addtions.m */; };
8FFE3E001E14AC6700BEB6A6 /* ZXingWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDB61E12840300A879C1 /* ZXingWrapper.m */; };
8FFE3E011E14AC6700BEB6A6 /* LBXScanVideoZoomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDA91E12840300A879C1 /* LBXScanVideoZoomView.m */; };
8FFE3E021E14AC6700BEB6A6 /* LBXScanNative.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDA31E12840300A879C1 /* LBXScanNative.m */; };
8FFE3E031E14AC6700BEB6A6 /* ModifyPswTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8105731E1117D2009A2AB3 /* ModifyPswTableViewController.m */; };
8FFE3E041E14AC6700BEB6A6 /* LeftTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F97C3131E0CEA7100D8A57D /* LeftTableViewController.m */; };
8FFE3E051E14AC6700BEB6A6 /* LBXScanView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDAB1E12840300A879C1 /* LBXScanView.m */; };
8FFE3E061E14AC6700BEB6A6 /* CardJEModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFE3D921E139D8C00BEB6A6 /* CardJEModel.m */; };
8FFE3E071E14AC6700BEB6A6 /* UIViewController+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F97C3211E0CEC0900D8A57D /* UIViewController+Additions.m */; };
8FFE3E091E14AC6700BEB6A6 /* libPods-car_base-Car.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5E1689EFB8A98572A90A6D3 /* libPods-car_base-Car.a */; };
8FFE3E0B1E14AC6700BEB6A6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8F97C2C91E0CC4BE00D8A57D /* LaunchScreen.storyboard */; };
8FFE3E0C1E14AC6700BEB6A6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8F97C2C71E0CC4BE00D8A57D /* Assets.xcassets */; };
8FFE3E0D1E14AC6700BEB6A6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8F97C2C41E0CC4BE00D8A57D /* Main.storyboard */; };
8FFE3E0E1E14AC6700BEB6A6 /* CodeScan.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8FC2BDC21E1285F700A879C1 /* CodeScan.bundle */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
......@@ -83,6 +135,10 @@
/* Begin PBXFileReference section */
7D3BF0CFAA45AD5EF736E799 /* 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>"; };
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>"; };
8F2095531E15188500FBED74 /* JPushHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPushHelper.h; sourceTree = "<group>"; };
8F2095541E15188500FBED74 /* JPushHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JPushHelper.m; sourceTree = "<group>"; };
8F21E8F31E0D052F0066533F /* HttpCilent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpCilent.h; sourceTree = "<group>"; };
8F21E8F41E0D052F0066533F /* HttpCilent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HttpCilent.m; sourceTree = "<group>"; };
8F21E8F81E0D05BE0066533F /* libAFNetworking.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libAFNetworking.a; path = "../../../Library/Developer/Xcode/DerivedData/Car-gnhmppagnhkbvjftpkgrubxjfeii/Build/Products/Debug-iphonesimulator/AFNetworking/libAFNetworking.a"; sourceTree = "<group>"; };
......@@ -194,6 +250,8 @@
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>"; };
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; };
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>"; };
9FC99CAB196EC63ADD6C56E7 /* 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>"; };
F5E1689EFB8A98572A90A6D3 /* libPods-car_base-Car.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-car_base-Car.a"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
......@@ -221,6 +279,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
8FFE3E081E14AC6700BEB6A6 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
8FFE3E091E14AC6700BEB6A6 /* libPods-car_base-Car.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
......@@ -280,6 +346,7 @@
8F97C2B91E0CC4BE00D8A57D /* Products */,
7DD06E672CBD615874B5F18D /* Pods */,
1C9665B4D157E0C4E18F9BC0 /* Frameworks */,
8FFE3E151E14AC6700BEB6A6 /* Car Release.plist */,
);
sourceTree = "<group>";
};
......@@ -289,6 +356,7 @@
8F97C2B81E0CC4BE00D8A57D /* Car.app */,
8F97C2D11E0CC4BE00D8A57D /* CarTests.xctest */,
8F97C2DC1E0CC4BE00D8A57D /* CarUITests.xctest */,
8FFE3E141E14AC6700BEB6A6 /* Car Release.app */,
);
name = Products;
sourceTree = "<group>";
......@@ -399,6 +467,10 @@
8F42BFF91E0D208C00A54D40 /* GlobalInstance.h */,
8F42BFFA1E0D208C00A54D40 /* GlobalInstance.m */,
8F42BFFC1E0D23BA00A54D40 /* ToolHeader.h */,
8F20954F1E15171600FBED74 /* UMengHelper.h */,
8F2095501E15171600FBED74 /* UMengHelper.m */,
8F2095531E15188500FBED74 /* JPushHelper.h */,
8F2095541E15188500FBED74 /* JPushHelper.m */,
);
name = Tools;
path = tools;
......@@ -612,6 +684,26 @@
productReference = 8F97C2DC1E0CC4BE00D8A57D /* CarUITests.xctest */;
productType = "com.apple.product-type.bundle.ui-testing";
};
8FFE3DDA1E14AC6700BEB6A6 /* Car Release */ = {
isa = PBXNativeTarget;
buildConfigurationList = 8FFE3E111E14AC6700BEB6A6 /* Build configuration list for PBXNativeTarget "Car Release" */;
buildPhases = (
8FFE3DDB1E14AC6700BEB6A6 /* [CP] Check Pods Manifest.lock */,
8FFE3DDC1E14AC6700BEB6A6 /* Sources */,
8FFE3E081E14AC6700BEB6A6 /* Frameworks */,
8FFE3E0A1E14AC6700BEB6A6 /* Resources */,
8FFE3E0F1E14AC6700BEB6A6 /* [CP] Embed Pods Frameworks */,
8FFE3E101E14AC6700BEB6A6 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
dependencies = (
);
name = "Car Release";
productName = Car;
productReference = 8FFE3E141E14AC6700BEB6A6 /* Car Release.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
......@@ -646,6 +738,9 @@
ProvisioningStyle = Automatic;
TestTargetID = 8F97C2B71E0CC4BE00D8A57D;
};
8FFE3DDA1E14AC6700BEB6A6 = {
DevelopmentTeam = W54V2VB863;
};
};
};
buildConfigurationList = 8F97C2B31E0CC4BE00D8A57D /* Build configuration list for PBXProject "Car" */;
......@@ -664,6 +759,7 @@
8F97C2B71E0CC4BE00D8A57D /* Car */,
8F97C2D01E0CC4BE00D8A57D /* CarTests */,
8F97C2DB1E0CC4BE00D8A57D /* CarUITests */,
8FFE3DDA1E14AC6700BEB6A6 /* Car Release */,
);
};
/* End PBXProject section */
......@@ -694,6 +790,17 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
8FFE3E0A1E14AC6700BEB6A6 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8FFE3E0B1E14AC6700BEB6A6 /* LaunchScreen.storyboard in Resources */,
8FFE3E0C1E14AC6700BEB6A6 /* Assets.xcassets in Resources */,
8FFE3E0D1E14AC6700BEB6A6 /* Main.storyboard in Resources */,
8FFE3E0E1E14AC6700BEB6A6 /* CodeScan.bundle in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
......@@ -742,6 +849,51 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-car_base-Car/Pods-car_base-Car-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
8FFE3DDB1E14AC6700BEB6A6 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
8FFE3E0F1E14AC6700BEB6A6 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-car_base-Car/Pods-car_base-Car-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
8FFE3E101E14AC6700BEB6A6 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-car_base-Car/Pods-car_base-Car-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
......@@ -770,6 +922,7 @@
8FED4FBC1E1246BC00591647 /* BillListViewController.m in Sources */,
8FC2BDBA1E12840300A879C1 /* LBXScanResult.m in Sources */,
8F97C2BD1E0CC4BE00D8A57D /* main.m in Sources */,
8F2095551E15188500FBED74 /* JPushHelper.m in Sources */,
8F97C32B1E0CF15C00D8A57D /* WWSideslipViewController.m in Sources */,
8FC2BDC01E12840300A879C1 /* LBXZXCapture.m in Sources */,
8F8105711E1101E4009A2AB3 /* NSDate+FormatterAdditions.m in Sources */,
......@@ -785,6 +938,7 @@
8F97C31D1E0CEBBB00D8A57D /* MainViewController.m in Sources */,
8FA789451E0D0A7D005EF4F0 /* MBProgressHUD+Addtions.m in Sources */,
8FC2BDC11E12840300A879C1 /* ZXingWrapper.m in Sources */,
8F2095511E15171600FBED74 /* UMengHelper.m in Sources */,
8FC2BDBB1E12840300A879C1 /* LBXScanVideoZoomView.m in Sources */,
8FC2BDB81E12840300A879C1 /* LBXScanNative.m in Sources */,
8F8105741E1117D2009A2AB3 /* ModifyPswTableViewController.m in Sources */,
......@@ -816,6 +970,58 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
8FFE3DDC1E14AC6700BEB6A6 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8FFE3DDD1E14AC6700BEB6A6 /* UIView+Category.m in Sources */,
8FFE3DDE1E14AC6700BEB6A6 /* ScanViewController.m in Sources */,
8FFE3DDF1E14AC6700BEB6A6 /* CardView.m in Sources */,
8FFE3DE01E14AC6700BEB6A6 /* LBXScanViewController.m in Sources */,
8FFE3DE11E14AC6700BEB6A6 /* CardViewController.m in Sources */,
8FFE3DE21E14AC6700BEB6A6 /* DateTextField.m in Sources */,
8FFE3DE31E14AC6700BEB6A6 /* BaseViewController.m in Sources */,
8FFE3DE41E14AC6700BEB6A6 /* LBXScanNetAnimation.m in Sources */,
8FFE3DE51E14AC6700BEB6A6 /* LoginViewController.m in Sources */,
8FFE3DE61E14AC6700BEB6A6 /* UITableView+Addtions.m in Sources */,
8FFE3DE71E14AC6700BEB6A6 /* OrderListModel.m in Sources */,
8FFE3DE81E14AC6700BEB6A6 /* CardModel.m in Sources */,
8FFE3DE91E14AC6700BEB6A6 /* BaseListViewController.m in Sources */,
8FFE3DEA1E14AC6700BEB6A6 /* LBXScanLineAnimation.m in Sources */,
8FFE3DEB1E14AC6700BEB6A6 /* BillHeaderModel.m in Sources */,
8FFE3DEC1E14AC6700BEB6A6 /* HttpCilent.m in Sources */,
8FFE3DED1E14AC6700BEB6A6 /* AppDelegate.m in Sources */,
8FFE3DEE1E14AC6700BEB6A6 /* LBXScanWrapper.m in Sources */,
8FFE3DEF1E14AC6700BEB6A6 /* BillListViewController.m in Sources */,
8FFE3DF01E14AC6700BEB6A6 /* LBXScanResult.m in Sources */,
8FFE3DF11E14AC6700BEB6A6 /* main.m in Sources */,
8F2095561E15188500FBED74 /* JPushHelper.m in Sources */,
8FFE3DF21E14AC6700BEB6A6 /* WWSideslipViewController.m in Sources */,
8FFE3DF31E14AC6700BEB6A6 /* LBXZXCapture.m in Sources */,
8FFE3DF41E14AC6700BEB6A6 /* NSDate+FormatterAdditions.m in Sources */,
8FFE3DF51E14AC6700BEB6A6 /* BillListTableViewCell.m in Sources */,
8FFE3DF61E14AC6700BEB6A6 /* OrderListTableViewCell.m in Sources */,
8FFE3DF71E14AC6700BEB6A6 /* GuideViewController.m in Sources */,
8FFE3DF81E14AC6700BEB6A6 /* LBXScanViewStyle.m in Sources */,
8FFE3DF91E14AC6700BEB6A6 /* OrderDetailViewController.m in Sources */,
8FFE3DFA1E14AC6700BEB6A6 /* GlobalInstance.m in Sources */,
8FFE3DFB1E14AC6700BEB6A6 /* OrderListFilterViewController.m in Sources */,
8FFE3DFC1E14AC6700BEB6A6 /* CalculateHelper.m in Sources */,
8FFE3DFD1E14AC6700BEB6A6 /* car_objc_json_client.m in Sources */,
8FFE3DFE1E14AC6700BEB6A6 /* MainViewController.m in Sources */,
8FFE3DFF1E14AC6700BEB6A6 /* MBProgressHUD+Addtions.m in Sources */,
8FFE3E001E14AC6700BEB6A6 /* ZXingWrapper.m in Sources */,
8F2095521E15171600FBED74 /* UMengHelper.m in Sources */,
8FFE3E011E14AC6700BEB6A6 /* LBXScanVideoZoomView.m in Sources */,
8FFE3E021E14AC6700BEB6A6 /* LBXScanNative.m in Sources */,
8FFE3E031E14AC6700BEB6A6 /* ModifyPswTableViewController.m in Sources */,
8FFE3E041E14AC6700BEB6A6 /* LeftTableViewController.m in Sources */,
8FFE3E051E14AC6700BEB6A6 /* LBXScanView.m in Sources */,
8FFE3E061E14AC6700BEB6A6 /* CardJEModel.m in Sources */,
8FFE3E071E14AC6700BEB6A6 /* UIViewController+Additions.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
......@@ -951,6 +1157,11 @@
ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
"COCOAPODS=1",
test,
);
INFOPLIST_FILE = Car/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
......@@ -970,6 +1181,11 @@
ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
"COCOAPODS=1",
test,
);
INFOPLIST_FILE = Car/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
......@@ -1043,6 +1259,52 @@
};
name = Release;
};
8FFE3E121E14AC6700BEB6A6 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9FC99CAB196EC63ADD6C56E7 /* Pods-car_base-Car.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
DEVELOPMENT_TEAM = W54V2VB863;
ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
"COCOAPODS=1",
);
INFOPLIST_FILE = "$(SRCROOT)/Car Release.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.car;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**";
};
name = Debug;
};
8FFE3E131E14AC6700BEB6A6 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7D3BF0CFAA45AD5EF736E799 /* Pods-car_base-Car.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
DEVELOPMENT_TEAM = W54V2VB863;
ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
"COCOAPODS=1",
);
INFOPLIST_FILE = "$(SRCROOT)/Car Release.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.car;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
......@@ -1082,6 +1344,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
8FFE3E111E14AC6700BEB6A6 /* Build configuration list for PBXNativeTarget "Car Release" */ = {
isa = XCConfigurationList;
buildConfigurations = (
8FFE3E121E14AC6700BEB6A6 /* Debug */,
8FFE3E131E14AC6700BEB6A6 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 8F97C2B01E0CC4BE00D8A57D /* Project object */;
......
Car/AppDelegate.m
View file @ 8be817f7
......@@ -8,22 +8,9 @@
#import "AppDelegate.h"
#import "GuideViewController.h"
#import "UMMobClick/MobClick.h"
#import "UMengHelper.h"
#import "JPushHelper.h"
#import "BMKMapManager.h"
#import "JPUSHService.h"
#import "UMMobClick/MobClick.h"
#ifdef NSFoundationVersionNumber_iOS_9_x_Max
#import <UserNotifications/UserNotifications.h> // 这里是iOS10需要用到的框架
#endif
static NSString *const JPUSHAPPKEY = @"5dc63eefddc7955ac9985390"; // 极光appKey
static NSString *const channel = @"蒲公英"; // 固定的
#ifdef DEBUG // 开发
static BOOL const isProduction = FALSE; // 极光FALSE为开发环境
#else // 生产
static BOOL const isProduction = TRUE; // 极光TRUE为生产环境
#endif
@interface AppDelegate ()
{
......@@ -49,85 +36,17 @@ static BOOL const isProduction = TRUE; // 极光TRUE为生产环境
if (!ret) {
NSLog(@"manager start failed!");
}
[self JPUSHConfigWithOptions:launchOptions];
[self UMConfig];
[JPushHelper JPUSHConfigWithOptions:launchOptions];
[UMengHelper UMengStart];
return YES;
}
- (void)UMConfig {
UMConfigInstance.appKey = @"58623721a40fa342b90010f4";
UMConfigInstance.channelId = @"蒲公英";
UMConfigInstance.ePolicy = REALTIME;
[MobClick setLogEnabled:YES];
[MobClick startWithConfigure:UMConfigInstance];
}
- (void)JPUSHConfigWithOptions:(NSDictionary *)launchOptions {
// 注册apns通知
if ([[UIDevice currentDevice].systemVersion floatValue] >= 10.0) // iOS10
{
#ifdef NSFoundationVersionNumber_iOS_9_x_Max
JPUSHRegisterEntity *entity = [[JPUSHRegisterEntity alloc] init];
entity.types = UNAuthorizationOptionAlert | UNAuthorizationOptionBadge |
UNAuthorizationOptionSound;
[JPUSHService registerForRemoteNotificationConfig:entity delegate:self];
#endif
} else if ([[UIDevice currentDevice].systemVersion floatValue] >=
8.0) // iOS8, iOS9
{
//可以添加自定义categories
[JPUSHService
registerForRemoteNotificationTypes:(UIUserNotificationTypeBadge |
UIUserNotificationTypeSound |
UIUserNotificationTypeAlert)
categories:nil];
} else // iOS7
{
// categories 必须为nil
[JPUSHService
registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |UIRemoteNotificationTypeSound |UIRemoteNotificationTypeAlert)
categories:nil];
}
/*
* launchingOption 启动参数.
* appKey 一个JPush 应用必须的,唯一的标识.
* channel 发布渠道. 可选.
* isProduction 是否生产环境. 如果为开发状态,设置为 NO; 如果为生产状态,应改为
* YES.
* advertisingIdentifier 广告标识符（IDFA） 如果不需要使用IDFA，传nil.
* 此接口必须在 App 启动时调用, 否则 JPush SDK 将无法正常工作.
*/
// 如不需要使用IDFA，advertisingIdentifier 可为nil
// 注册极光推送
[JPUSHService setupWithOption:launchOptions
appKey:JPUSHAPPKEY
channel:channel
apsForProduction:isProduction
advertisingIdentifier:nil];
// 2.1.9版本新增获取registration id block接口。
[JPUSHService
registrationIDCompletionHandler:^(int resCode, NSString *registrationID) {
if (resCode == 0) {
// iOS10获取registrationID放到这里了, 可以存到缓存里,
// 用来标识用户单独发送推送
NSLog(@"registrationID获取成功：%@", registrationID);
[[NSUserDefaults standardUserDefaults] setObject:registrationID
forKey:@"registrationID"];
[[NSUserDefaults standardUserDefaults] synchronize];
} else {
NSLog(@"registrationID获取失败，code：%d", resCode);
}
}];
}
- (void)application:(UIApplication *)application
didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
// Required - 注册 DeviceToken
[JPUSHService registerDeviceToken:deviceToken];
[JPushHelper registerDeviceToken:deviceToken];
}
- (void)applicationWillResignActive:(UIApplication *)application {
......
Car/Base.lproj/Main.storyboard
View file @ 8be817f7
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="mts-cR-GxO">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="mts-cR-GxO">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
......@@ -1101,7 +1101,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="30"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WXk-60-mnv" id="Hdv-Fv-6SO">
<rect key="frame" x="0.0" y="0.0" width="375" height="29"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="29.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" tag="1111" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3kb-L7-Q1S">
......@@ -1131,7 +1131,7 @@
<rect key="frame" x="0.0" y="58" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="agP-LF-ma6" id="X7Q-g8-dvJ">
<rect key="frame" x="0.0" y="0.0" width="375" height="59"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工分结算" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R4g-d8-qvx">
......@@ -1190,7 +1190,7 @@
<!--Order Detail View Controller-->
<scene sceneID="5X2-zN-Isn">
<objects>
<viewController storyboardIdentifier="OrderDetailViewController" id="z0s-bh-tj6" customClass="OrderDetailViewController" sceneMemberID="viewController">
<viewController storyboardIdentifier="OrderDetailViewController" automaticallyAdjustsScrollViewInsets="NO" id="z0s-bh-tj6" customClass="OrderDetailViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="eEq-x0-goT"/>
<viewControllerLayoutGuide type="bottom" id="7fe-xg-1cN"/>
......@@ -1203,7 +1203,7 @@
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<view key="tableHeaderView" contentMode="scaleToFill" id="mTF-pL-rui">
<rect key="frame" x="0.0" y="0.0" width="375" height="593"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="631"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hfm-jc-u2I" userLabel="top">
......@@ -1683,7 +1683,7 @@
<constraint firstAttribute="height" constant="1" id="l8W-P5-OBF"/>
</constraints>
</view>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入工号" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="5Ry-9R-HMn">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入用户名" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="5Ry-9R-HMn">
<rect key="frame" x="60" y="1" width="315" height="58.5"/>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
......
Car/CodeClass/LeftView/ViewControllers/BillListViewController.m
View file @ 8be817f7
......@@ -87,6 +87,11 @@
return cell;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
[super tableView:tableView didSelectRowAtIndexPath:indexPath];
kDebugIndex(indexPath);
}
- (void)listDidSelect:(id)model {
}
......
Car/CodeClass/Main/Cells/OrderListTableViewCell.m
View file @ 8be817f7
......@@ -21,7 +21,7 @@
self.labelStation.text = [NSString stringWithFormat:@"%@ - %@",model.stationName, model.stationUserName];
self.labelOil.text = [NSString stringWithFormat:@"%@ - %@",model.gasItemName, model.oilGunName];
self.labelBillNumber.text = model.billNumber;
self.labelPrice.text = [CalculateHelper getMoneyStringFrom:model.deduct];
self.labelPrice.text = [CalculateHelper getMoneyStringFrom:model.realPayTotal];
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
......
Car/CodeClass/Main/Models/OrderListModel.m
View file @ 8be817f7
......@@ -64,4 +64,5 @@
}
return _printStateString;
}
@end
Car/CodeClass/Main/ViewControllers/MainViewController.m
View file @ 8be817f7
......@@ -73,11 +73,7 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
[super tableView:tableView didSelectRowAtIndexPath:indexPath];
#ifdef DEBUG
[MBProgressHUD j_textOnly:[NSString stringWithFormat:@"%lu",indexPath.row + 1]];
#else
#endif
kDebugIndex(indexPath);
}
- (void)listDidSelect:(id)model {
......
Car/CodeClass/Main/ViewControllers/OrderDetailViewController.m
View file @ 8be817f7
......@@ -73,6 +73,7 @@
self.labelPrice.text = kStrPrefix([CalculateHelper getMoneyStringFrom:self.model.total], @"￥");
self.labelVoucher.text = kStrPrefix([CalculateHelper getMoneyStringFrom:self.model.deduct], @"￥");
self.labelRealPrice.text = kStrPrefix([CalculateHelper getMoneyStringFrom:self.model.realPayTotal], @"￥");
self.labelDeduct.text = kStrPrefix([CalculateHelper getMoneyStringFrom:self.model.deduct], @"￥");
self.labelIsInvoice.text = kStrPrefix(self.model.invoiceString, @"是否开票：");
self.labelIsPrint.text = kStrPrefix(self.model.printStateString, @"是否打印：");
self.labelLatestPrintTime.text = kStrPrefix(self.model.lstPrintedTime, @"最后一次打印时间：");
......
Car/Info.plist
View file @ 8be817f7
......@@ -69,8 +69,6 @@
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>
Car/PrefixHeader.pch
View file @ 8be817f7
......@@ -45,7 +45,17 @@
#define kNoNullStr(string) (string != nil && [string lenth] > 0 ? string : @"")
//拼接string和prefix，拼接后的格式为prefixstring
#define kStrPrefix(string,prefix) [NSString stringWithFormat:@"%@%@",prefix,string]
#define kStrPrefix(string,prefix) [NSString stringWithFormat:@"%@%@",prefix,[string length] > 0 ? string : @"暂无"]
#ifdef DEBUG
#define kDebugIndex(indexPath) [MBProgressHUD j_textOnly:[NSString stringWithFormat:@"%lu",indexPath.row + 1]];
#else
#define kDebugIndex(indexPath)
#endif
#define kWindow [UIApplication sharedApplication].keyWindow
#define kBounds [UIScreen mainScreen].bounds
......
Car/URL.h
View file @ 8be817f7
......@@ -9,8 +9,17 @@
#ifndef URL_h
#define URL_h
#ifdef test
static NSString *const VersionName = @"车族通测试版";
static NSString *const BASE_IP = @"http://test.gomoretech.com";
#else
static NSString *const VersionName = @"车族通正式版";
static NSString *const BASE_IP = @"http://whcar.gomoretech.com";
#endif
/** 请求基准地址 */
#define REST_BASE_URL [NSString stringWithFormat:@"%@/car-web/app", BASE_IP]
......
Car/tools/Catogorys/UITableView+Addtions.m
View file @ 8be817f7
......@@ -11,10 +11,10 @@
@implementation UITableView (Addtions)
- (void)j_endRefresh {
if ([self.mj_header isRefreshing]) {
// if ([self.mj_header isRefreshing]) {
[self.mj_header endRefreshing];
}else if ([self.mj_footer isRefreshing]) {
// }else if ([self.mj_footer isRefreshing]) {
[self.mj_footer endRefreshing];
}
// }
}
@end
Car/tools/JPushHelper.h 0 → 100644
View file @ 8be817f7
//
// JPushHelper.h
// Car
//
// Created by Javen on 2016/12/29.
// Copyright © 2016年 上海勾芒信息科技. All rights reserved.
//
#import <Foundation/Foundation.h>
#ifdef NSFoundationVersionNumber_iOS_9_x_Max
#import <UserNotifications/UserNotifications.h> // 这里是iOS10需要用到的框架
#endif
@interface JPushHelper : NSObject
+ (void)JPUSHConfigWithOptions:(NSDictionary *)launchOptions;
/**
注册token
@param deviceToken deviceToken description
*/
+ (void)registerDeviceToken:(NSData *)deviceToken;
@end
Car/tools/JPushHelper.m 0 → 100644
View file @ 8be817f7
//
// JPushHelper.m
// Car
//
// Created by Javen on 2016/12/29.
// Copyright © 2016年 上海勾芒信息科技. All rights reserved.
//
#import "JPushHelper.h"
#import "JPUSHService.h"
static NSString *const JPUSHAPPKEY = @"5dc63eefddc7955ac9985390"; // 极光appKey
static NSString *const channel = @"蒲公英"; // 固定的
#ifdef DEBUG // 开发
static BOOL const isProduction = FALSE; // 极光FALSE为开发环境
#else // 生产
static BOOL const isProduction = TRUE; // 极光TRUE为生产环境
#endif
@implementation JPushHelper
+ (void)JPUSHConfigWithOptions:(NSDictionary *)launchOptions {
// 注册apns通知
if ([[UIDevice currentDevice].systemVersion floatValue] >= 10.0) // iOS10
{
#ifdef NSFoundationVersionNumber_iOS_9_x_Max
JPUSHRegisterEntity *entity = [[JPUSHRegisterEntity alloc] init];
entity.types = UNAuthorizationOptionAlert | UNAuthorizationOptionBadge |
UNAuthorizationOptionSound;
[JPUSHService registerForRemoteNotificationConfig:entity delegate:self];
#endif
} else if ([[UIDevice currentDevice].systemVersion floatValue] >=
8.0) // iOS8, iOS9
{
//可以添加自定义categories
[JPUSHService
registerForRemoteNotificationTypes:(UIUserNotificationTypeBadge |
UIUserNotificationTypeSound |
UIUserNotificationTypeAlert)
categories:nil];
} else // iOS7
{
// categories 必须为nil
[JPUSHService
registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
UIRemoteNotificationTypeSound |
UIRemoteNotificationTypeAlert)
categories:nil];
}
/*
* launchingOption 启动参数.
* appKey 一个JPush 应用必须的,唯一的标识.
* channel 发布渠道. 可选.
* isProduction 是否生产环境. 如果为开发状态,设置为 NO; 如果为生产状态,应改为
* YES.
* advertisingIdentifier 广告标识符（IDFA） 如果不需要使用IDFA，传nil.
* 此接口必须在 App 启动时调用, 否则 JPush SDK 将无法正常工作.
*/
// 如不需要使用IDFA，advertisingIdentifier 可为nil
// 注册极光推送
[JPUSHService setupWithOption:launchOptions
appKey:JPUSHAPPKEY
channel:channel
apsForProduction:isProduction
advertisingIdentifier:nil];
// 2.1.9版本新增获取registration id block接口。
[JPUSHService
registrationIDCompletionHandler:^(int resCode, NSString *registrationID) {
if (resCode == 0) {
// iOS10获取registrationID放到这里了, 可以存到缓存里,
// 用来标识用户单独发送推送
NSLog(@"registrationID获取成功：%@", registrationID);
[[NSUserDefaults standardUserDefaults] setObject:registrationID
forKey:@"registrationID"];
[[NSUserDefaults standardUserDefaults] synchronize];
} else {
NSLog(@"registrationID获取失败，code：%d", resCode);
}
}];
}
+ (void)registerDeviceToken:(NSData *)deviceToken {
[JPUSHService registerDeviceToken:deviceToken];
}
@end
Car/tools/UMengHelper.h 0 → 100644
View file @ 8be817f7
//
// UMengHelper.h
// Car
//
// Created by Javen on 2016/12/29.
// Copyright © 2016年 上海勾芒信息科技. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface UMengHelper : NSObject
+ (void)UMengStart;
@end
Car/tools/UMengHelper.m 0 → 100644
View file @ 8be817f7
//
// UMengHelper.m
// Car
//
// Created by Javen on 2016/12/29.
// Copyright © 2016年 上海勾芒信息科技. All rights reserved.
//
#import "UMengHelper.h"
#import "UMMobClick/MobClick.h"
@implementation UMengHelper
+ (void)UMengStart {
UMConfigInstance.appKey = @"58623721a40fa342b90010f4";
UMConfigInstance.channelId = @"蒲公英";
UMConfigInstance.ePolicy = REALTIME;
[MobClick setLogEnabled:YES];
[MobClick startWithConfigure:UMConfigInstance];
}
@end
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