Merge branch 'map_dev' into dev

ln_jq_app/android/app/src/main/java/com/lnkj/ln_jq_app/NativeMapView.java

@@ -618,9 +618,9 @@ public class NativeMapView implements PlatformView, LocationSource, AMapLocation
                     tvStationName.setText(endName);
                     tvStationAddr.setText(endAddress);
 
-                    double distanceKm = path.getDistance() / 1000f;
+                    double distanceKm = truckRouteData.pathDto.distance / 1000f;
-                    long durationMin = path.getDuration() / 60;
+                    long durationMin = truckRouteData.pathDto.duration / 60;
-                    double tolls = path.getTolls();
+                    String tolls = truckRouteData.pathDto.tolls;
 
                     String hydrogenCost = "--"; // 默认显示横线
                     try {
@@ -634,7 +634,7 @@ public class NativeMapView implements PlatformView, LocationSource, AMapLocation
 
                         tvDuration.setText("预计时间：" + durationMin + "分钟");
                         tvDistance.setText("行驶里程：" + String.format("%.1f", distanceKm) + "公里");
-                        tvTolls.setText("过路费：" + (int) tolls + "元");
+                        tvTolls.setText("过路费：" + tolls + "元");
                         tvTollsFuel.setText("加氢费用：" + (isGetInputtips ? "--" : hydrogenCost) + "元");
 
                         isGetInputtips = false;

ln_jq_app/ios/Runner/Info.plist

@@ -37,6 +37,8 @@
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>LSSupportsOpeningDocumentsInPlace</key>
+	<true/>
 	<key>NSCameraUsageDescription</key>
 	<string>需要访问您的相机以扫描二维码</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
@@ -57,6 +59,8 @@
 		<string>fetch</string>
 		<string>location</string>
 	</array>
+	<key>UIFileSharingEnabled</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -76,26 +80,5 @@
 	</array>
 	<key>uses</key>
 	<string></string>
-
-
-	<key>UIBackgroundModes</key>
-    	<array>
-    		<string>remote-notification</string>
-    		<string>fetch</string>
-    	</array>
-
-<key>CFBundleLocalizations</key>
-<array>
-    <string>zh-Hans</string>
-    <string>en</string>
-</array>
-
-<key>UIFileSharingEnabled</key>
-<true/>
-<!-- 允许在“文件”App中直接打开文档 -->
-<key>LSSupportsOpeningDocumentsInPlace</key>
-<true/>
-
-
 </dict>
 </plist>