Explorar o código

1.修改Apex Mobile ShipCell界面,删除首页搜索框,使用按钮替代。

Pen Li %!s(int64=8) %!d(string=hai) anos
pai
achega
39c008a729

+ 33 - 16
Apex Mobile/Apex Mobile/HomeViewController.m

@@ -31,6 +31,7 @@
 //        self.automaticallyAdjustsScrollViewInsets = NO;
 //    }
     
+    [self configureNavigationBar];
     [self configureTableView];
     self.shipSearchBar.delegate =self;
     [self loadData];
@@ -54,6 +55,14 @@
     [self.shipTableView addSubview:refresh];
 }
 
+- (void)configureNavigationBar {
+    
+    if (self.navigationController && !self.navigationController.isNavigationBarHidden) {
+        UIBarButtonItem *searchItem = [[UIBarButtonItem alloc] initWithTitle:@"Search" style:UIBarButtonItemStylePlain target:self action:@selector(searchItemClick:)];
+        self.navigationItem.rightBarButtonItem = searchItem;
+    }
+}
+
 #pragma mark - Load Data
 
 - (NSMutableArray *)shipArray {
@@ -81,6 +90,14 @@
     [refresh endRefreshing];
 }
 
+- (void)searchItemClick:(id)sender {
+    
+    ShipSearchController *searchVC = [ShipSearchController build];
+    
+    [self.navigationController pushViewController:searchVC animated:YES];
+    
+}
+
 #pragma mark - TableView DataSource && Delegate
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
@@ -97,14 +114,14 @@
     
     NSDictionary *item = [self.shipArray objectAtIndex:indexPath.section];
     
-    NSString *status = [item objectForKey:@"315_status"];
+    NSString *title = [item objectForKey:@"title"];
     NSString *icon = [item objectForKey:@"icon"];
     NSString *desc = [item objectForKey:@"description"];
     NSString *detail = [item objectForKey:@"detail"];
-    NSString *time = [item objectForKey:@"date_time"];
-    NSString *location = [item objectForKey:@"last_location"];
+    NSString *date = [item objectForKey:@"date"];
+    NSString *port = [item objectForKey:@"port"];
     
-    [[[[[[cell setStatus:status] setDescription:desc] setDetail:detail] setLastLocation:location] setTime:time] setIcon:icon];
+    [[[[[[cell setTitle:title] setDescription:desc] setDetail:detail] setPort:port] setTime:date] setIcon:icon];
     
     return cell;
 }
@@ -135,17 +152,17 @@
     return 110;
 }
 
-#pragma mark - SearchBar Delegate
-
-- (BOOL)searchBarShouldBeginEditing:(UISearchBar *)searchBar {
-    
-    ShipSearchController *searchVC = [ShipSearchController build];
-    
-    UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:searchVC];
-    
-    [self presentViewController:nav animated:YES completion:nil];
-    
-    return NO;
-}
+//#pragma mark - SearchBar Delegate
+//
+//- (BOOL)searchBarShouldBeginEditing:(UISearchBar *)searchBar {
+//
+//    ShipSearchController *searchVC = [ShipSearchController build];
+//
+//    UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:searchVC];
+//
+//    [self presentViewController:nav animated:YES completion:nil];
+//
+//    return NO;
+//}
 
 @end

+ 3 - 22
Apex Mobile/Apex Mobile/Main.storyboard

@@ -211,23 +211,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6HR-cD-QDf">
-                                <rect key="frame" x="0.0" y="20" width="375" height="44"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="44" id="nHL-De-PVp"/>
-                                </constraints>
-                                <items>
-                                    <barButtonItem style="plain" id="YgG-oK-nME">
-                                        <searchBar key="customView" contentMode="redraw" placeholder="Search Container" id="VZb-rJ-cHv">
-                                            <rect key="frame" x="16" y="0.0" width="343" height="44"/>
-                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                            <textInputTraits key="textInputTraits"/>
-                                        </searchBar>
-                                    </barButtonItem>
-                                </items>
-                            </toolbar>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="iIl-j9-7oa">
-                                <rect key="frame" x="0.0" y="94" width="375" height="524"/>
+                                <rect key="frame" x="0.0" y="50" width="375" height="568"/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 <connections>
@@ -236,7 +221,7 @@
                                 </connections>
                             </tableView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3xo-DP-qWN">
