适配iOS11 和iPhone X

Palmwms/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -63,6 +63,11 @@
       "idiom" : "iphone",
       "filename" : "Icon-60@3x.png",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

Palmwms/Base.lproj/LaunchScreen.storyboard

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina5_9" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -14,14 +19,26 @@
                         <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="zzk-Vr-eKK">
+                                <rect key="frame" x="130.66666666666666" y="172" width="114" height="62"/>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="0.9137254901960784" green="0.94117647058823528" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="zzk-Vr-eKK" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="Q9z-Rx-gb3"/>
+                            <constraint firstItem="zzk-Vr-eKK" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" multiplier="0.5" id="owF-hv-boW"/>
+                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="52" y="374.6305418719212"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="logo" width="114" height="62"/>
+    </resources>
 </document>

Palmwms/Class/Main/Map/Contrillers/DeliveryTrackingViewController.mm

@@ -156,8 +156,11 @@
     _routesearch = [[BMKRouteSearch alloc]init];
     self.locService = [[BMKLocationService alloc]init];
     [self.locService startUserLocationService];
-    self.mapView = [[BMKMapView alloc]initWithFrame:CGRectMake(0, 0, self.view.mj_w, self.view.mj_h-44-64)];
+    self.mapView = [[BMKMapView alloc]init];
     [self.view insertSubview:_mapView atIndex:0];
+    [self.mapView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.top.bottom.equalTo(self.view);
+    }];
     self.mapView.zoomLevel = 16;
     self.locService.pausesLocationUpdatesAutomatically = NO;
     self.mapView.userTrackingMode = BMKUserTrackingModeFollow;

Palmwms/Class/Main/Map/Contrillers/MainViewController.m

@@ -47,22 +47,22 @@
     _DeliveryVC = [self.getStoryboardWithName instantiateViewControllerWithIdentifier:@"DeliveryTrackingViewController"];
     [self addChildViewController:_DeliveryVC];
     [self.view addSubview:_coordinateVC.view];
+    _coordinateVC.view.frame = self.view.bounds;
     self.currentVC = self.coordinateVC;
 }
 
-
 #pragma mark - 切换内容控制器
 - (void)changeViewControllerWithNewController:(BaseViewController *)newController
 {
     [self transitionFromViewController:self.currentVC toViewController:newController duration:0.3 options:UIViewAnimationOptionTransitionNone animations:nil completion:^(BOOL finished) {
         if (finished) {
             [self.view addSubview:newController.view];
+            newController.view.frame = self.view.bounds;
             self.currentVC = newController;
         }
     }];
 }
 
-
 - (IBAction)UISegmentedControlClickAction:(UISegmentedControl *)sender {
     
     if (sender.selectedSegmentIndex) {

Palmwms/Class/Main/Map/Contrillers/OrderDetailsViewController.m

@@ -25,7 +25,6 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    self.orderDetailsTableview.tableFooterView = [UIView new];
     [self uiConfigAction];
 }
 
@@ -45,6 +44,9 @@
     [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor blackColor] range:NSMakeRange(attributedString.length-([indexString length] + 4 + [totalCount length]), [totalCount length])];
      [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor greenColor] range:NSMakeRange(attributedString.length-[indexString length], [indexString length])];
     self.titleLabel.attributedText = attributedString;
+    self.orderDetailsTableview.tableFooterView = [UIView new];
+    self.orderDetailsTableview.rowHeight = UITableViewAutomaticDimension;
+    self.orderDetailsTableview.estimatedRowHeight = 60;
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -80,11 +82,6 @@
     return self.orderDetails.count;
 }
 
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    return 60;
-}
-
 - (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     return UITableViewCellEditingStyleDelete;