diff --git a/.gradle/5.6.4/executionHistory/executionHistory.bin b/.gradle/5.6.4/executionHistory/executionHistory.bin index 2c76f8c..a18d586 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 c83594c..e2f8a32 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/fileHashes/fileHashes.bin b/.gradle/5.6.4/fileHashes/fileHashes.bin index cc82d55..de42c52 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 fb926a4..114a835 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 085651c..d55c32e 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 a6bdf08..78aa09a 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 a1b4329..6a5948e 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 5c6d2ad..cfd0ece 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 5aed186..320fc87 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 39b9566..236e0a4 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 52ccd73..22e3ddf 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.idea/misc.xml b/.idea/misc.xml index bc01c18..8482e52 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,7 +9,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 75ddc44..fc8b9e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ android { applicationId "net.sysolution.taxiapp" minSdkVersion 21 targetSdkVersion 29 - versionCode 242 - versionName "3.3.3-beta26.3.9.99-debug" + versionCode 244 + versionName "3.3.3-beta26.4.0.1-release" //alphaxx - 预览版本,不会对外发布，由测试人员测试，会有很多bug //Betaxx - 公开测试版本，会发给其他工作人员，会有较多版本 diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/Configurations.java b/app/src/main/java/cn/trans88/taxiappkotlin/Configurations.java index 4db2404..10dbf59 100644 --- a/app/src/main/java/cn/trans88/taxiappkotlin/Configurations.java +++ b/app/src/main/java/cn/trans88/taxiappkotlin/Configurations.java @@ -426,8 +426,8 @@ public class Configurations { return context.getSharedPreferences("config", Context.MODE_PRIVATE).getInt("logInterval", 0); } - public void logIntervalSave(int x){ - context.getSharedPreferences("config", Context.MODE_PRIVATE).edit().putInt("screenSizeX", x).apply(); + public void logIntervalSave(int logInterval){ + context.getSharedPreferences("config", Context.MODE_PRIVATE).edit().putInt("logInterval", logInterval).apply(); } } 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 2132145..b5e0176 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 @@ -900,18 +900,21 @@ object ConnManger { it.cancel() it.purge() } - //if (Settings.loggerSwitch) { - taxiApp.playerLogSummaryTimer = Timer() - taxiApp.playerLogSummaryTimer?.schedule(object :TimerTask(){ - override fun run() { - val playLoggers = DaoUtil.getPlayLoggers() - "定时上传日志摘要，playLoggers size: ${playLoggers.size}".logd() - val requestJson = getLogSummaryJson(playLoggers) - if (requestJson.isNotEmpty() && logsSummaryTimer == null){ - sendLogsSummaryToWeb(requestJson) + if (interval > 0) { + //if (Settings.loggerSwitch) { + taxiApp.playerLogSummaryTimer = Timer() + taxiApp.playerLogSummaryTimer?.schedule(object :TimerTask(){ + override fun run() { + val playLoggers = DaoUtil.getPlayLoggers() + "定时上传日志摘要，playLoggers size: ${playLoggers.size}".logd() + val requestJson = getLogSummaryJson(playLoggers) + if (requestJson.isNotEmpty() && logsSummaryTimer == null){ + sendLogsSummaryToWeb(requestJson) + } } - } - },interval*60*1000L,interval*60*1000L) + },interval*60*1000L,interval*60*1000L) + } + } /** 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 a06f2d3..92707fe 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 @@ -153,9 +153,8 @@ object ProcessingCommands { val sb = logException(e) YoungUtil.YoungLog("熙讯长连接执行命令出现异常: $sb") } - - } + // /** // *发送排正在播放的广告信息 // */ @@ -181,7 +180,7 @@ object ProcessingCommands { send(response) //测试日志上传 - ConnManger.sendLogsSummary() +// ConnManger.sendLogsSummary() } /** @@ -290,7 +289,8 @@ object ProcessingCommands { //edit by yzd @20211201 //Settings.loggerSwitch = loggerSwitch.isTurn_on Configurations.config(TaxiApp.instance()).loggerSwitchSave(true) - if (loggerInterval.interval>0){ + if (loggerInterval.interval > -1){ + Configurations.config(TaxiApp.instance()).logIntervalSave(loggerInterval.interval) ConnManger.sendLogSummaryByInterval(loggerInterval.interval) } diff --git a/local.properties b/local.properties index 5a03523..d9bb47d 100644 --- a/local.properties +++ b/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Wed Dec 13 15:22:24 GMT+08:00 2023 +#Wed Dec 20 15:01:02 GMT+08:00 2023 sdk.dir=D\:\\Android\\sdk diff --git a/release/output.json b/release/output.json new file mode 100644 index 0000000..fb9c882 --- /dev/null +++ b/release/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":244,"versionName":"3.3.3-beta26.4.0.1-release","enabled":true,"outputFile":"TaxiApp_v3.3.3-beta26.4.0.1-release{244}.apk","fullName":"release","baseName":"release","dirName":""},"path":"TaxiApp_v3.3.3-beta26.4.0.1-release{244}.apk","properties":{}}] \ No newline at end of file