diff --git a/.gradle/5.6.4/executionHistory/executionHistory.bin b/.gradle/5.6.4/executionHistory/executionHistory.bin
index 1c081de..2bc6b46 100644
Binary files a/.gradle/5.6.4/executionHistory/executionHistory.bin and b/.gradle/5.6.4/executionHistory/executionHistory.bin differ
diff --git a/.gradle/5.6.4/executionHistory/executionHistory.lock b/.gradle/5.6.4/executionHistory/executionHistory.lock
index bf2e6d7..2eaa5bf 100644
Binary files a/.gradle/5.6.4/executionHistory/executionHistory.lock and b/.gradle/5.6.4/executionHistory/executionHistory.lock differ
diff --git a/.gradle/5.6.4/fileContent/fileContent.lock b/.gradle/5.6.4/fileContent/fileContent.lock
index 186e7c0..1f7a89f 100644
Binary files a/.gradle/5.6.4/fileContent/fileContent.lock and b/.gradle/5.6.4/fileContent/fileContent.lock differ
diff --git a/.gradle/5.6.4/fileHashes/fileHashes.bin b/.gradle/5.6.4/fileHashes/fileHashes.bin
index 1a669da..d1aa6e4 100644
Binary files a/.gradle/5.6.4/fileHashes/fileHashes.bin and b/.gradle/5.6.4/fileHashes/fileHashes.bin differ
diff --git a/.gradle/5.6.4/fileHashes/fileHashes.lock b/.gradle/5.6.4/fileHashes/fileHashes.lock
index f55cf59..e9a791e 100644
Binary files a/.gradle/5.6.4/fileHashes/fileHashes.lock and b/.gradle/5.6.4/fileHashes/fileHashes.lock differ
diff --git a/.gradle/5.6.4/fileHashes/resourceHashesCache.bin b/.gradle/5.6.4/fileHashes/resourceHashesCache.bin
index 04456f8..835215d 100644
Binary files a/.gradle/5.6.4/fileHashes/resourceHashesCache.bin and b/.gradle/5.6.4/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/5.6.4/javaCompile/classAnalysis.bin b/.gradle/5.6.4/javaCompile/classAnalysis.bin
index 9921a12..88e50ec 100644
Binary files a/.gradle/5.6.4/javaCompile/classAnalysis.bin and b/.gradle/5.6.4/javaCompile/classAnalysis.bin differ
diff --git a/.gradle/5.6.4/javaCompile/jarAnalysis.bin b/.gradle/5.6.4/javaCompile/jarAnalysis.bin
index e62bf5b..3aba68a 100644
Binary files a/.gradle/5.6.4/javaCompile/jarAnalysis.bin and b/.gradle/5.6.4/javaCompile/jarAnalysis.bin differ
diff --git a/.gradle/5.6.4/javaCompile/javaCompile.lock b/.gradle/5.6.4/javaCompile/javaCompile.lock
index 76f364f..0906776 100644
Binary files a/.gradle/5.6.4/javaCompile/javaCompile.lock and b/.gradle/5.6.4/javaCompile/javaCompile.lock differ
diff --git a/.gradle/5.6.4/javaCompile/taskHistory.bin b/.gradle/5.6.4/javaCompile/taskHistory.bin
index a82e7c2..94493ef 100644
Binary files a/.gradle/5.6.4/javaCompile/taskHistory.bin and b/.gradle/5.6.4/javaCompile/taskHistory.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index c03b297..d6f994f 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
index 1bd5cb8..262375e 100644
--- a/.gradle/buildOutputCleanup/cache.properties
+++ b/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Mon Aug 28 09:56:58 GMT+08:00 2023
+#Thu Sep 14 18:07:54 GMT+08:00 2023
gradle.version=5.6.4
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index d4f056f..88e76de 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.idea/libraries/Gradle__com_amitshekhar_android_debug_db_base_1_0_6_aar.xml b/.idea/libraries/Gradle__com_amitshekhar_android_debug_db_base_1_0_6_aar.xml
index e25eae6..76f55f7 100644
--- a/.idea/libraries/Gradle__com_amitshekhar_android_debug_db_base_1_0_6_aar.xml
+++ b/.idea/libraries/Gradle__com_amitshekhar_android_debug_db_base_1_0_6_aar.xml
@@ -10,6 +10,9 @@
+
+
+
diff --git a/.idea/libraries/Gradle__com_facebook_stetho_stetho_1_5_1_aar.xml b/.idea/libraries/Gradle__com_facebook_stetho_stetho_1_5_1_aar.xml
index f5d97e6..e9d38d5 100644
--- a/.idea/libraries/Gradle__com_facebook_stetho_stetho_1_5_1_aar.xml
+++ b/.idea/libraries/Gradle__com_facebook_stetho_stetho_1_5_1_aar.xml
@@ -4,6 +4,7 @@
+
@@ -15,6 +16,9 @@
+
+
+
diff --git a/.idea/libraries/Gradle__com_github_yuweiguocn_GreenDaoUpgradeHelper_v2_2_1_aar.xml b/.idea/libraries/Gradle__com_github_yuweiguocn_GreenDaoUpgradeHelper_v2_2_1_aar.xml
index 872a8f5..89814a9 100644
--- a/.idea/libraries/Gradle__com_github_yuweiguocn_GreenDaoUpgradeHelper_v2_2_1_aar.xml
+++ b/.idea/libraries/Gradle__com_github_yuweiguocn_GreenDaoUpgradeHelper_v2_2_1_aar.xml
@@ -10,6 +10,9 @@
+
+
+
diff --git a/.idea/libraries/Gradle__com_orhanobut_logger_2_2_0_aar.xml b/.idea/libraries/Gradle__com_orhanobut_logger_2_2_0_aar.xml
index 30bd9ca..4904042 100644
--- a/.idea/libraries/Gradle__com_orhanobut_logger_2_2_0_aar.xml
+++ b/.idea/libraries/Gradle__com_orhanobut_logger_2_2_0_aar.xml
@@ -10,6 +10,9 @@
+
+
+
diff --git a/.idea/modules/app/taxiapp-ktl.app.iml b/.idea/modules/app/taxiapp-ktl.app.iml
index 3771cdd..447fa40 100644
--- a/.idea/modules/app/taxiapp-ktl.app.iml
+++ b/.idea/modules/app/taxiapp-ktl.app.iml
@@ -31,7 +31,7 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 012506b..61b0516 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@ android {
applicationId "net.sysolution.taxiapp"
minSdkVersion 21
targetSdkVersion 29
- versionCode 235
- versionName "3.3.3-beta26.3.9.3.92-release"
+ versionCode 237
+ versionName "3.3.3-beta26.3.9.3.94-release"
//alphaxx - 预览版本,不会对外发布，由测试人员测试，会有很多bug
//Betaxx - 公开测试版本，会发给其他工作人员，会有较多版本
@@ -55,7 +55,6 @@ android {
26.3.8.3 优化taxiApp刷新列表时，播放列表相同时从缓存获取广告,更新定点广告时获取的定点regions也加入缓存机制
26.3.8.6.9 长时间未收到心跳重连的等待时间改成38s
26.3.9 更改了webSocket的连接保活代码，gps坐标记录两个点的距离由原来的50米记录一次改为20米记录一次
- 26.3.9.3.6 三分钟内收到两次清除排序指令才会清除排序，防止排序被清除
**/
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ConnManger.kt b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ConnManger.kt
index e3938f8..1d9b31e 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ConnManger.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ConnManger.kt
@@ -793,9 +793,10 @@ object ConnManger {
//if (accountId != Configurations.config(TaxiApp.instance()).accountId() || bindModel.server != Configurations.config(TaxiApp.instance()).taxiBaseUrl()) {
//Settings.accountId = accountId
val currentRegisterToken = Configurations.config(TaxiApp.instance()).registerToken()
+ val connServiceUrl = Configurations.config(TaxiApp.instance()).connServiceUrl()
//#edit by ljh @2023/7/20
//token不一样再去重新注册，连接
- if (!currentRegisterToken.equals(bindModel.accountIdToken)){
+ if (!currentRegisterToken.equals(bindModel.accountIdToken) || !(bindModel.server.equals(connServiceUrl))){
Configurations.config(TaxiApp.instance()).accountIdSave(accountId)
//不等说明账户更换，重新连接
resetAccountCleanDao()
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/JoeyDownloadManager.java b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/JoeyDownloadManager.java
index 92ed2af..3751020 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/JoeyDownloadManager.java
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/JoeyDownloadManager.java
@@ -29,7 +29,6 @@ import cn.trans88.taxiappkotlin.util.YoungUtil;
/**
* Created by joey on 18-3-20.
*/
-
public class JoeyDownloadManager {
private static final JoeyDownloadManager instance = new JoeyDownloadManager();
// private static final int RETRY_TIMES = 10;
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ProcessingCommands.kt b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ProcessingCommands.kt
index 41e3be6..dd5a462 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ProcessingCommands.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ProcessingCommands.kt
@@ -35,7 +35,6 @@ object ProcessingCommands {
var areaIndex = 0
-
/**
* 三乐平台的命令
*/
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/WsManager.kt b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/WsManager.kt
index 9295168..1aeb211 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/WsManager.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/WsManager.kt
@@ -328,7 +328,9 @@ object WsManager {
wsTimer?.schedule(object :KuroTimerTask(){
override fun run() {
"wsTimer执行".logd()
- startConnect()
+ if (!isConnected){
+ startConnect()
+ }
}
},5000)
} catch (e: Throwable) {
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayViewModel.kt b/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayViewModel.kt
index 8d339fa..f48c259 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayViewModel.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayViewModel.kt
@@ -1021,6 +1021,9 @@ class PlayViewModel(val lifecycle: Lifecycle, private val fl_play: FrameLayout,
private fun saveLocation(longitude: Double, latitude: Double, bearing: Float, speed: Float) {
if (curLocation == null) {
YoungUtil.YoungLog("当前curLocation == null")
+ if (longitude == 0.0 || latitude == 0.0){
+ return
+ }
val location = Location().apply {
timestamp = System.currentTimeMillis()
setLongitude(longitude)
@@ -1039,21 +1042,29 @@ class PlayViewModel(val lifecycle: Lifecycle, private val fl_play: FrameLayout,
val distanceLocation = DistanceUtil.getDistance(curLocation!!.latitude, curLocation!!.longitude, latitude, longitude)
//edit by ljh@2023/8/22
if (distanceLocation > 20) {
+// Log.d("LCT","DistanceUtil --> distanceLocation:$distanceLocation")
+
// edit by yzd @20211201
// if (Settings.gpsSwitch) {
if (Configurations.config(TaxiApp.instance()).gpsSwitch()) {
YoungUtil.YoungLog("当前位置坐标距离上一个点大于20，记录")
+ val lon = String.format("%.7f", longitude).toDouble()
+ val lat = String.format("%.7f", latitude).toDouble()
val location = Location().apply {
timestamp = System.currentTimeMillis()
- setLongitude(longitude)
- setLatitude(latitude)
+ setLongitude(lon)
+ setLatitude(lat)
setBearing(bearing)
setSpeed(speed)
- val floatArray = FloatArray(1)
- distanceBetween(curLocation?.latitude!!, curLocation?.longitude!!, latitude, longitude, floatArray)
- distance = floatArray[0]
+// val floatArray = FloatArray(1)
+// distanceBetween(curLocation?.latitude!!, curLocation?.longitude!!, latitude, longitude, floatArray)
+ distance = distanceLocation.toFloat()
+// Log.d("LCT","原生distanceBetween${distance}")
+// Log.d("LCT","speed:$speed")
+// Log.d("LCT","bearing:$bearing")
elapse = timestamp - curLocation?.timestamp!!
}
+
//过滤掉距离过大的数据，edit by ljh 2023/8/8
location.distance?.let {
if (it < 10000f){
@@ -1067,15 +1078,17 @@ class PlayViewModel(val lifecycle: Lifecycle, private val fl_play: FrameLayout,
val tamp = System.currentTimeMillis() - curLocation!!.timestamp
if (tamp > 60 * 60 * 1000) {
YoungUtil.YoungLog("gps开关关闭，每一个小时记录一次日志")
+ val lon = String.format("%.7f", longitude).toDouble()
+ val lat = String.format("%.7f", latitude).toDouble()
val location = Location().apply {
timestamp = System.currentTimeMillis()
- setLongitude(longitude)
- setLatitude(latitude)
+ setLongitude(lon)
+ setLatitude(lat)
setBearing(bearing)
setSpeed(speed)
- val floatArray = FloatArray(1)
- distanceBetween(curLocation?.latitude!!, curLocation?.longitude!!, latitude, longitude, floatArray)
- distance = floatArray[0]
+// val floatArray = FloatArray(1)
+// distanceBetween(curLocation?.latitude!!, curLocation?.longitude!!, latitude, longitude, floatArray)
+ distance = distanceLocation.toFloat()
elapse = timestamp - curLocation?.timestamp!!
}
DaoUtil.getLocationDao().insert(location)
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayerRule.kt b/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayerRule.kt
index b93991c..58e444a 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayerRule.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayerRule.kt
@@ -1,5 +1,6 @@
package cn.trans88.taxiappkotlin.ui.play
+import android.os.Handler
import cn.trans88.kurotool.util.TimeUtil
import cn.trans88.taxiappkotlin.ext.logd
import cn.trans88.taxiappkotlin.ext.loge
@@ -32,7 +33,7 @@ fun Advertise.isReady(): Boolean {
ready = false
}
- if(media_type !=MaterialType.Text.ordinal){
+ if(media_type != MaterialType.Text.ordinal){
/* 这里exist判断不准，文件存在被判定为不存在 略作改动
if (!File(this.pathName).exists()) {
YoungUtil.YoungLog("${this.pathName}的广告本地不存在，重新下载 ready返回false")
diff --git a/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml b/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml
new file mode 100644
index 0000000..2b099a4
--- /dev/null
+++ b/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml
@@ -0,0 +1,195 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/debug/TaxiApp_v3.3.3-beta26.3.9.3.92Local-debug{235}.apk b/debug/TaxiApp_v3.3.3-beta26.3.9.3.92Local-debug{235}.apk
deleted file mode 100644
index eddaa0e..0000000
Binary files a/debug/TaxiApp_v3.3.3-beta26.3.9.3.92Local-debug{235}.apk and /dev/null differ
diff --git a/debug/output.json b/debug/output.json
index 1ab8639..32ef957 100644
--- a/debug/output.json
+++ b/debug/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":235,"versionName":"3.3.3-beta26.3.9.3.92Local-debug","enabled":true,"outputFile":"TaxiApp_v3.3.3-beta26.3.9.3.92Local-debug{235}.apk","fullName":"debug","baseName":"debug","dirName":""},"path":"TaxiApp_v3.3.3-beta26.3.9.3.92Local-debug{235}.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":238,"versionName":"3.3.3-beta26.3.94location-debug","enabled":true,"outputFile":"TaxiApp_v3.3.3-beta26.3.94location-debug{238}.apk","fullName":"debug","baseName":"debug","dirName":""},"path":"TaxiApp_v3.3.3-beta26.3.94location-debug{238}.apk","properties":{}}]
\ No newline at end of file
diff --git a/release/output.json b/release/output.json
index bdcc7da..7913dd2 100644
--- a/release/output.json
+++ b/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":235,"versionName":"3.3.3-beta26.3.9.3.92-release","enabled":true,"outputFile":"TaxiApp_v3.3.3-beta26.3.9.3.92-release{235}.apk","fullName":"release","baseName":"release","dirName":""},"path":"TaxiApp_v3.3.3-beta26.3.9.3.92-release{235}.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":236,"versionName":"3.3.3-beta26.3.9.3.93-release","enabled":true,"outputFile":"TaxiApp_v3.3.3-beta26.3.9.3.93-release{236}.apk","fullName":"release","baseName":"release","dirName":""},"path":"TaxiApp_v3.3.3-beta26.3.9.3.93-release{236}.apk","properties":{}}]
\ No newline at end of file