Sfoglia il codice sorgente

1.修改Android Apex Mobile升级Baidu Map。

Pen Li 8 anni fa
parent
commit
59041c9ec1

+ 12 - 10
Apex Mobile/app/build.gradle

@@ -2,12 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     signingConfigs {
-        lbs_test {
-            keyAlias 'apex mobile'
-            keyPassword '#UL$dc01'
-            storeFile file('/Users/ray/Documents/usai android keystore/usai_keystore')
-            storePassword '#UL$dc01'
-        }
     }
     compileSdkVersion 25
 //    buildToolsVersion '25.0.3'
@@ -27,7 +21,13 @@ android {
         debug {
 //            minifyEnabled true
 //            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
-            signingConfig signingConfigs.lbs_test
+        }
+    }
+
+    sourceSets{
+        main{
+            jniLibs.srcDir 'libs'
+            //说明so的路径为该libs路径,关联所有地图SDK的so文件
         }
     }
 }
@@ -39,11 +39,13 @@ dependencies {
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile 'com.android.support:recyclerview-v7:25.3.1'
     compile 'com.google.android.gms:play-services:11.0.4'
-    compile files('libs/baidumapapi_base_v3_7_1.jar')
-    compile files('libs/baidumapapi_map_v3_7_1.jar')
+    //    compile files('libs/baidumapapi_base_v3_7_1.jar')
+    //    compile files('libs/baidumapapi_map_v3_7_1.jar')
     compile files('libs/httpmime-4.1.1.jar')
     compile files('libs/core-2.3.0.jar')
+    implementation files('libs/BaiduLBS_Android.jar')
 }
 android {
     useLibrary 'org.apache.http.legacy'
-}
+}
+

BIN
Apex Mobile/app/libs/BaiduLBS_Android.jar


BIN
Apex Mobile/app/libs/arm64-v8a/libBaiduMapSDK_base_v4_5_2.so


BIN
Apex Mobile/app/libs/arm64-v8a/libBaiduMapSDK_map_v4_5_2.so


BIN
Apex Mobile/app/libs/arm64-v8a/liblocSDK7a.so


BIN
Apex Mobile/app/libs/armeabi-v7a/libBaiduMapSDK_base_v4_5_2.so


BIN
Apex Mobile/app/libs/armeabi-v7a/libBaiduMapSDK_map_v4_5_2.so


BIN
Apex Mobile/app/libs/armeabi-v7a/liblocSDK7a.so


BIN
Apex Mobile/app/libs/armeabi/libBaiduMapSDK_base_v4_5_2.so


BIN
Apex Mobile/app/libs/armeabi/libBaiduMapSDK_map_v4_5_2.so


BIN
Apex Mobile/app/libs/armeabi/liblocSDK7a.so


BIN
Apex Mobile/app/libs/x86/libBaiduMapSDK_base_v4_5_2.so


BIN
Apex Mobile/app/libs/x86/libBaiduMapSDK_map_v4_5_2.so


BIN
Apex Mobile/app/libs/x86/liblocSDK7a.so


BIN
Apex Mobile/app/libs/x86_64/libBaiduMapSDK_base_v4_5_2.so


BIN
Apex Mobile/app/libs/x86_64/libBaiduMapSDK_map_v4_5_2.so


BIN
Apex Mobile/app/libs/x86_64/liblocSDK7a.so


+ 10 - 12
Apex Mobile/app/src/main/AndroidManifest.xml

@@ -104,25 +104,23 @@
         android:theme="@android:style/Theme.Holo.Light" >
 
         <!-- release key -->
-       <meta-data
-            android:name="com.google.android.maps.v2.API_KEY"
-            android:value="AIzaSyDdbk58Lx6QzaXcB_hNpSHVp3l_CJeNpoo" />
+       <!--<meta-data-->
+            <!--android:name="com.google.android.maps.v2.API_KEY"-->
+            <!--android:value="AIzaSyDdbk58Lx6QzaXcB_hNpSHVp3l_CJeNpoo" />-->
 
-           <meta-data
-        android:name="com.baidu.lbsapi.API_KEY"
-        android:value="nqBQoSDbxrslhuzW91uViQX7" />
+        <!--<meta-data-->
+            <!--android:name="com.baidu.lbsapi.API_KEY"-->
+            <!--android:value="nqBQoSDbxrslhuzW91uViQX7" />-->
       
         <!-- debug key -->
 
 
-        
-<!--                   <meta-data
+        <meta-data
             android:name="com.google.android.maps.v2.API_KEY"
-            android:value="AIzaSyARPN7VaYqWGe1PsgGqp1QlhOoTdiwTqq0" />
-
-  <meta-data
+            android:value="AIzaSyD6Snyg2SDUGtkC3sOAr979__IDCZnGGuU" />
+        <meta-data
         android:name="com.baidu.lbsapi.API_KEY"
-        android:value="tznWFxd3RvSoul1TGQp6GSzo" />  -->
+        android:value="tznWFxd3RvSoul1TGQp6GSzo" />
         
   
         <meta-data

+ 3 - 3
Apex Mobile/app/src/main/java/com/usai/apex/InnerMapActivity.java

@@ -119,12 +119,12 @@ public class InnerMapActivity extends FragmentActivity
 		// setUpMapIfNeeded();
 
 //		m_bhasgoogleframework = false;
-		
-		
-		
 
 
 
+
+		m_bhasgoogleframework= false;
+
 		Fragment slFragment = null;
 		if (m_bhasgoogleframework )
 		{