Merge branch 'dev_ad' of http://39.97.65.143:81/android/android_street into dev_ad

.gitignore

@@ -3,15 +3,12 @@
 .gradle
 /local.properties
 /.idea
-<<<<<<< HEAD
 /.idea/libraries
 /.idea/modules.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/vcs.xml
 /.idea/assetWizardSettings.xml
-=======
->>>>>>> 51e259dbaa1307df3b5a176164c24faf100db48c
 .DS_Store
 /build
 /captures

.idea/compiler.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
-  </component>
-</project>
\ No newline at end of file

.idea/misc.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CMakeSettings">
-    <configurations>
-      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
-    </configurations>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-  <component name="SuppressKotlinCodeStyleNotification">
-    <option name="disableForAll" value="true" />
-  </component>
-</project>
\ No newline at end of file

app/proguard-rules.pro

@@ -410,6 +410,12 @@
     # ======================= 穿山甲 GroMore END ================
 
 
+    # ===================== 百度地图 START ================
+    -keep class com.baidu.** {*;}
+    -keep class vi.com.** {*;}
+    -keep class com.baidu.vi.** {*;}
+    -dontwarn com.baidu.**
+    # ===================== 百度地图 END ================