-                                <rect key="frame" x="0.0" y="64" width="375" height="30"/>
+                                <rect key="frame" x="0.0" y="20" width="375" height="30"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Recently" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ouQ-Yg-iZI">
                                         <rect key="frame" x="10" y="5" width="66.5" height="21"/>
@@ -255,13 +240,10 @@
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="3xo-DP-qWN" firstAttribute="top" secondItem="6HR-cD-QDf" secondAttribute="bottom" id="6GN-qy-A4V"/>
+                            <constraint firstItem="3xo-DP-qWN" firstAttribute="top" secondItem="HNS-Qr-K3s" secondAttribute="top" id="7dN-EO-3Yh"/>
                             <constraint firstItem="iIl-j9-7oa" firstAttribute="trailing" secondItem="HNS-Qr-K3s" secondAttribute="trailing" id="9jR-8W-zYM"/>
                             <constraint firstItem="HNS-Qr-K3s" firstAttribute="trailing" secondItem="3xo-DP-qWN" secondAttribute="trailing" id="Gvc-tU-QdZ"/>
                             <constraint firstItem="iIl-j9-7oa" firstAttribute="top" secondItem="3xo-DP-qWN" secondAttribute="bottom" id="JZI-44-qDk"/>
-                            <constraint firstItem="6HR-cD-QDf" firstAttribute="top" secondItem="HNS-Qr-K3s" secondAttribute="top" id="PPI-EY-buy"/>
-                            <constraint firstItem="6HR-cD-QDf" firstAttribute="trailing" secondItem="HNS-Qr-K3s" secondAttribute="trailing" id="XrC-UT-lWj"/>
-                            <constraint firstItem="6HR-cD-QDf" firstAttribute="leading" secondItem="HNS-Qr-K3s" secondAttribute="leading" id="eiY-l1-JU6"/>
                             <constraint firstItem="iIl-j9-7oa" firstAttribute="leading" secondItem="HNS-Qr-K3s" secondAttribute="leading" id="lPc-7m-bBJ"/>
                             <constraint firstItem="3xo-DP-qWN" firstAttribute="leading" secondItem="HNS-Qr-K3s" secondAttribute="leading" id="mui-fH-ZHN"/>
                             <constraint firstItem="iIl-j9-7oa" firstAttribute="bottom" secondItem="HNS-Qr-K3s" secondAttribute="bottom" id="nZz-HM-ESm"/>
@@ -271,7 +253,6 @@
                     <tabBarItem key="tabBarItem" title="Home" image="tab_home" id="OC9-MV-8nf"/>
                     <simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
                     <connections>
-                        <outlet property="shipSearchBar" destination="VZb-rJ-cHv" id="cXc-Mo-ooR"/>
                         <outlet property="shipTableView" destination="iIl-j9-7oa" id="vsk-WU-ScI"/>
                     </connections>
                 </viewController>

+ 6 - 4
Apex Mobile/Apex Mobile/OrderHistoryViewController.m

@@ -148,6 +148,8 @@ static const int delta = 7;
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
     return self.shipArray.count;
+//    if (self.shipArray.count > 2) return 2;
+//    return 0;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
@@ -160,14 +162,14 @@ static const int delta = 7;
     
     NSDictionary *item = [self.shipArray objectAtIndex:indexPath.section];
     
-    NSString *status = [item objectForKey:@"315_status"];
+    NSString *title = [item objectForKey:@"title"];
     NSString *icon = [item objectForKey:@"icon"];
     NSString *desc = [item objectForKey:@"description"];
     NSString *detail = [item objectForKey:@"detail"];
-    NSString *time = [item objectForKey:@"date_time"];
-    NSString *location = [item objectForKey:@"last_location"];
+    NSString *date = [item objectForKey:@"date"];
+    NSString *port = [item objectForKey:@"port"];
     
