fix Swift 4.1 warnings

googlb · Apr 17, 2018 · 45d1360 · 45d1360
1 parent e678d8c
commit 45d1360
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/amap3DSwift/amap3DSwift.xcodeproj/project.pbxproj b/amap3DSwift/amap3DSwift.xcodeproj/project.pbxproj
@@ -393,7 +393,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "amap3DSwift-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -409,7 +409,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.BrodyGao.amap3DSwift;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "amap3DSwift-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/amap3DSwift/amap3DSwift/Assets.xcassets/AppIcon.appiconset/Contents.json b/amap3DSwift/amap3DSwift/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -45,6 +45,11 @@
       "idiom" : "iphone",
       "filename" : "iPhone_App_iOS7-9_60pt@3x.png",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

diff --git a/amap3DSwift/amap3DSwift/SingleLocaitonAloneViewController.swift b/amap3DSwift/amap3DSwift/SingleLocaitonAloneViewController.swift
@@ -73,7 +73,7 @@ class SingleLocaitonAloneViewController: BaseViewController ,AMapLocationManager
 
             if ((regeocode) != nil)
             {
-                print("reGeocode:\(regeocode)");
+                print("reGeocode:\(String(describing: regeocode))");
 
                 self.displayLabel.text = String.init(format: "%@ \n %@-%@-%.2fm",regeocode!.formattedAddress, regeocode!.citycode,regeocode!.adcode,location!.horizontalAccuracy)
             }
@@ -91,11 +91,11 @@ class SingleLocaitonAloneViewController: BaseViewController ,AMapLocationManager
 
             if ((regeocode) != nil)
             {
-                print("reGeocode:\(regeocode)");
+                print("reGeocode:\(String(describing: regeocode))");
 
 
             }else{
-                print("location:\(location)")
+                print("location:\(String(describing: location))")
                 self.displayLabel.text = String.init(format: "lat:%f;lon:%f \n accuracy:%.2fm", location!.coordinate.latitude,location!.coordinate.longitude,location!.horizontalAccuracy)
             }
 

diff --git a/amap3DSwift/amap3DSwift/SingleLocationViewController.swift b/amap3DSwift/amap3DSwift/SingleLocationViewController.swift
@@ -80,7 +80,7 @@ class SingleLocationViewController: BaseViewController,MAMapViewDelegate,AMapSea
             annotation.coordinate = location!.coordinate
             if ((regeocode) != nil)
             {
-                print("reGeocode:\(regeocode)");
+                print("reGeocode:\(String(describing: regeocode))");
                 annotation.title = regeocode?.formattedAddress
                 annotation.subtitle = String.init(format: "%@-%@-%.2fm", regeocode!.citycode,regeocode!.adcode,location!.horizontalAccuracy)
             }
@@ -99,12 +99,12 @@ class SingleLocationViewController: BaseViewController,MAMapViewDelegate,AMapSea
             annotation.coordinate = location!.coordinate
             if ((regeocode) != nil)
             {
-                print("reGeocode:\(regeocode)");
+                print("reGeocode:\(String(describing: regeocode))");
 
 
             }else{
                 annotation.title = String.init(format: "lat:%f;lon:%f", location!.coordinate.latitude,location!.coordinate.longitude)
-                print("location:\(location)")
+                print("location:\(String(describing: location))")
                 annotation.subtitle = String.init(format: "accuracy:%.2fm", location!.horizontalAccuracy)
             }
             self.addAnnotationToMapView(annotation: annotation)

diff --git a/amap3DSwift/amap3DSwift/ViewController.swift b/amap3DSwift/amap3DSwift/ViewController.swift
@@ -74,7 +74,7 @@ class ViewController: UIViewController,UITableViewDataSource,UITableViewDelegate
             self.present(alertController, animated: true, completion: nil)
 
         }
-        AMapServices.shared().apiKey = APIKey.APIkey as String!
+        AMapServices.shared().apiKey = APIKey.APIkey as String?
     }
 
     // MARK: - UITableViewDataSource