fix location issue. fix #400

wildfirechat · Jul 26, 2020 · ffbd165 · ffbd165
1 parent af0c6c0
commit ffbd165
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 9 deletions.
diff --git a/uikit/build.gradle b/uikit/build.gradle
@@ -54,16 +54,12 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation files('libs/TencentLocationSDK_v4.9.7.12_r247861_161205_1104.jar')
-    implementation files('libs/TencentMapSDK_Raster_v_1.2.7_51ae0e7.jar')
-    implementation files('libs/TencentSearch1.1.3.jar')
 
     implementation 'com.lqr.adapter:library:1.0.2'
     implementation 'com.jaeger.statusbaruitl:library:1.3.5'
 
     // wfc kit start
     implementation 'q.rorbin:badgeview:1.1.3'
-    implementation fileTree(include: ['*.jar'], dir: 'kit/libs')
     api 'androidx.appcompat:appcompat:1.3.0-alpha01'
     api 'com.google.android.material:material:1.3.0-alpha01'
     implementation 'cjt.library.wheel:camera:1.1.9'
@@ -92,6 +88,9 @@ dependencies {
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'com.google.android:flexbox:2.0.1'
+
+    implementation 'com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.2.6'
+
     // kit wfc end
 
 

diff --git a/uikit/libs/TencentLocationSDK_v4.9.7.12_r247861_161205_1104.jar b/uikit/libs/TencentLocationSDK_v4.9.7.12_r247861_161205_1104.jar
diff --git a/uikit/libs/TencentMapSDK_Raster_v_1.2.7_51ae0e7.jar b/uikit/libs/TencentMapSDK_Raster_v_1.2.7_51ae0e7.jar
diff --git a/uikit/libs/TencentMapSDK_Raster_v_1.3.4.1.jar b/uikit/libs/TencentMapSDK_Raster_v_1.3.4.1.jar
diff --git a/uikit/libs/armeabi-v7a/libtencentloc.so b/uikit/libs/armeabi-v7a/libtencentloc.so
diff --git a/uikit/libs/x86/libtencentloc.so b/uikit/libs/x86/libtencentloc.so
diff --git a/uikit/src/main/AndroidManifest.xml b/uikit/src/main/AndroidManifest.xml
@@ -65,11 +65,6 @@
             android:name="android.webkit.WebView.EnableSafeBrowsing"
             android:value="true" />
 
-        <!--地图-->
-        <meta-data
-            android:name="TencentMapSDK"
-            android:value="TOEBZ-67IR4-ZDHUV-DSDXX-TJZU7-UYFE7" />
-
         <activity
             android:name="cn.wildfire.chat.kit.conversation.ConversationActivity"
             android:launchMode="singleTask"
@@ -209,6 +204,7 @@
         </activity>
         <activity android:name="cn.wildfire.chat.kit.voip.VoipDummyActivity" />
         <activity android:name="cn.wildfire.chat.kit.pc.PCSessionActivity" />
+        <activity android:name=".third.location.ui.activity.MyLocationActivity" />
 
         <!--moment start-->
         <activity android:name="cn.wildfire.chat.moment.PublishFeedActivity" />