-    [[[[[[cell setStatus:status] setDescription:desc] setDetail:detail] setLastLocation:location] setTime:time] setIcon:icon];
+    [[[[[[cell setTitle:title] setDescription:desc] setDetail:detail] setPort:port] setTime:date] setIcon:icon];
     
     return cell;
 }

+ 4 - 4
Apex Mobile/Apex Mobile/ShipSearchController.m

@@ -115,14 +115,14 @@
     
     NSDictionary *item = [self.shipArray objectAtIndex:indexPath.row];
     
-    NSString *status = [item objectForKey:@"315_status"];
+    NSString *title = [item objectForKey:@"title"];
     NSString *icon = [item objectForKey:@"icon"];
     NSString *desc = [item objectForKey:@"description"];
     NSString *detail = [item objectForKey:@"detail"];
-    NSString *time = [item objectForKey:@"date_time"];
-    NSString *location = [item objectForKey:@"last_location"];
+    NSString *date = [item objectForKey:@"date"];
+    NSString *port = [item objectForKey:@"port"];
     
-    [[[[[[cell setStatus:status] setDescription:desc] setDetail:detail] setLastLocation:location] setTime:time] setIcon:icon];
+    [[[[[[cell setTitle:title] setDescription:desc] setDetail:detail] setPort:port] setTime:date] setIcon:icon];
     
     return cell;
 }

+ 2 - 2
Apex Mobile/Apex Mobile/ShipingStatusCell.h

@@ -10,8 +10,8 @@
 
 @interface ShipingStatusCell : UITableViewCell
 
-- (instancetype)setStatus:(NSString *)status;
-- (instancetype)setLastLocation:(NSString *)lastLocation;
+- (instancetype)setTitle:(NSString *)title;
+- (instancetype)setPort:(NSString *)port;
 - (instancetype)setTime:(NSString *)time;
 - (instancetype)setDescription:(NSString *)desc;
 - (instancetype)setDetail:(NSString *)detail;

+ 7 - 7
Apex Mobile/Apex Mobile/ShipingStatusCell.m

@@ -11,8 +11,8 @@
 
 @interface ShipingStatusCell ()
 
-@property (strong, nonatomic) IBOutlet UILabel *statusLabel;
-@property (strong, nonatomic) IBOutlet UILabel *lastLocationLabel;
+@property (strong, nonatomic) IBOutlet UILabel *titleLabel;
+@property (strong, nonatomic) IBOutlet UILabel *portLabel;
 @property (strong, nonatomic) IBOutlet UILabel *timeLabel;
 @property (strong, nonatomic) IBOutlet UIImageView *iconView;
 @property (strong, nonatomic) IBOutlet UILabel *descLabel;
@@ -43,13 +43,13 @@
     return _queue;
 }
 
