Apex Mobile

添加shipping status cell

Apex Mobile/Apex Mobile.xcodeproj/project.pbxproj

@@ -60,6 +60,7 @@
 		715643DE201C1AE600B04267 /* my.json in Resources */ = {isa = PBXBuildFile; fileRef = 715643DD201C1AE600B04267 /* my.json */; };
 		7162546B201C3AF1009E3A41 /* readme.txt in Resources */ = {isa = PBXBuildFile; fileRef = 7162546A201C3AF1009E3A41 /* readme.txt */; };
 		7162546D201C412E009E3A41 /* ShippingStatusCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7162546C201C412E009E3A41 /* ShippingStatusCell.xib */; };
+		71625470201C5205009E3A41 /* fake_container_list.json in Resources */ = {isa = PBXBuildFile; fileRef = 7162546F201C5205009E3A41 /* fake_container_list.json */; };
 		716FF7921904ED2600ED6C3D /* NewsData.m in Sources */ = {isa = PBXBuildFile; fileRef = 716FF7911904ED2600ED6C3D /* NewsData.m */; };
 		716FF7951904FBC600ED6C3D /* NewsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 716FF7941904FBC600ED6C3D /* NewsTableViewCell.m */; };
 		717D76EB18C7F8120070302D /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 717D76EA18C7F8120070302D /* Reachability.m */; };
@@ -217,6 +218,7 @@
 		715643DD201C1AE600B04267 /* my.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = my.json; sourceTree = "<group>"; };
 		7162546A201C3AF1009E3A41 /* readme.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = readme.txt; sourceTree = "<group>"; };
 		7162546C201C412E009E3A41 /* ShippingStatusCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ShippingStatusCell.xib; sourceTree = "<group>"; };
+		7162546F201C5205009E3A41 /* fake_container_list.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = fake_container_list.json; sourceTree = "<group>"; };
 		716FF7901904ED2600ED6C3D /* NewsData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewsData.h; sourceTree = "<group>"; };
 		716FF7911904ED2600ED6C3D /* NewsData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewsData.m; sourceTree = "<group>"; };
 		716FF7931904FBC600ED6C3D /* NewsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewsTableViewCell.h; sourceTree = "<group>"; };
@@ -394,6 +396,7 @@
 		715643B820198A6000B04267 /* new */ = {
 			isa = PBXGroup;
 			children = (
+				7162546E201C51DC009E3A41 /* fake data */,
 				7162546A201C3AF1009E3A41 /* readme.txt */,
 				715643D8201C057E00B04267 /* ModeList */,
 				715643B920198A9900B04267 /* RootViewController.h */,
@@ -431,6 +434,14 @@
 			name = ModeList;
 			sourceTree = "<group>";
 		};
+		7162546E201C51DC009E3A41 /* fake data */ = {
+			isa = PBXGroup;
+			children = (
+				7162546F201C5205009E3A41 /* fake_container_list.json */,
+			);
+			name = "fake data";
+			sourceTree = "<group>";
+		};
 		719A51A618C5A4E40080C075 /* CustomUI */ = {
 			isa = PBXGroup;
 			children = (
@@ -838,6 +849,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				71625470201C5205009E3A41 /* fake_container_list.json in Resources */,
 				7162546B201C3AF1009E3A41 /* readme.txt in Resources */,
 				715643DC201C117300B04267 /* search.json in Resources */,
 				719EF8FF18BB839F00EFFF5F /* Images.xcassets in Resources */,

Apex Mobile/Apex Mobile/ShippingStatusCell.xib

@@ -18,19 +18,26 @@
                 <rect key="frame" x="0.0" y="0.0" width="375" height="95.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="315 Status" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NSI-Dy-9wQ">
+                        <rect key="frame" x="15" y="10" width="90" height="21"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zzT-Tl-h4X">
                         <rect key="frame" x="15" y="37" width="48" height="48"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" 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="55" width="288" height="30"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="latest update information shows here include location, status, time, etc" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GXE-Kf-rIH">
+                        <rect key="frame" x="71" y="55" width="288" height="15"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <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" fixedFrame="YES" text="carrier: trackingid" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X99-0j-XQm">
-                        <rect key="frame" x="118" y="10" width="241" height="21"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Last Location" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X99-0j-XQm">
+                        <rect key="frame" x="173" y="10" width="186" height="21"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                         <nil key="textColor"/>
@@ -48,11 +55,11 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <color key="backgroundColor" red="0.0" green="0.56031829119999998" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="315 Status" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NSI-Dy-9wQ">
-                        <rect key="frame" x="15" y="10" width="90" height="21"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" 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="71" y="70" width="288" height="15"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                        <nil key="textColor"/>
+                        <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>
                 </subviews>

Apex Mobile/Apex Mobile/fake_container_list.json

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

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,7 +10,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
-            timestampString = "537170278.9310859"
+            timestampString = "538624150.626388"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "383"
@@ -26,7 +26,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
-            timestampString = "537170278.931265"
+            timestampString = "538624150.62699"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "114"
@@ -74,7 +74,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
-            timestampString = "537170278.931493"
+            timestampString = "538624150.627551"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "96"
@@ -90,7 +90,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
-            timestampString = "537170278.931636"
+            timestampString = "538624150.627978"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "152"

RedAnt Mobile/RedAnt Mobile/SearchViewController.m

@@ -44,7 +44,9 @@
 -(void) resize_tableHeader
 {
     //利用systemLayoutSizeFittingSize:计算出真实高度
-    CGFloat height = [self.editorTable.tableHeaderView systemLayoutSizeFittingSize:UILayoutFittingCompressedSize].height;
+//    CGRectMake(<#CGFloat x#>, <#CGFloat y#>, <#CGFloat width#>, <#CGFloat height#>)
+//    self.editorTable.tableHeaderView.frame= CGRectMake(self.editorTable.tableHeaderView.frame.origin.x, self.editorTable.tableHeaderView.frame.origin.y, self.editorTable.tableHeaderView.frame.size.width, 10000);
+    CGFloat height = [self.editorTable.tableHeaderView systemLayoutSizeFittingSize:CGSizeMake(self.editorTable.tableHeaderView.frame.size.width, 10000)].height;
     CGRect headerFrame = self.editorTable.tableHeaderView.frame;
     headerFrame.size.height = height+20;//20是留的上下边距
     //修改tableHeaderView的frame

RedAnt Mobile/RedAnt Mobile/config.h

@@ -12,11 +12,7 @@
 
 
 
-# ifdef DEBUG
-#define test_server
-# else
-#define NO_SAVE_VERIFY false
-# endif
+
 
 
 # ifdef DEBUG
@@ -43,8 +39,8 @@
 #define URL_QUERY_SETTIING @""
 #define URL_SAVE_QUERY_SETTIING @""
 #define URL_QUERY_AUTOCOMPLETE @""
-//#define  URL_REQUIRE_SERVER  @"http://192.168.0.177/ipad/ant_mobile_company_valid.php"
-#define  URL_REQUIRE_SERVER  @"http://192.168.0.155/wm_postgresql/index.php"
+#define  URL_REQUIRE_SERVER  @"http://192.168.0.177/ipad/ant_mobile_company_valid.php"
+//#define  URL_REQUIRE_SERVER  @"http://192.168.0.155/wm_postgresql/ant_mobile_company_valid.php"
 #define URL_KV_DETAIL @""
 #define URL_ORDER_DETAIL @""
 #define URL_UPLOAD_IMG @""