V1.1.1

cczhr · Apr 1, 2021 · 872f3d0 · 872f3d0
1 parent fb33872
commit 872f3d0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.cczhr.otglocation"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 4
-        versionName "1.1.0"
+        versionCode 5
+        versionName "1.1.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/app/libs/BaiduLBS_AndroidSDK_Lib.aar b/app/libs/BaiduLBS_AndroidSDK_Lib.aar
diff --git a/app/src/main/java/com/cczhr/otglocation/MainActivity.kt b/app/src/main/java/com/cczhr/otglocation/MainActivity.kt
@@ -96,7 +96,7 @@ class MainActivity : BaseActivity() {
     fun selectLocation(view: View) {
         val lat = latitude.text.toString().toDoubleOrNull()
         val lon = longitude.text.toString().toDoubleOrNull()
-        val intent=Intent(this, BaiduMapActivity::class.java)//MapActivity
+        val intent=Intent(this, MapActivity::class.java)
         if (lat != null && lon != null) {
             intent.putExtra("lat",lat)
             intent.putExtra("lon",lon)

diff --git a/app/src/main/java/com/cczhr/otglocation/utils/Application.kt b/app/src/main/java/com/cczhr/otglocation/utils/Application.kt
@@ -2,15 +2,12 @@ package com.cczhr.otglocation.utils
 
 import android.app.Application
 import android.content.Context
-import com.baidu.mapapi.CoordType
-import com.baidu.mapapi.SDKInitializer
+
 
 class Application:Application() {
 
     override fun onCreate() {
         super.onCreate()
-        SDKInitializer.initialize(this)
-        SDKInitializer.setCoordType(CoordType.GCJ02)
         context=this
     }
     companion object {

diff --git a/app/src/main/java/com/cczhr/otglocation/utils/IMobileDeviceTools.kt b/app/src/main/java/com/cczhr/otglocation/utils/IMobileDeviceTools.kt
@@ -33,7 +33,8 @@ class IMobileDeviceTools {
 
     fun killUsbmuxd(deviceNode: String = "") {
         val killSystemMtp = if (deviceNode.isNotEmpty()) "kill `lsof  -t $deviceNode`\n" else deviceNode
-        runCommand("$killSystemMtp.$saveFilePath/usbmuxd -X")
+        val killPort="kill -9  `netstat -tunlp  | grep 27015|awk '{print $7} '|awk -F '/' '{print $1}'`"
+        runCommand("$killSystemMtp.$saveFilePath/usbmuxd -X\n$killPort")
         SystemClock.sleep(1500)//保证进程杀死 休眠一下
     }