Apex & drivers 1.10

增加离线缓存
优化定位
修改部分文字提示

Redant Drivers/Apex And Drivers/AppDelegate.m

@@ -71,24 +71,26 @@
     }
     self.locationManager = [[CLLocationManager alloc] init];
     self.locationManager.delegate = self;
-    self.locationManager.allowsBackgroundLocationUpdates = YES;
+    self.locationManager.allowsBackgroundLocationUpdates = NO;
     self.locationManager.pausesLocationUpdatesAutomatically = NO; // 是否允许系统自动暂停定位
     self.locationManager.desiredAccuracy = kCLLocationAccuracyNearestTenMeters;//设置定位精度
     
     self.locationManager.distanceFilter = 10; //不需要移动都可以刷新，不然不移动就不会执行定位，不定位的话，那么后台进程也就挂起了
     [self.locationManager requestAlwaysAuthorization];
 }
-- (void)startLocation {
-    [self initLocationManager];
+- (void)startBackgroundLocation {
+    
 
     [self.locationManager startUpdatingLocation];
+    self.locationManager.allowsBackgroundLocationUpdates=true;
 }
 
-- (void)stopLocation {
+- (void)stopBackgroundLocation {
     if (self.locationManager == nil) {
         return;
     }
-    [self.locationManager stopUpdatingLocation];
+//    [self.locationManager stopUpdatingLocation];
+    self.locationManager.allowsBackgroundLocationUpdates=false;
 //    self.locationManager = nil;
 }
 
@@ -104,12 +106,12 @@
     [self showLoginVC];
 }
 
-- (void)receiveStartLocationNotification:(NSNotification *)notification {
-    [self startLocation];
+- (void)receiveStartBackgroundLocationNotification:(NSNotification *)notification {
+    [self startBackgroundLocation];
 }
 
-- (void)receiveStopLocationNotification:(NSNotification *)notification {
-    [self stopLocation];
+- (void)receiveStopBackgroundLocationNotification:(NSNotification *)notification {
+    [self stopBackgroundLocation];
 }
 
 - (void)receiveUploadFinishNotification:(NSNotification *)notification {
@@ -130,8 +132,8 @@
 - (void)registActionNotification {
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLogoutNotification:) name:RANotificationLogout object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveStartLocationNotification:) name:RANotificationStartLocation object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveStopLocationNotification:) name:RANotificationStopLocation object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveStartBackgroundLocationNotification:) name:RANotificationStartBackgroundLocation object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveStopBackgroundLocationNotification:) name:RANotificationStopBackgroundLocation object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveUploadFinishNotification:) name:UPLOAD_FINISH_NOTIFICATION object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveUploadFinishNotification:) name:UPLOAD_COUNT_CHANGE_NOTIFICATION object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveRequestUploadCountNotification:) name:RANotificationRequestUploadCount object:nil];
@@ -140,6 +142,8 @@
 #pragma mark - AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+    
+    [self initLocationManager];
     // Override point for customization after application launch.
     
 //    NSString *orderID = nil;
@@ -480,8 +484,19 @@
 //        [self performSelector:@selector(stopLocation) withObject:nil afterDelay:10]; // 获取到位置10s后关闭位置服务
 //        [self performSelector:@selector(startLocation) withObject:nil afterDelay:120]; // 获取到位置120s后重新打开位置服务
         //后台延迟定位3km，5分钟。
-        CLLocationDistance distance = 3000;
-        NSTimeInterval time = 60*5;
+        CLLocationDistance distance = 500;
+        NSTimeInterval time = 60;
+        
+        if([UIApplication sharedApplication].applicationState == UIApplicationStateActive)
+        {
+            // more aggressive when app is active
+            distance = 20;
+            time = 20;
+        }
+//        if(!manager.allowsBackgroundLocationUpdates)
+//        {
+//
+//        }
         [manager allowDeferredLocationUpdatesUntilTraveled:distance timeout:time];
     }
 }
@@ -494,6 +509,9 @@
     
     if (status == kCLAuthorizationStatusDenied) {
         [RASingleton sharedInstance].currentLocation = nil;
+    }else
+    {
+        [self.locationManager startUpdatingLocation];
     }
 }
 

Redant Drivers/Apex And Drivers/Base.lproj/Localizable.strings

@@ -53,6 +53,7 @@
  */
 "Update" = "Update";
 "Warning" = "Warning";
+"cache content"="Connection lost\n\n You are browsing cache content. ";
 "please complete missing field:\n%@" = "please complete missing field:\n%@";
 "update_upload_failed_tips" = "upload the photos failed,would you like to retry or do it background?";
 "Background" = "Background";