-- (instancetype)setStatus:(NSString *)status {
-    self.statusLabel.text = status;
+- (instancetype)setTitle:(NSString *)title{
+    self.titleLabel.text = title;
     return self;
 }
 
-- (instancetype)setLastLocation:(NSString *)lastLocation {
-    self.lastLocationLabel.text = lastLocation;
+- (instancetype)setPort:(NSString *)port{
+    self.portLabel.text = port;
     return self;
 }
 
@@ -105,7 +105,7 @@
 - (void)prepareForReuse {
     [super prepareForReuse];
     
-    [[[[[[self setStatus:nil] setLastLocation:nil] setTime:nil] setDescription:nil] setDetail:nil] setIcon:nil];
+    [[[[[[self setTitle:nil] setPort:nil] setTime:nil] setDescription:nil] setDetail:nil] setIcon:nil];
 }
 
 @end

+ 24 - 30
Apex Mobile/Apex Mobile/ShippingStatusCell.xib

@@ -28,29 +28,20 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="zzT-Tl-h4X">
-                        <rect key="frame" x="15" y="57" width="48" height="48"/>
+                        <rect key="frame" x="15" y="54" width="48" height="48"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="48" id="QkP-uV-fWa"/>
                             <constraint firstAttribute="width" constant="48" id="nFE-z2-5cD"/>
                         </constraints>
                     </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="latest update information shows here include location, status, time, etc" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GXE-Kf-rIH">
-                        <rect key="frame" x="71" y="80" width="289" height="14.5"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="latest update information shows here include location, status, time, etc" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GXE-Kf-rIH">
+                        <rect key="frame" x="71" y="77" width="289" height="14.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Last Location" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X99-0j-XQm">
-                        <rect key="frame" x="15" y="31" width="92" height="21"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="21" id="ckh-V6-4Az"/>
-                        </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                        <nil key="textColor"/>
-                        <nil key="highlightedColor"/>
-                    </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="HBOL &amp;  container #" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y76-2K-QNR">
-                        <rect key="frame" x="71" y="57" width="289" height="18"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A1801380001 (5 containers)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y76-2K-QNR">
+                        <rect key="frame" x="71" y="54" width="289" height="18"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="18" id="AVN-RC-itM"/>
                         </constraints>
@@ -65,36 +56,39 @@
                             <constraint firstAttribute="width" constant="5" id="DWZ-1n-IWP"/>
                         </constraints>
                     </view>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="01/10/2018 02:21" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A9v-MV-LqP">
-                        <rect key="frame" x="260" y="37" width="105" height="15"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="15" id="u17-bd-sqI"/>
-                            <constraint firstAttribute="width" constant="105" id="zXD-P7-Zke"/>
-                        </constraints>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12/09/2017 - 01/20/2018" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A9v-MV-LqP">
+                        <rect key="frame" x="15" y="34" width="140" height="15"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                        <color key="textColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CNTAO - USLAX" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X99-0j-XQm">
+                        <rect key="frame" x="266.5" y="34" width="93.5" height="14.5"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
                 </subviews>
                 <constraints>
-                    <constraint firstItem="X99-0j-XQm" firstAttribute="top" secondItem="NSI-Dy-9wQ" secondAttribute="bottom" id="0RS-vv-Tyi"/>
                     <constraint firstItem="NSI-Dy-9wQ" firstAttribute="top" secondItem="9kY-ry-WFt" secondAttribute="top" constant="10" id="0x2-9N-9Gx"/>
-                    <constraint firstItem="X99-0j-XQm" firstAttribute="leading" secondItem="9kY-ry-WFt" secondAttribute="leading" constant="15" id="44L-zb-gLg"/>
-                    <constraint firstItem="zzT-Tl-h4X" firstAttribute="top" secondItem="X99-0j-XQm" secondAttribute="bottom" constant="5" id="83c-xi-Sfi"/>
+                    <constraint firstItem="X99-0j-XQm" firstAttribute="height" secondItem="A9v-MV-LqP" secondAttribute="height" id="4k2-nw-bsm"/>
                     <constraint firstItem="zzT-Tl-h4X" firstAttribute="leading" secondItem="9kY-ry-WFt" secondAttribute="leading" constant="15" id="8YL-SL-YfK"/>
+                    <constraint firstItem="Y76-2K-QNR" firstAttribute="top" secondItem="zzT-Tl-h4X" secondAttribute="top" id="A8J-Gx-psD"/>
+                    <constraint firstItem="A9v-MV-LqP" firstAttribute="top" secondItem="NSI-Dy-9wQ" secondAttribute="bottom" constant="3" id="Aha-Te-rAw"/>
                     <constraint firstAttribute="trailing" secondItem="n0i-nd-KME" secondAttribute="trailing" id="DxD-fy-Wmq"/>
+                    <constraint firstItem="X99-0j-XQm" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="A9v-MV-LqP" secondAttribute="trailing" priority="999" constant="5" id="LPn-jJ-Mp5"/>
                     <constraint firstItem="n0i-nd-KME" firstAttribute="leading" secondItem="GXE-Kf-rIH" secondAttribute="trailing" constant="10" id="OjN-xO-iJz"/>
                     <constraint firstItem="Y76-2K-QNR" firstAttribute="leading" secondItem="zzT-Tl-h4X" secondAttribute="trailing" constant="8" id="PYE-p2-t6z"/>
                     <constraint firstItem="GXE-Kf-rIH" firstAttribute="top" secondItem="Y76-2K-QNR" secondAttribute="bottom" constant="5" id="PyT-en-aqn"/>
                     <constraint firstItem="NSI-Dy-9wQ" firstAttribute="leading" secondItem="9kY-ry-WFt" secondAttribute="leading" constant="15" id="QNP-sF-OD5"/>
                     <constraint firstItem="n0i-nd-KME" firstAttribute="top" secondItem="9kY-ry-WFt" secondAttribute="top" id="RtR-AN-v5X"/>
                     <constraint firstItem="GXE-Kf-rIH" firstAttribute="leading" secondItem="zzT-Tl-h4X" secondAttribute="trailing" constant="8" id="bLG-O5-Z3P"/>
-                    <constraint firstItem="Y76-2K-QNR" firstAttribute="top" secondItem="X99-0j-XQm" secondAttribute="bottom" constant="5" id="fs1-bX-ehj"/>
+                    <constraint firstItem="A9v-MV-LqP" firstAttribute="leading" secondItem="NSI-Dy-9wQ" secondAttribute="leading" id="iIe-PU-kax"/>
                     <constraint firstItem="n0i-nd-KME" firstAttribute="leading" secondItem="Y76-2K-QNR" secondAttribute="trailing" constant="10" id="iV1-5N-bTi"/>
-                    <constraint firstItem="A9v-MV-LqP" firstAttribute="bottom" secondItem="X99-0j-XQm" secondAttribute="bottom" id="qew-Vg-TuB"/>
-                    <constraint firstItem="n0i-nd-KME" firstAttribute="leading" secondItem="A9v-MV-LqP" secondAttribute="trailing" constant="5" id="tXz-FP-Fzd"/>
+                    <constraint firstItem="n0i-nd-KME" firstAttribute="leading" secondItem="X99-0j-XQm" secondAttribute="trailing" constant="10" id="ixT-Jv-xxY"/>
+                    <constraint firstItem="X99-0j-XQm" firstAttribute="top" secondItem="A9v-MV-LqP" secondAttribute="top" id="sDc-qv-eaU"/>
                     <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="GXE-Kf-rIH" secondAttribute="bottom" id="tYK-6n-E8u"/>
-                    <constraint firstItem="A9v-MV-LqP" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="X99-0j-XQm" secondAttribute="trailing" constant="5" id="xby-XX-fU2"/>
+                    <constraint firstItem="zzT-Tl-h4X" firstAttribute="top" secondItem="A9v-MV-LqP" secondAttribute="bottom" constant="5" id="tws-Vn-hdS"/>
                 </constraints>
             </tableViewCellContentView>
             <constraints>
@@ -104,9 +98,9 @@
                 <outlet property="descLabel" destination="Y76-2K-QNR" id="nvv-dh-hdz"/>
                 <outlet property="detailLabel" destination="GXE-Kf-rIH" id="ils-ci-0eO"/>
                 <outlet property="iconView" destination="zzT-Tl-h4X" id="CiS-Ec-KJw"/>
-                <outlet property="lastLocationLabel" destination="X99-0j-XQm" id="PJ5-0E-YuA"/>
-                <outlet property="statusLabel" destination="NSI-Dy-9wQ" id="TmI-dP-4GZ"/>
+                <outlet property="portLabel" destination="X99-0j-XQm" id="vMo-sm-Ghw"/>
                 <outlet property="timeLabel" destination="A9v-MV-LqP" id="7Br-4s-QfR"/>
+                <outlet property="titleLabel" destination="NSI-Dy-9wQ" id="t3H-5x-9f7"/>
             </connections>
             <point key="canvasLocation" x="195.5" y="-336"/>
         </tableViewCell>

+ 28 - 28
Apex Mobile/Apex Mobile/fake_container_list.json

@@ -1,60 +1,60 @@
 {
     "container_list": [
                        {
-                       "315_status": "Depart Relay Port",
+                       "title": "FACTORY/CUSTOMER",
                        "icon": "status_departport",
-                       "description": "148517009115 - MOFU0744152",
+                       "description": "A1801350973 (6 containers)",
                        "detail": "Container# MOFU0744152 depart relay port SINGAPORE (SGSIN)",
-                       "date_time": "01/10/2018 02:21",
-                       "last_location": "SINGAPORE (SGSIN)"
+                       "date": "12/10/2017 - 02/18/2018",
+                       "port": "CNTAO - USLAX"
                        },
                        {
-                       "315_status": "Container loaded on vessel",
+                       "title": "FACTORY/CUSTOMER",
                        "icon": "status_load_vessel",
-                       "description": "A1801350973 - GESU1059076",
+                       "description": "A1801350973 (6 containers)",
                        "detail": "Container# GESU1059076 loaded on vessel YM UBIQUITY",
-                       "date_time": "01/21/2018 00:15",
-                       "last_location": "QINGDAO, (CNTAO)"
+                       "date": "12/10/2017 - 02/18/2018",
+                       "port": "CNTAO - USLAX"
                        },
                        {
-                       "315_status": "Pickup/Delivery",
+                       "title": "FACTORY/CUSTOMER",
                        "icon": "status_delivery",
-                       "description": "148517008980 - UACU3259986",
+                       "description": "A1801350973 (6 containers)",
                        "detail": "Container# UACU3259986 available for pickup or delivery",
-                       "date_time": "01/23/2018 15:18",
-                       "last_location": "WORCESTER, (USORH)"
+                       "date": "12/10/2017 - 02/18/2018",
+                       "port": "CNTAO - USLAX"
                        },
                        {
-                       "315_status": "Pickup/Delivery",
+                       "title": "FACTORY/CUSTOMER",
                        "icon": "status_delivery",
-                       "description": "148517008980 - UACU3259986",
+                       "description": "A1801350973 (6 containers)",
                        "detail": "Container# UACU3259986 available for pickup or delivery",
-                       "date_time": "01/23/2018 15:18",
-                       "last_location": "WORCESTER, (USORH)"
+                       "date": "12/10/2017 - 02/18/2018",
+                       "port": "CNTAO - USLAX"
                        },
                        {
-                       "315_status": "Pickup/Delivery",
+                       "title": "FACTORY/CUSTOMER",
                        "icon": "status_delivery",
-                       "description": "148517008980 - UACU3259986",
+                       "description": "A1801350973 (6 containers)",
                        "detail": "Container# UACU3259986 available for pickup or delivery",
-                       "date_time": "01/23/2018 15:18",
-                       "last_location": "WORCESTER, (USORH)"
+                       "date": "12/10/2017 - 02/18/2018",
+                       "port": "CNTAO - USLAX"
                        },
                        {
-                       "315_status": "Pickup/Delivery",
+                       "title": "FACTORY/CUSTOMER",
                        "icon": "status_delivery",
-                       "description": "148517008980 - UACU3259986",
+                       "description": "A1801350973 (6 containers)",
                        "detail": "Container# UACU3259986 available for pickup or delivery",
-                       "date_time": "01/23/2018 15:18",
-                       "last_location": "WORCESTER, (USORH)"
+                       "date": "12/10/2017 - 02/18/2018",
+                       "port": "CNTAO - USLAX"
                        },
                        {
-                       "315_status": "Pickup/Delivery",
+                       "title": "FACTORY/CUSTOMER",
                        "icon": "status_delivery",
-                       "description": "148517008980 - UACU3259986",
+                       "description": "A1801350973 (6 containers)",
                        "detail": "Container# UACU3259986 available for pickup or delivery",
-                       "date_time": "01/23/2018 15:18",
-                       "last_location": "WORCESTER, (USORH)"
+                       "date": "12/10/2017 - 02/18/2018",
+                       "port": "CNTAO - USLAX"
                        }
                        ],
     "result": -1