Merge branch 'dev_map' into map_dev

# Conflicts:
#	ln_jq_app/ios/Podfile.lock
#	ln_jq_app/lib/pages/c_page/base_widgets/view.dart
地图导航相关

ln_jq_app/android/app/proguard-rules.pro

@@ -58,4 +58,31 @@
 -dontwarn org.android.agoo.**
 -dontwarn anetwork.**
 -dontwarn com.ut.**
--dontwarn com.ta.**
+-dontwarn com.ta.**
+
+
+3D 地图 V5.0.0之前：
+-keep   class com.amap.api.maps.**{*;}
+-keep   class com.autonavi.amap.mapcore.*{*;}
+-keep   class com.amap.api.trace.**{*;}
+
+3D 地图 V5.0.0之后：
+-keep   class com.amap.api.maps.**{*;}
+-keep   class com.autonavi.**{*;}
+-keep   class com.amap.api.trace.**{*;}
+
+定位
+-keep class com.amap.api.location.**{*;}
+-keep class com.amap.api.fence.**{*;}
+-keep class com.autonavi.aps.amapapi.model.**{*;}
+
+搜索
+-keep   class com.amap.api.services.**{*;}
+
+2D地图
+-keep class com.amap.api.maps2d.**{*;}
+-keep class com.amap.api.mapcore2d.**{*;}
+
+导航
+-keep class com.amap.api.navi.**{*;}
+-keep class com.autonavi.**{*;}