Redant Drivers/Apex And Drivers/Detail/Base.lproj/Detail.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -69,7 +69,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="j9q-8m-bG1">
-                                                    <rect key="frame" x="5" y="5" width="590" height="79.5"/>
+                                                    <rect key="frame" x="5" y="5" width="365" height="79.5"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <string key="text">DEMURRAGE LFD
 TERMINAL PICKUP APPT
@@ -155,7 +155,7 @@ OAKLAND,CA</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="iKo-LB-QEE">
-                                                    <rect key="frame" x="0.0" y="0.0" width="600" height="99.5"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="99.5"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="p8G-wr-zEn">
                                                         <size key="itemSize" width="224" height="50"/>
@@ -165,7 +165,7 @@ OAKLAND,CA</string>
                                                     </collectionViewFlowLayout>
                                                     <cells>
                                                         <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="RADetailActionSubCell" id="NRo-Hn-zDX" customClass="RADetailActionSubCell">
-                                                            <rect key="frame" x="0.0" y="0.0" width="224" height="50"/>
+                                                            <rect key="frame" x="75.5" y="0.0" width="224" height="50"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
                                                                 <rect key="frame" x="0.0" y="0.0" width="224" height="50"/>
@@ -349,18 +349,28 @@ OAKLAND,CA</string>
                                     <outlet property="delegate" destination="wYu-98-b8c" id="enZ-Z1-wuK"/>
                                 </connections>
                             </tableView>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Connection lost, you are" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="POL-jZ-kcz">
+                                <rect key="frame" x="95" y="323.5" width="185.5" height="20.5"/>
+                                <color key="backgroundColor" red="0.83914172649999996" green="0.83926308159999996" blue="0.83911520240000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="Xxs-Bp-xwk" firstAttribute="trailing" secondItem="hEy-k0-tf5" secondAttribute="trailing" id="12Y-9k-qJd"/>
                             <constraint firstItem="Xxs-Bp-xwk" firstAttribute="leading" secondItem="hEy-k0-tf5" secondAttribute="leading" id="2HP-SI-29U"/>
                             <constraint firstItem="Xxs-Bp-xwk" firstAttribute="bottom" secondItem="hEy-k0-tf5" secondAttribute="bottom" id="94I-Aq-Rvf"/>
+                            <constraint firstItem="POL-jZ-kcz" firstAttribute="centerX" secondItem="ddK-ne-BxC" secondAttribute="centerX" id="M9k-Ft-D6K"/>
                             <constraint firstItem="Xxs-Bp-xwk" firstAttribute="top" secondItem="hEy-k0-tf5" secondAttribute="top" id="o3j-YT-2Th"/>
+                            <constraint firstItem="POL-jZ-kcz" firstAttribute="centerY" secondItem="ddK-ne-BxC" secondAttribute="centerY" id="uoB-dy-p31"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="hEy-k0-tf5"/>
                     </view>
                     <connections>
                         <outlet property="detailTableView" destination="Xxs-Bp-xwk" id="YEe-3u-DEQ"/>
+                        <outlet property="label_cache" destination="POL-jZ-kcz" id="lkz-iC-oRk"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="WUS-ba-oxC" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -387,7 +397,7 @@ OAKLAND,CA</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DSZ-Hp-4ld">
-                                                    <rect key="frame" x="5" y="0.0" width="595" height="43.5"/>
+                                                    <rect key="frame" x="5" y="0.0" width="370" height="43.5"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>

Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController+TableViewDataSource.m

@@ -326,9 +326,9 @@
                 int result = [[json objectForKey:@"result"] intValue];
                 if (result == RESULT_TRUE) {
                     
-                    if (model.actionSubType == RADetailActionSubTypeAccept) {
-                        RASingleton.sharedInstance.requiredLocation = YES;
-                    }
+//                    if (model.actionSubType == RADetailActionSubTypeAccept) {
+//                        RASingleton.sharedInstance.requiredBackgroundLocation = YES;
+//                    }
                     
                     [[NSNotificationCenter defaultCenter] postNotificationName:RANotificationReloadHome object:nil];
                     

Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController.h

@@ -15,6 +15,7 @@
 @property (nonatomic,assign) NSInteger orderType;
 @property (nonatomic,copy) NSString *orderType2;
 @property (nonatomic,copy) NSString *status_no;
+@property (weak, nonatomic) IBOutlet UILabel *label_cache;
 
 @property (nonatomic,strong,readonly) UITableView *tableView;
 

Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController.m

@@ -163,6 +163,12 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    self.label_cache.text = NSLocalizedString(@"cache content", nil);
+    [self.label_cache sizeToFit];
+    self.label_cache.layer.borderColor=ApexDriverGrayColor.CGColor;
+    self.label_cache.layer.borderWidth = 1.0f;
+    self.label_cache.layer.cornerRadius = 5.0f;
+    self.label_cache.layer.masksToBounds = YES;
     // Do any additional setup after loading the view.
     
     [self configureTable];
@@ -204,12 +210,15 @@
 #pragma mark - Action
 
 - (void)refreshControlValueChanged:(UIRefreshControl *)refresh {
+        self.label_cache.hidden=true;
     [self loadData];
 }
 
 #pragma mark - Data
 
 - (void)reloadData {
+    self.label_cache.hidden=true;
+
     [self loadData];
 }
 
@@ -259,7 +268,10 @@
                         [sectionModel setValuesForKeysWithDictionary:section];
                         [strongSelf.sectionArray addObject:sectionModel];
                     }
-                    
+                    if([json[@"iscache"] boolValue]==true)
+                    {
+                        self.label_cache.hidden=false;
+                    }
                     [strongSelf.detailTableView reloadData];
                     
                 } else {

Redant Drivers/Apex And Drivers/Home/Base.lproj/Home.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -188,18 +188,28 @@
                                     <outlet property="delegate" destination="aAb-fo-i8m" id="Lg7-WA-9Vr"/>
                                 </connections>
                             </tableView>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Connection lost, you are" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LnN-a9-3XM">
+                                <rect key="frame" x="95" y="323.5" width="185.5" height="20.5"/>
+                                <color key="backgroundColor" red="0.83914172649999996" green="0.83926308159999996" blue="0.83911520240000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="i9k-YO-Ep6" firstAttribute="trailing" secondItem="9Pg-qg-cNJ" secondAttribute="trailing" id="3br-zt-lSd"/>
+                            <constraint firstItem="LnN-a9-3XM" firstAttribute="centerX" secondItem="kdm-uP-X9c" secondAttribute="centerX" id="Olr-44-8KZ"/>
                             <constraint firstItem="9Pg-qg-cNJ" firstAttribute="leading" secondItem="i9k-YO-Ep6" secondAttribute="leading" id="giK-6f-NDD"/>
                             <constraint firstItem="9Pg-qg-cNJ" firstAttribute="top" secondItem="i9k-YO-Ep6" secondAttribute="top" id="iGq-XW-TKk"/>
                             <constraint firstItem="i9k-YO-Ep6" firstAttribute="bottom" secondItem="9Pg-qg-cNJ" secondAttribute="bottom" id="s9L-VQ-dMO"/>
+                            <constraint firstItem="LnN-a9-3XM" firstAttribute="centerY" secondItem="kdm-uP-X9c" secondAttribute="centerY" id="vfC-oV-We2"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="i9k-YO-Ep6"/>
                     </view>
                     <connections>
                         <outlet property="homeOrderTableView" destination="9Pg-qg-cNJ" id="AEw-eS-qW2"/>
+                        <outlet property="label_cache" destination="LnN-a9-3XM" id="gPL-WS-o73"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="gdf-PJ-wGP" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -385,10 +395,19 @@
                                     <outlet property="delegate" destination="rq3-P6-oJU" id="cEC-oI-XCk"/>
                                 </connections>
                             </tableView>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Connection lost, you are" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hqL-y3-3Y1">
+                                <rect key="frame" x="95" y="323.5" width="185.5" height="20.5"/>
+                                <color key="backgroundColor" red="0.83914172649999996" green="0.83926308159999996" blue="0.83911520240000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
+                            <constraint firstItem="hqL-y3-3Y1" firstAttribute="centerY" secondItem="cU7-dM-brp" secondAttribute="centerY" id="8qO-FJ-myt"/>
                             <constraint firstItem="4rG-TS-sz5" firstAttribute="bottom" secondItem="X0i-v6-QMb" secondAttribute="bottom" id="Gh4-eD-Q0L"/>
+                            <constraint firstItem="hqL-y3-3Y1" firstAttribute="centerX" secondItem="cU7-dM-brp" secondAttribute="centerX" id="Mln-bi-SPT"/>
                             <constraint firstItem="4rG-TS-sz5" firstAttribute="trailing" secondItem="X0i-v6-QMb" secondAttribute="trailing" id="PkI-y6-aZU"/>
                             <constraint firstItem="X0i-v6-QMb" firstAttribute="leading" secondItem="4rG-TS-sz5" secondAttribute="leading" id="fia-lF-MgV"/>
                             <constraint firstItem="X0i-v6-QMb" firstAttribute="top" secondItem="4rG-TS-sz5" secondAttribute="top" id="qIv-3m-mUy"/>
@@ -397,6 +416,7 @@
                     </view>
                     <connections>
                         <outlet property="homeMoreTableView" destination="X0i-v6-QMb" id="MIm-Wf-bsJ"/>
+                        <outlet property="label_cache" destination="hqL-y3-3Y1" id="GhN-Vi-YGm"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="a36-Fz-dNB" userLabel="First Responder" sceneMemberID="firstResponder"/>

Redant Drivers/Apex And Drivers/Home/More/RAHomeMoreViewController.h

@@ -11,6 +11,7 @@
 
 @interface RAHomeMoreViewController : RABaseViewController
 
+@property (weak, nonatomic) IBOutlet UILabel *label_cache;
 @property (nonatomic,assign) RAOrderStatus type;
 @property (nonatomic,assign,readonly) NSUInteger orderCount;
 

Redant Drivers/Apex And Drivers/Home/More/RAHomeMoreViewController.m

@@ -47,7 +47,12 @@ typedef enum {
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    
+    self.label_cache.text = NSLocalizedString(@"cache content", nil);
+    [self.label_cache sizeToFit];
+    self.label_cache.layer.borderColor=ApexDriverGrayColor.CGColor;
+    self.label_cache.layer.borderWidth = 1.0f;
+    self.label_cache.layer.cornerRadius = 5.0f;
+    self.label_cache.layer.masksToBounds = YES;
     [self configureNavigationBar];
     [self configureTableView];
     [self registNotification];
@@ -249,6 +254,12 @@ typedef enum {
                         [strongSelf.orderArray addObject:orderModel];
                     }
                     
+                    if([json[@"iscache"] boolValue]==true)
+                    {
+                        self.label_cache.hidden=false;
+                        [self.refreshFooter noMoreData];
+                    }
+                    
                     [strongSelf.homeMoreTableView reloadData];
                     
                 } else {
@@ -277,10 +288,14 @@ typedef enum {
 }
 
 - (void)loadData {
+//      self.label_cache.hidden=true;
+//    [self.refreshFooter enableLoadMore];
     [self loadData:LoadDataActionTypeInitial];
 }
 
 - (void)reloadData {
+    self.label_cache.hidden=true;
+    [self.refreshFooter enableLoadMore];
     [self loadData:LoadDataActionTypeReLoad];
 }
 

Redant Drivers/Apex And Drivers/Home/RAHomeViewController.h

@@ -44,6 +44,7 @@
 @property (nonatomic,copy) NSString *currentOrderID;
 
 @property (nonatomic,assign) BOOL reloadFlag;///<视图显示时Reload
+@property (weak, nonatomic) IBOutlet UILabel *label_cache;
 
 @property (nonatomic,strong, readonly) RAHomeHeaderView *headerView;
 

Redant Drivers/Apex And Drivers/Home/RAHomeViewController.m

@@ -110,6 +110,12 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    self.label_cache.text = NSLocalizedString(@"cache content", nil);
+    [self.label_cache sizeToFit];
+    self.label_cache.layer.borderColor=ApexDriverGrayColor.CGColor;
+    self.label_cache.layer.borderWidth = 1.0f;
+    self.label_cache.layer.cornerRadius = 5.0f;
+    self.label_cache.layer.masksToBounds = YES;
     
     [self checkPermission];
     
@@ -395,7 +401,7 @@
 #pragma mark - Data
 
 - (void)loadData {
-    
+    self.label_cache.hidden=true;
     if (self.loading) {
         return;
     }
@@ -439,7 +445,7 @@
                 if (result == RESULT_TRUE) {
                     
                     BOOL requiredLocation = [[json objectForKey:@"requiredLocation"] boolValue];
-                    [RASingleton sharedInstance].requiredLocation = requiredLocation;
+                    [RASingleton sharedInstance].requiredBackgroundLocation = requiredLocation;
                     
                     NSArray *sectionArray = [json objectForKey:@"sections"];
                     
@@ -468,7 +474,11 @@
                     } else {
                         
                     }
-
+                    
+                    if([json[@"iscache"] boolValue]==true)
+                    {
+                        self.label_cache.hidden=false;
+                    }
                     
                 } else {
                     

Redant Drivers/Apex And Drivers/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.04</string>
+	<string>1.10</string>
 	<key>CFBundleVersion</key>
 	<string>38638</string>
 	<key>LSApplicationQueriesSchemes</key>

Redant Drivers/Apex And Drivers/RADataProvider.m

@@ -196,7 +196,36 @@
     
     NSData* json=[self get_json:URL_HOME parameters:params  file:nil];
     
-    return [self handleJsonData:json];
+   
+    
+    NSMutableDictionary* ret= [RAConvertor data2dict:json].mutableCopy;
+    
+    
+    NSString* path = [[RAUtils appCacheDirectory] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_orderList.json",RASingleton.sharedInstance.user]];
+    if(ret!=nil&&[ret[@"result"] intValue]!=RESULT_NET_ERROR&&[ret[@"result"] intValue]!=RESULT_NET_NOTAVAILABLE)
+    {
+        
+        [ret writeToFile:path atomically:YES];
+        return ret;
+    }
+    else
+    {
+        NSFileManager* fm = [NSFileManager defaultManager];
+        BOOL isDir = NO;
+        if ([fm fileExistsAtPath:path isDirectory:&isDir])
+        {
+                ret=[NSDictionary dictionaryWithContentsOfFile:path].mutableCopy;
+            ret[@"iscache"]=@(true);
+            return ret;
+        }
+        else
+        {
+            return [self handleJsonData:json];
+        }
+        
+        
+    }
+    
 }
 
 + (NSDictionary *)requestMoreOrder:(NSInteger)orderType offset:(NSInteger)offset limit:(NSInteger)limit filter:(NSDictionary *)filter {
@@ -211,6 +240,34 @@
     
     NSData* json=[self get_json:URL_MORE_ORDER parameters:params  file:nil];
     
+    NSMutableDictionary* ret= [RAConvertor data2dict:json].mutableCopy;
+    
+    
+    NSString* path = [[RAUtils appCacheDirectory] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_moreorder%@.json",RASingleton.sharedInstance.user,@(orderType)]];
+    if(offset==0&&ret!=nil&&[ret[@"result"] intValue]!=RESULT_NET_ERROR&&[ret[@"result"] intValue]!=RESULT_NET_NOTAVAILABLE)
+    {
+        
+        [ret writeToFile:path atomically:YES];
+        return ret;
+    }
+    else
+    {
+        NSFileManager* fm = [NSFileManager defaultManager];
+        BOOL isDir = NO;
+        if ([fm fileExistsAtPath:path isDirectory:&isDir]&&offset==0)
+        {
+            ret=[NSDictionary dictionaryWithContentsOfFile:path].mutableCopy;
+            ret[@"iscache"]=@(true);
+            return ret;
+        }
+        else
+        {
+            return [self handleJsonData:json];
+        }
+        
+        
+    }
+    
     return [self handleJsonData:json];
 }
 
@@ -237,7 +294,34 @@
     
     NSData* json=[self get_json:URL_DETAIL parameters:params  file:nil];
     
-    NSDictionary *detail = [self handleJsonData:json];
+    NSMutableDictionary* ret= [RAConvertor data2dict:json].mutableCopy;
+    
+    
+ 
+    NSString* path = [[RAUtils appCacheDirectory] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_detail_%@.json",RASingleton.sharedInstance.user,orderID]];
+    if(ret!=nil&&[ret[@"result"] intValue]!=RESULT_NET_ERROR&&[ret[@"result"] intValue]!=RESULT_NET_NOTAVAILABLE)
+    {
+        
+        [ret writeToFile:path atomically:YES];
+        return ret;
+    }
+    else
+    {
+        NSFileManager* fm = [NSFileManager defaultManager];
+        BOOL isDir = NO;
+        if ([fm fileExistsAtPath:path isDirectory:&isDir])
+        {
+            ret=[NSDictionary dictionaryWithContentsOfFile:path].mutableCopy;
+            ret[@"iscache"]=@(true);
+            return ret;
+        }
+        else
+        {
+            return [self handleJsonData:json];
+        }
+        
+        
+    }
     
 #ifdef OFFLINE_MODE
     
@@ -246,7 +330,7 @@
     
 #endif
     
-    return detail;
+//    return detail;
 }
 
 + (NSDictionary *)requestUpdateOrder:(NSString *)orderID driverAction:(NSInteger)action index:(NSInteger)idx {
@@ -268,7 +352,34 @@
     
     NSData* json=[self get_json:URL_UPDATE parameters:params  file:nil];
     
-    return [self handleJsonData:json];
+    NSMutableDictionary* ret= [RAConvertor data2dict:json].mutableCopy;
+    
+    
+    
+    NSString* path = [[RAUtils appCacheDirectory] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_%@_%@.json",RASingleton.sharedInstance.user,@(action),orderID]];
+    if(ret!=nil&&[ret[@"result"] intValue]!=RESULT_NET_ERROR&&[ret[@"result"] intValue]!=RESULT_NET_NOTAVAILABLE)
+    {
+        
+        [ret writeToFile:path atomically:YES];
+        return ret;
+    }
+    else
+    {
+        NSFileManager* fm = [NSFileManager defaultManager];
+        BOOL isDir = NO;
+        if ([fm fileExistsAtPath:path isDirectory:&isDir])
+        {
+            ret=[NSDictionary dictionaryWithContentsOfFile:path].mutableCopy;
+            ret[@"iscache"]=@(true);
+            return ret;
+        }
+        else
+        {
+            return [self handleJsonData:json];
+        }
+        
+        
+    }
 }
 
 + (NSDictionary *)reportOrder:(NSString *)orderId type:(NSInteger)type actionType:(NSInteger)action actionIndex:(NSInteger)actionIndex actionName:(NSString *)actionName toURL:(NSString *)url withParams:(NSMutableDictionary *)params {

Redant Drivers/Apex And Drivers/RANotificationNameCenter.h

@@ -12,8 +12,8 @@
 FOUNDATION_EXTERN NSString * const RANotificationHandleOrder;
 FOUNDATION_EXTERN NSString * const RANotificationReloadHome;
 FOUNDATION_EXTERN NSString * const RANotificationLogout;
-FOUNDATION_EXTERN NSString * const RANotificationStopLocation;
-FOUNDATION_EXTERN NSString * const RANotificationStartLocation;
+FOUNDATION_EXTERN NSString * const RANotificationStopBackgroundLocation;
+FOUNDATION_EXTERN NSString * const RANotificationStartBackgroundLocation;
 FOUNDATION_EXTERN NSString * const RANotificationCheckDetail;
 FOUNDATION_EXTERN NSString * const RANotificationChangeUpload;
 FOUNDATION_EXTERN NSString * const RANotificationRequestUploadCount;

Redant Drivers/Apex And Drivers/RANotificationNameCenter.m

@@ -12,8 +12,8 @@
 NSString * const RANotificationHandleOrder         = @"RANotificationHandleOrder";
 NSString * const RANotificationReloadHome       = @"RANotificationReloadHome";
 NSString * const RANotificationLogout           = @"RANotificationLogout";
-NSString * const RANotificationStartLocation    = @"RANotificationStartLocation";
-NSString * const RANotificationStopLocation     = @"RANotificationStopLocation";
+NSString * const RANotificationStartBackgroundLocation    = @"RANotificationStartBackgroundLocation";
+NSString * const RANotificationStopBackgroundLocation     = @"RANotificationStopBackgroundLocation";
 NSString * const RANotificationCheckDetail      = @"RANotificationCheckDetail";
 NSString * const RANotificationChangeUpload      = @"RANotificationChangeUpload";
 NSString * const RANotificationRequestUploadCount      = @"RANotificationRequestUploadCount";

Redant Drivers/Apex And Drivers/RASingleton.h

@@ -31,7 +31,7 @@ typedef enum {
 @property (nonatomic,copy,readonly) NSString *encryptPassword;
 
 @property (nonatomic,copy) NSString *notificationToken;
-@property (nonatomic,assign) BOOL requiredLocation;
+@property (nonatomic,assign) BOOL requiredBackgroundLocation;
 
 @property (nonatomic,strong) NSOperationQueue *networkQueue;
 

Redant Drivers/Apex And Drivers/RASingleton.m

@@ -142,7 +142,7 @@ static RASingleton *singleton;
         [defaults removeObjectForKey:@"firstName"];
         [defaults synchronize];
     }
-    
+    self.requiredBackgroundLocation = NO;
     [self setShouldAutoLogin:NO];
 }
 
@@ -165,30 +165,30 @@ static RASingleton *singleton;
 
 #pragma mark - Location
 
-- (void)setRequiredLocation:(BOOL)requiredLocation {
-    _requiredLocation = requiredLocation;
+- (void)setRequiredBackgroundLocation:(BOOL)requiredLocation {
+    _requiredBackgroundLocation = requiredLocation;
     
-    NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
-    [defaults setBool:_requiredLocation forKey:@"requiredLocation"];
-    [defaults synchronize];
+//    NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
+//    [defaults setBool:_requiredBackgroundLocation forKey:@"requiredBackgroundLocation"];
+//    [defaults synchronize];
     
     [self sendRequiredLocationNotification];
 }
 
 - (void)loadSavedReuqiredLocation { // 启动的时候
     
-    NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
-    _requiredLocation = [[defaults objectForKey:@"requiredLocation"] boolValue];
+//    NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
+//    _requiredLocation = [[defaults objectForKey:@"requiredBackgroundLocation"] boolValue];
     
-    [self sendRequiredLocationNotification];
+//    [self sendRequiredLocationNotification];
 }
 
 - (void)sendRequiredLocationNotification {
     
-    if (_requiredLocation) {
-        [[NSNotificationCenter defaultCenter] postNotificationName:RANotificationStartLocation object:nil];
+    if (_requiredBackgroundLocation) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:RANotificationStartBackgroundLocation object:nil];
     } else {
-        [[NSNotificationCenter defaultCenter] postNotificationName:RANotificationStopLocation object:nil];
+        [[NSNotificationCenter defaultCenter] postNotificationName:RANotificationStopBackgroundLocation object:nil];
     }
     
 }

Redant Drivers/Apex And Drivers/Update/Base.lproj/Edit.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -309,14 +309,23 @@
                                     <outlet property="delegate" destination="IN3-1q-AsB" id="NbU-kh-Hg2"/>
                                 </connections>
                             </tableView>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Connection lost, you are" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z2K-ue-W7v">
+                                <rect key="frame" x="95" y="323.5" width="185.5" height="20.5"/>
+                                <color key="backgroundColor" red="0.83914172649999996" green="0.83926308159999996" blue="0.83911520240000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <gestureRecognizers/>
                         <constraints>
                             <constraint firstItem="ySV-Nn-wQz" firstAttribute="bottom" secondItem="h3M-SO-JeC" secondAttribute="bottom" id="8B5-Af-bAC"/>
                             <constraint firstItem="ySV-Nn-wQz" firstAttribute="trailing" secondItem="h3M-SO-JeC" secondAttribute="trailing" id="MVB-lW-JKx"/>
+                            <constraint firstItem="Z2K-ue-W7v" firstAttribute="centerX" secondItem="SQP-tB-vfe" secondAttribute="centerX" id="PvI-6p-BA8"/>
                             <constraint firstItem="h3M-SO-JeC" firstAttribute="top" secondItem="ySV-Nn-wQz" secondAttribute="top" id="eC3-64-OfK"/>
                             <constraint firstItem="h3M-SO-JeC" firstAttribute="leading" secondItem="ySV-Nn-wQz" secondAttribute="leading" id="tzR-Dr-6Hq"/>
+                            <constraint firstItem="Z2K-ue-W7v" firstAttribute="centerY" secondItem="SQP-tB-vfe" secondAttribute="centerY" id="uDg-0t-QwF"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="ySV-Nn-wQz"/>
                         <connections>
@@ -324,6 +333,7 @@
                         </connections>
                     </view>
                     <connections>
+                        <outlet property="label_cache" destination="Z2K-ue-W7v" id="7Q2-M8-jaA"/>
                         <outlet property="orderEditTableView" destination="h3M-SO-JeC" id="f7f-IF-rEo"/>
                     </connections>
                 </viewController>

Redant Drivers/Apex And Drivers/Update/RAOrderEditViewController.h

@@ -30,5 +30,6 @@
 - (NSIndexPath *)indexPathForCell:(UITableViewCell *)cell;
 
 - (void)expandIndexPath:(NSIndexPath *)indexPath withJsonItem:(NSDictionary *)item;
+@property (weak, nonatomic) IBOutlet UILabel *label_cache;
 
 @end

Redant Drivers/Apex And Drivers/Update/RAOrderEditViewController.m

@@ -165,7 +165,12 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-
+    self.label_cache.text = NSLocalizedString(@"cache content", nil);
+    [self.label_cache sizeToFit];
+    self.label_cache.layer.borderColor=ApexDriverGrayColor.CGColor;
+    self.label_cache.layer.borderWidth = 1.0f;
+    self.label_cache.layer.cornerRadius = 5.0f;
+    self.label_cache.layer.masksToBounds = YES;
     [self configureTable];
     [self configureNavigationBar];
     [self loadData];
@@ -232,6 +237,7 @@
 #pragma mark - Action
 
 - (void)refreshControlValueChanged:(UIRefreshControl *)refresh {
+    self.label_cache.hidden=true;
     [self loadData];
 }
 
@@ -335,7 +341,10 @@
                         [model setValuesForKeysWithDictionary:section];
                         [strongSelf.sectionArray addObject:model];
                     }
-                    
+                    if([json[@"iscache"] boolValue]==true)
+                    {
+                        self.label_cache.hidden=false;
+                    }
                     [strongSelf.orderEditTableView reloadData];
                     
                 } else {
@@ -407,7 +416,8 @@
     if (self.orderType2) {
         [params setObject:self.orderType2 forKey:@"orderType2"];
     }
-    if (RASingleton.sharedInstance.requiredLocation) {
+    if (/*RASingleton.sharedInstance.requiredBackgroundLocation*/true)
+    {
         CLLocation *location = RASingleton.sharedInstance.currentLocation;
         NSString *latLon = nil;
         if (location) {
@@ -482,7 +492,7 @@
                 if (result == RESULT_TRUE) {
                     
                     BOOL requiredLocation = [[json objectForKey:@"requiredLocation"] boolValue];
-                    [RASingleton sharedInstance].requiredLocation = requiredLocation;
+                    [RASingleton sharedInstance].requiredBackgroundLocation = requiredLocation;
                     
                     dispatch_async(dispatch_get_main_queue(), ^{
                         

Redant Drivers/Apex And Drivers/en.lproj/Localizable.strings

@@ -51,6 +51,7 @@
 /**
  Update
  */
+"cache content"="Connection lost\n\n You are browsing cache content. ";
 "Update" = "Update";
 "Warning" = "Warning";
 "please complete missing field:\n%@" = "please complete missing field:\n%@";

Redant Drivers/Apex And Drivers/zh-Hans.lproj/Localizable.strings

@@ -53,6 +53,7 @@
  */
 "Update" = "提交";
 "Warning" = "警告";
+"cache content"=" 连接中断 \n\n 您现在看到的是缓存内容。\n";
 "please complete missing field:\n%@" = "请完成以下内容:\n%@";
 "update_upload_failed_tips" = "上传图片失败,是否重试或者将任务提交到后台上传?";
 "Background" = "后台上传";

Redant Drivers/Redant Drivers.xcworkspace/xcuserdata/ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -395,53 +395,6 @@
             endingLineNumber = "613"
             landmarkName = "-checkRetryOperations"
             landmarkType = "7">
-            <Locations>
-               <Location
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[RAUploadManager checkRetryOperations]"
-                  moduleName = "Apex And Drivers"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/common/upload/RAUploadManager.m"
-                  timestampString = "563810009.637354"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "613"
-                  endingLineNumber = "613"
-                  offsetFromSymbolStart = "192">
-               </Location>
-               <Location
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__39-[RAUploadManager checkRetryOperations]_block_invoke"
-                  moduleName = "Apex And Drivers"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/common/upload/RAUploadManager.m"
-                  timestampString = "563810009.639812"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "615"
-                  endingLineNumber = "615"
-                  offsetFromSymbolStart = "80">
-               </Location>
-               <Location
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__destroy_helper_block_.302"
-                  moduleName = "Apex And Drivers"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/common/upload/RAUploadManager.m"
-                  timestampString = "563810009.641523"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "613"
-                  endingLineNumber = "613"
-                  offsetFromSymbolStart = "16">
-               </Location>
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -476,5 +429,165 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex And Drivers/RADataProvider.m"
+            timestampString = "572497027.256822"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "199"
+            endingLineNumber = "199"
+            landmarkName = "+requestOrderList"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex And Drivers/RADataProvider.m"
+            timestampString = "572497027.257581"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "302"
+            endingLineNumber = "302"
+            landmarkName = "+requestOrderDetail:type:type2:statusNo:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex And Drivers/Detail/Action Selection/RADetailActionSelectionViewController.m"
+            timestampString = "572260585.120224"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "25"
+            endingLineNumber = "25"
+            landmarkName = "-viewDidLoad"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex And Drivers/Detail/RAOrderDetailViewController.m"
+            timestampString = "572260585.120275"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "213"
+            endingLineNumber = "213"
+            landmarkName = "-refreshControlValueChanged:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex And Drivers/Home/RAHomeViewController.m"
+            timestampString = "572497027.258036"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "447"
+            endingLineNumber = "447"
+            landmarkName = "-loadData"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex And Drivers/Update/RAOrderEditViewController.m"
+            timestampString = "572497027.25815"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "494"
+            endingLineNumber = "494"
+            landmarkName = "-updateBtnClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex And Drivers/AppDelegate.m"
+            timestampString = "572497027.2582459"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "510"
+            endingLineNumber = "510"
+            landmarkName = "-locationManager:didFailWithError:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex And Drivers/Home/More/RAHomeMoreViewController.m"
+            timestampString = "572497027.258351"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "310"
+            endingLineNumber = "310"
+            landmarkName = "-jl_beginRefresh:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex And Drivers/Home/More/RAHomeMoreViewController.m"
+            timestampString = "572497027.258467"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "293"
+            endingLineNumber = "293"
+            landmarkName = "-loadData"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex And Drivers/Home/More/RAHomeMoreViewController.m"
+            timestampString = "572497027.2586139"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "299"
+            endingLineNumber = "299"
+            landmarkName = "-reloadData"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>