更换了播放器默认logo图,修改同步的时候出现logo问题，增加“查询是否设置过logo”功能

.idea/libraries/Gradle__com_amitshekhar_android_debug_db_base_1_0_6_aar.xml

@@ -7,6 +7,9 @@
       <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f4fb85be7b7aa70a7c0f55c63fcd3ab1/jetified-debug-db-base-1.0.6/jars/classes.jar!/" />
       <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f4fb85be7b7aa70a7c0f55c63fcd3ab1/jetified-debug-db-base-1.0.6/res" />
       <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f4fb85be7b7aa70a7c0f55c63fcd3ab1/jetified-debug-db-base-1.0.6/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fdad627dbc03f4c21c9605993273ee2d/jetified-debug-db-base-1.0.6/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fdad627dbc03f4c21c9605993273ee2d/jetified-debug-db-base-1.0.6/AndroidManifest.xml" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fdad627dbc03f4c21c9605993273ee2d/jetified-debug-db-base-1.0.6/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.amitshekhar.android/debug-db-base/1.0.6/43c6abb777258b8e02b7a4f4aef44f5996ddf30f/debug-db-base-1.0.6-javadoc.jar!/" />

.idea/libraries/Gradle__com_facebook_stetho_stetho_1_5_1_aar.xml

@@ -3,6 +3,7 @@
     <ANNOTATIONS>
       <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d20b09848ce936fd0a38f787548625fb/jetified-stetho-1.5.1/annotations.zip!/" />
       <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fce90db6a21dd6386ea645855f8dd306/jetified-stetho-1.5.1/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62035fcaa1eb865fcb157c3556d5e2c8/jetified-stetho-1.5.1/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d20b09848ce936fd0a38f787548625fb/jetified-stetho-1.5.1/jars/classes.jar!/" />
@@ -11,6 +12,9 @@
       <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fce90db6a21dd6386ea645855f8dd306/jetified-stetho-1.5.1/jars/classes.jar!/" />
       <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fce90db6a21dd6386ea645855f8dd306/jetified-stetho-1.5.1/AndroidManifest.xml" />
       <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fce90db6a21dd6386ea645855f8dd306/jetified-stetho-1.5.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62035fcaa1eb865fcb157c3556d5e2c8/jetified-stetho-1.5.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62035fcaa1eb865fcb157c3556d5e2c8/jetified-stetho-1.5.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62035fcaa1eb865fcb157c3556d5e2c8/jetified-stetho-1.5.1/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.facebook.stetho/stetho/1.5.1/b71856fcb682e807ccec3a276e47c94944b6c6ea/stetho-1.5.1-javadoc.jar!/" />

.idea/libraries/Gradle__com_github_yuweiguocn_GreenDaoUpgradeHelper_v2_2_1_aar.xml

@@ -7,6 +7,9 @@
       <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/63f8cddfb70b6a7b209bd5d6c1e063f4/jetified-GreenDaoUpgradeHelper-v2.2.1/AndroidManifest.xml" />
       <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/63f8cddfb70b6a7b209bd5d6c1e063f4/jetified-GreenDaoUpgradeHelper-v2.2.1/jars/classes.jar!/" />
       <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/63f8cddfb70b6a7b209bd5d6c1e063f4/jetified-GreenDaoUpgradeHelper-v2.2.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/64bc4bf383f73107bbab717eba8415eb/jetified-GreenDaoUpgradeHelper-v2.2.1/AndroidManifest.xml" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/64bc4bf383f73107bbab717eba8415eb/jetified-GreenDaoUpgradeHelper-v2.2.1/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/64bc4bf383f73107bbab717eba8415eb/jetified-GreenDaoUpgradeHelper-v2.2.1/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.yuweiguocn/GreenDaoUpgradeHelper/v2.2.1/7aef2e7b4c18afb240f0e17af5d045f176d2b8ef/GreenDaoUpgradeHelper-v2.2.1-javadoc.jar!/" />

.idea/libraries/Gradle__com_orhanobut_logger_2_2_0_aar.xml

@@ -7,6 +7,9 @@
       <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6446fd50a6f5e7cd6a4876d9772e064e/jetified-logger-2.2.0/AndroidManifest.xml" />
       <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6446fd50a6f5e7cd6a4876d9772e064e/jetified-logger-2.2.0/jars/classes.jar!/" />
       <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6446fd50a6f5e7cd6a4876d9772e064e/jetified-logger-2.2.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/228ab0f5655028bde58fdc91b17d96e2/jetified-logger-2.2.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/228ab0f5655028bde58fdc91b17d96e2/jetified-logger-2.2.0/AndroidManifest.xml" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/228ab0f5655028bde58fdc91b17d96e2/jetified-logger-2.2.0/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.orhanobut/logger/2.2.0/98e69754ab23f7179137d8d2a0e3eea79200d746/logger-2.2.0-javadoc.jar!/" />

.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.iml

@@ -75,6 +75,9 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debug" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../../kurolibrary/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../../kurolibrary/build" />
     </content>
@@ -84,11 +87,11 @@
     <orderEntry type="module-library">
       <library name="Gradle: kaptGeneratedClasses">
         <CLASSES>
+          <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/debugUnitTest" />
+          <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/debugAndroidTest" />
           <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/release" />
           <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/releaseUnitTest" />
           <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/debug" />
-          <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/debugUnitTest" />
-          <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/debugAndroidTest" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

.idea/modules/kurotool/taxiapp-ktl.kurotool.iml

@@ -89,11 +89,11 @@
     <orderEntry type="module-library">
       <library name="Gradle: kaptGeneratedClasses">
         <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/debugAndroidTest" />
-          <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/releaseUnitTest" />
           <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/debug" />
-          <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/debugUnitTest" />
           <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/release" />
+          <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/releaseUnitTest" />
+          <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/debugUnitTest" />
+          <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/debugAndroidTest" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

app/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "net.sysolution.taxiapp"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 178
+        versionCode 188
-        versionName "3.3.3-beta26.3.6-debug"
+        versionName "3.3.3-beta26.3.3.8.3-release"
 
         //alphaxx - 预览版本,不会对外发布，由测试人员测试，会有很多bug
         //Betaxx - 公开测试版本，会发给其他工作人员，会有较多版本
@@ -47,6 +47,8 @@ android {
                  凭证信息可备份至conn,防止跑账号
             26.3.2 解决卸载重装后设备不在原来的分组问题
             26.3.3 解决直接升级后设备不播放广告或者等很久才播放问题
+            26.3.7 由于经常掉线，心跳改回30s发一次，重连时间改回10s,日志开关默认关闭
+            26.3.8 更换了播放器默认logo图,修改同步的时候出现logo问题，增加“查询是否设置过logo”功能
         **/
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/AndroidManifest.xml

@@ -22,10 +22,19 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppStartLoadTranslucent">
+        <service
+            android:name=".service.RemoteService"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.xixun.xy.conn.aidl.TaxiAppServer" />
+            </intent-filter>
+        </service>
+
         <receiver
             android:name=".logic.gps.GpsReceiver"
             android:enabled="true"
-            android:exported="true"></receiver>
+            android:exported="true" />
 
         <service
             android:name=".service.RebootService"

app/src/main/aidl/com/xixun/xy/conn/aidl/TaxiAppServer.aidl

@@ -0,0 +1,7 @@
+// TaxiAppServer.aidl
+package com.xixun.xy.conn.aidl;
+
+interface TaxiAppServer {
+         String executeJsonCommand(String json);
+         String getBackgroundType();
+}

app/src/main/java/cn/trans88/taxiappkotlin/Configurations.java

@@ -259,14 +259,14 @@ public class Configurations {
         context.getSharedPreferences("config", Context.MODE_PRIVATE).edit().putBoolean("enableWriteLog", b).apply();
     }
     public boolean loggerSwitch(){
-        return context.getSharedPreferences("config", Context.MODE_PRIVATE).getBoolean("loggerSwitch", false);
+        return context.getSharedPreferences("config", Context.MODE_PRIVATE).getBoolean("loggerSwitch", true);
     }
 
     public void loggerSwitchSave(boolean b){
         context.getSharedPreferences("config", Context.MODE_PRIVATE).edit().putBoolean("loggerSwitch", b).apply();
     }
     public boolean gpsSwitch(){
-        return context.getSharedPreferences("config", Context.MODE_PRIVATE).getBoolean("gpsSwitch", false);
+        return context.getSharedPreferences("config", Context.MODE_PRIVATE).getBoolean("gpsSwitch", true);
     }
 
     public void gpsSwitchSave(boolean b){
@@ -313,6 +313,22 @@ public class Configurations {
         context.getSharedPreferences("config", Context.MODE_PRIVATE).edit().putString("timedAdList", s).apply();
     }
 
+    public boolean isFirstInstalled(){
+        return context.getSharedPreferences("config", Context.MODE_PRIVATE).getBoolean("isFirstInstalled", true);
+    }
+
+    public void isFirstInstalledSave(boolean b){
+        context.getSharedPreferences("config", Context.MODE_PRIVATE).edit().putBoolean("isFirstInstalled", b).apply();
+    }
+
+    public String backgroundType(){
+        return context.getSharedPreferences("config", Context.MODE_PRIVATE).getString("backgroundType", "");
+    }
+
+    public void backgroundTypeSave(String s){
+        context.getSharedPreferences("config", Context.MODE_PRIVATE).edit().putString("backgroundType", s).apply();
+    }
+
 }
 
 

app/src/main/java/cn/trans88/taxiappkotlin/TaxiApp.kt

@@ -35,6 +35,7 @@ import kotlin.collections.HashMap
 class TaxiApp:Application() {
 
     private lateinit var daoSession: DaoSession
+    private lateinit var daoMaster: DaoMaster
 
     var nextVideoView:JVideoView? = null
 
@@ -74,7 +75,8 @@ class TaxiApp:Application() {
 
         val helperDaoDB = HelperDaoDB(this, "taxi-app-database.db", null)
         val db = helperDaoDB.writableDatabase
-        daoSession = DaoMaster(db).newSession()
+        daoMaster = DaoMaster(db)
+        daoSession = daoMaster.newSession()
 
         //add by yzd @20211130 用config替换原有的配置文件
         Configurations.config(this).init();
@@ -145,6 +147,14 @@ class TaxiApp:Application() {
         return daoSession
     }
 
+    /**
+     * 获取DaoMaster
+     * @return DaoMaster
+     */
+    fun getDaoMaster():DaoMaster{
+        return daoMaster
+    }
+
     private fun initKuroLog() {
 
         val file = File(filesDir, "/log")

app/src/main/java/cn/trans88/taxiappkotlin/aidl/localserver/TaxiServiceAIDL.kt

@@ -68,7 +68,7 @@ class TaxiServiceAIDL:Service() {
                             }
 
                             if (bindModel.server!=null && bindModel.server!=""){
-                                bindModel.tlsServer =bindModel.tlsServer+"/"
+                                bindModel.tlsServer = bindModel.tlsServer+"/"
                             }
 
                             ConnManger.bindAccount(bindModel, listener)
@@ -92,7 +92,7 @@ class TaxiServiceAIDL:Service() {
                             if (Configurations.config(TaxiApp.instance()).registerToken().isNotEmpty()){
                                 YoungUtil.YoungLog("GetAccountID")
                                 listener.onSuccess(Configurations.config(TaxiApp.instance()).registerToken())
-                            }else{
+                            } else {
                                 listener.onError("Token为空")
                             }
 

app/src/main/java/cn/trans88/taxiappkotlin/logic/Repository.kt

@@ -43,6 +43,7 @@ import kotlin.collections.ArrayList
  * 仓库层：判断调用的数据是从本地获取还是网络获取的
  */
 val myListMap = mutableMapOf<Int, ArrayList<Advertise>>()
+var myListMapTemp = mutableMapOf<Int, ArrayList<Advertise>>()
 object Repository {
     //    private val circularListMap = mapOf(AdvertiseType.NORMAL.ordinal to CircularList<Advertise>(),AdvertiseType.AREA.ordinal to CircularList<Advertise>())
     private val circularListMap = mutableMapOf<Int, CircularList<Advertise>>()
@@ -87,6 +88,7 @@ object Repository {
 
     fun getAdvertiseTEST(): Advertise? {
         val list = myListMap[getTestPlayLevels()]
+        val listTemp = myListMapTemp[getTestPlayLevels()]
         "广告数量：${list?.size}".loge()
 
         //#edit by ljh 2023/2/16
@@ -95,7 +97,7 @@ object Repository {
         advertise = if (isTimedAdvertise){
             getTestPlayAdvertise(taxiApp.timedAds)
         } else {
-            getTestPlayAdvertise(list)
+            getTestPlayAdvertise(list) ?: getTestPlayAdvertiseByTempList(listTemp)
         }
 //        val advertise = getTestPlayAdvertise(myListMap[getTestPlayLevels()])
         return advertise
@@ -161,6 +163,7 @@ object Repository {
         return null
     }
 
+
     /**
      * 拿到将要播放的广告
      */
@@ -224,6 +227,43 @@ object Repository {
         return null
     }
 
+    /**
+     * 拿到将要播放的广告
+     */
+    private fun getTestPlayAdvertiseByTempList(list: MutableList<Advertise>?): Advertise? {
+        YoungUtil.YoungLog("getTestPlayAdvertiseByTempList")
+        val currentTimeMillis = System.currentTimeMillis()
+        list?.let {
+            if (it.isEmpty()) {
+                "播放列表是空的".loge()
+                return null
+            }
+            //防止如果需求定点广告切换成普通广告，但是要继续上次普通广告的播放，然后现在的广告列表数改变，下标越界的情况
+//            if(currentListOrder>=list.size){
+//                currentListOrder=0
+//            }
+
+            for (index in 0..list.size) {
+
+                //防止下标越界
+                if (currentListOrder >= list.size) {
+                    currentListOrder = 0
+                }
+
+                //YoungUtil.YoungLog("当前播放的广告list位数 ： $currentListOrder")
+                val advertise = list[currentListOrder]
+
+                if (advertise.isAllowPlay()) {
+                    //YoungUtil.YoungLog("拿到广告花费时间 ：${System.currentTimeMillis() - currentTimeMillis}")
+                    YoungUtil.YoungLog("拿到广告:" + advertise.ad_id)
+                    return advertise
+                }
+            }
+
+        }
+        return null
+    }
+
 
     /**
      * 拿到应该播放的等级
@@ -277,7 +317,15 @@ object Repository {
         YoungUtil.YoungLog("refreshMyList 是否在主线程： ${Thread.currentThread().isMainThread()}")
 //        myListMap.clear()
 
+        //#edit by ljh @2023/6/29
         for (index in AdvertiseType.values().size downTo 0) {
+            //清空前先备份一下列表
+            myListMapTemp[index] = if (myListMap[index].isNullOrEmpty()){
+                ArrayList()
+            } else {
+                myListMap[index]!!
+            }
+            myListMap[index]?.clear()
             myListMap[index] = ArrayList()
         }
 
@@ -395,7 +443,7 @@ object Repository {
             }
 
             if (newAdvertise.isAllowPlay()) {
-                //#edit by ljh @2023/2/23 myListMap集合只存放不定时的广告
+                //#edit by ljh @2023/2/23 myListMap集合只存放不是定时插播的广告
                 if (!newAdvertise.isTimedAd){
                     "广告准备ok 加入Mylist 广告ad_id:${newAdvertise.ad_id},是否是最后一个广告：${newAdvertise.isLast},belongto: ${newAdvertise.belongTo}".loge("Repository")
                     myListMap[newAdvertise.belongTo]?.add(newAdvertise)
@@ -418,7 +466,6 @@ object Repository {
         //YoungUtil.YoungLog("刷新列表用时${last - currentTimeMillis}")
     }
 
-
     private fun oldAdvertiseToNewAdvertise(oldAdvertise: Advertise): Advertise {
         "oldAdvertise:$oldAdvertise，isCount:${oldAdvertise.isCount}".loge()
 

app/src/main/java/cn/trans88/taxiappkotlin/logic/dao/DaoUtil.kt

@@ -10,6 +10,7 @@ object DaoUtil {
 
     val taxiApp = TaxiApp.instance() as TaxiApp
     var daoSession:DaoSession = taxiApp.getDaoSession()
+    var daoMaster:DaoMaster = taxiApp.getDaoMaster()
 
     private var mOrderDao:OrderDao
     private var mPlayLoggerDao:PlayLoggerDao
@@ -57,6 +58,7 @@ object DaoUtil {
     @Synchronized
     fun getLocationDao(): LocationDao {
         return mLocationDao
+//        return daoMaster.newSession().locationDao
     }
 
     @Synchronized

app/src/main/java/cn/trans88/taxiappkotlin/logic/model/BackgroundType.kt

@@ -0,0 +1,9 @@
+package cn.trans88.taxiappkotlin.logic.model
+
+/**
+ *
+ * @Author： LJH
+ * @Time： 2023/6/28
+ * @description：
+ */
+data class BackgroundType(var background_type: String = "",var is_logo:Boolean = false)

app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ConnManger.kt

@@ -190,8 +190,6 @@ object ConnManger {
                         sendLocation()
 
                         WsManager.initWebSocket()
-
-
 //                        Settings.toJson()
                     }
 
@@ -436,14 +434,15 @@ object ConnManger {
             //edit by yzd @20211201
             //if (Settings.gpsSwitch) {
             if (Configurations.config(TaxiApp.instance()).gpsSwitch()) {
+//                "gpsSwitch on".loge()
                 val timer = KuroTimer()
                 timer.schedule(object : KuroTimerTask() {
                     override fun run() {
                         sendLocation()
                     }
-
                 }, 10000)
             } else {
+                "gpsSwitch off".loge()
                 val timer = KuroTimer()
                 timer.schedule(object : KuroTimerTask() {
                     override fun run() {
@@ -461,13 +460,14 @@ object ConnManger {
      * 播放次数到了，发送终止广告指令
      */
     fun sendOfflineAd(ad_id:String) {
-        val serverUrl = Configurations.config(TaxiApp.instance()).taxiServiceUrl()
+//        val serverUrl = Configurations.config(TaxiApp.instance()).taxiServiceUrl()
-        val baseUrl = if (serverUrl.contains("taxihub.cn")){
+//        val baseUrl = if (serverUrl.contains("taxihub.cn")){
-//            "https://taxihub.cn:2346"
+////            "https://taxihub.cn:2346"
-            "http://taxihub.cn:2346"
+//            "http://taxihub.cn:2346"
-        } else {
+//        } else {
-            "https://ledaips.com:2341"
+//            "https://ledaips.com:2341"
-        }
+//        }
+        val baseUrl = Configurations.config(TaxiApp.instance()).taxiBaseUrl()
         KuroExecutor.execute(Runnable {
             YoungUtil.YoungLog("sendOfflineAd in MainThread is ${Looper.getMainLooper().thread === Thread.currentThread()}")
             val deleteAdvertiseBean = DeleteAdvertiseBean()
@@ -516,13 +516,13 @@ object ConnManger {
      * 获取播放的总次数
      */
     fun getAdCount(advertise: Advertise){
-        val serverUrl = Configurations.config(TaxiApp.instance()).taxiServiceUrl()
+//        val serverUrl = Configurations.config(TaxiApp.instance()).taxiServiceUrl()
-        val baseUrl = if (serverUrl.contains("taxihub.cn")){
+//        val baseUrl = if (serverUrl.contains("taxihub.cn")){
-//            "https://taxihub.cn:2346"
+//            "http://taxihub.cn:2346"
-            "http://taxihub.cn:2346"
+//        } else {
-        } else {
+//            "https://ledaips.com:2341"
-            "https://ledaips.com:2341"
+//        }
-        }
+        val baseUrl = Configurations.config(TaxiApp.instance()).taxiBaseUrl()
         //edit by yzd @20211201
         //if (Settings.loggerSwitch) {
         ThreadUtil.executeBySingleThread(Runnable {
@@ -592,7 +592,9 @@ object ConnManger {
                     val requestJson: String = if (playLoggers.size < 20) {
                         ProcessingCommands.gson.toJson(playLoggers)
                     } else {
-                        ProcessingCommands.gson.toJson(playLoggers.subList(0, 19))
+//                        ProcessingCommands.gson.toJson(playLoggers.subList(0, 19))
+                        //#edit by ljh @2023/6/5 改成大批量看是否能减小流量消耗
+                        ProcessingCommands.gson.toJson(playLoggers)
                     }
 
                     val okHttpClient = OkHttpClient()
@@ -627,9 +629,11 @@ object ConnManger {
 //                            }
                             if (response.code == 200) {
                                 //#edit by ljh @2023/2/21
-                                playLoggers.forEach{
+//                                playLoggers.forEach{
-                                    DaoUtil.getPlayLogger().delete(it)
+//                                    DaoUtil.getPlayLogger().delete(it)
-                                }
+//                                }
+                                //#edit by ljh @2023/6/5 删除批量上传的日志
+                                DaoUtil.getPlayLogger().deleteAll()
                             }
                             "删除已上传的日志".logd()
                         }

app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ProcessingCommands.kt

@@ -191,8 +191,7 @@ object ProcessingCommands {
                 ConnManger.isBindOrTransfer = false
                 reconnect(1004, "长时间未收到心跳断开连接")
             }
-
+        },4*60*1000)
-        },3*60*1000)
     }
 
     /**
@@ -304,15 +303,42 @@ object ProcessingCommands {
             taxiApp.activity?.cancelCustomView()
         } else {
             when (busInfo.background_type) {
-                "route" -> downloadBusInfo(busInfo.media_id, "busLicence", HAOSHENG)
+                "route" -> {
-                "brake" -> downloadBusInfo(busInfo.media_id, "turnStop", HAOSHENG)
+                    saveBackgroundType("route")
-                "turn_left" -> downloadBusInfo(busInfo.media_id, "turnLeft", HAOSHENG)
+                    downloadBusInfo(busInfo.media_id, "busLicence", HAOSHENG)
-                "turn_right" -> downloadBusInfo(busInfo.media_id, "turnRight", HAOSHENG)
+                }
-                "vacant" -> downloadBusInfo(busInfo.media_id, "vacant", MAIDIER)
+                "brake" -> {
-                "hired" -> downloadBusInfo(busInfo.media_id, "hired", MAIDIER)
+                    saveBackgroundType("brake")
-                "no_service" -> downloadBusInfo(busInfo.media_id, "no_service", MAIDIER)
+                    downloadBusInfo(busInfo.media_id, "turnStop", HAOSHENG)
-                "booked" -> downloadBusInfo(busInfo.media_id, "booked", MAIDIER)
+                }
-                "logo" ->downloadBusInfo(busInfo.media_id, "logo", XIXUN)
+                "turn_left" -> {
+                    saveBackgroundType("turn_left")
+                    downloadBusInfo(busInfo.media_id, "turnLeft", HAOSHENG)
+                }
+                "turn_right" -> {
+                    saveBackgroundType("turn_right")
+                    downloadBusInfo(busInfo.media_id, "turnRight", HAOSHENG)
+                }
+                "vacant" -> {
+                    saveBackgroundType("vacant")
+                    downloadBusInfo(busInfo.media_id, "vacant", MAIDIER)
+                }
+                "hired" -> {
+                    saveBackgroundType("hired")
+                    downloadBusInfo(busInfo.media_id, "hired", MAIDIER)
+                }
+                "no_service" -> {
+                    saveBackgroundType("no_service")
+                    downloadBusInfo(busInfo.media_id, "no_service", MAIDIER)
+                }
+                "booked" -> {
+                    saveBackgroundType("booked")
+                    downloadBusInfo(busInfo.media_id, "booked", MAIDIER)
+                }
+                "logo" -> {
+                    saveBackgroundType(true)
+                    downloadBusInfo(busInfo.media_id, "logo", XIXUN)
+                }
                 else -> YoungUtil.YoungLog("设置车辆信息 未知type")
             }
         }
@@ -325,6 +351,38 @@ object ProcessingCommands {
         send(response)
     }
 
+    /**
+     * 保存自定义视图类型
+     * @param type String
+     */
+    fun saveBackgroundType(type:String){
+        val gson = Gson()
+        val backgroundTypeJson = Configurations.config(TaxiApp.instance()).backgroundType()
+        val backgroundType = if (backgroundTypeJson.isNotEmpty()){
+            gson.fromJson<BackgroundType>(backgroundTypeJson)
+        } else {
+            BackgroundType()
+        }
+        backgroundType.background_type = type
+        Configurations.config(TaxiApp.instance()).backgroundTypeSave(gson.toJson(backgroundType))
+    }
+
+    /**
+     * 保存自定义视图类型
+     * @param type String
+     */
+    fun saveBackgroundType(isLogo: Boolean){
+        val gson = Gson()
+        val backgroundTypeJson = Configurations.config(TaxiApp.instance()).backgroundType()
+        val backgroundType = if (backgroundTypeJson.isNotEmpty()){
+            gson.fromJson<BackgroundType>(backgroundTypeJson)
+        } else {
+            BackgroundType()
+        }
+        backgroundType.is_logo = isLogo
+        Configurations.config(TaxiApp.instance()).backgroundTypeSave(gson.toJson(backgroundType))
+    }
+
     private fun setLogWriteEnable(task: String, type: String){
         val b = JsonParser().parse(task).asJsonObject.get("turn_on").asBoolean
         val taskId = JsonParser().parse(task).asJsonObject.get("task_id").asString

app/src/main/java/cn/trans88/taxiappkotlin/logic/network/WsManager.kt

@@ -24,10 +24,10 @@ object WsManager {
 
     private var okHttpClient: OkHttpClient? = null
     private var mRequest: Request? = null
-//    private const val reconnectTime: Long = 10 * 1000
+    private const val reconnectTime: Long = 10 * 1000
-    private const val reconnectTime: Long = 30 * 1000
+//    private const val reconnectTime: Long = 30 * 1000
-    private const val heartbeatTime: Long = 120 * 1000
+//    private const val heartbeatTime: Long = 120 * 1000
-//    private const val heartbeatTime: Long = 30 * 1000
+    private const val heartbeatTime: Long = 30 * 1000
     private const val sendCurrentAdvertiseTime: Long = 10 *60 * 1000
     private val heartbeatContext: String = "beat"
 

app/src/main/java/cn/trans88/taxiappkotlin/service/RemoteService.kt

@@ -0,0 +1,33 @@
+package cn.trans88.taxiappkotlin.service
+
+import android.app.Service
+import android.content.Intent
+import android.os.IBinder
+import cn.trans88.taxiappkotlin.Configurations
+import cn.trans88.taxiappkotlin.TaxiApp
+import cn.trans88.taxiappkotlin.logic.model.BackgroundType
+import com.google.gson.Gson
+import com.xixun.xy.conn.aidl.TaxiAppServer
+
+class RemoteService : Service() {
+
+    val taxiAppServer = object:TaxiAppServer.Stub(){
+        override fun executeJsonCommand(json: String?): String {
+            return "当前taxiApp版本不支持直接走conn，请使用27版本"
+        }
+
+        override fun getBackgroundType(): String {
+            var backgroundTypeJson = Configurations.config(TaxiApp.instance()).backgroundType()
+            if (backgroundTypeJson.isEmpty()){
+                val backgroundType = BackgroundType()
+                backgroundTypeJson = Gson().toJson(backgroundType)
+            }
+            return backgroundTypeJson
+        }
+
+    }
+
+    override fun onBind(intent: Intent): IBinder {
+        return taxiAppServer
+    }
+}

app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayActivity.kt

@@ -100,10 +100,18 @@ class PlayActivity : AppCompatActivity(), NetworkCallback, BusCallback, OnScreen
 //        }
         taxiApp.activity = this
 
-        //默认关闭日志
+
-        "default close log...".logd()
+        val isFirstInstalled = Configurations.config(this).isFirstInstalled
-        Configurations.config(this).gpsSwitchSave(false)
+        if (isFirstInstalled){
-        Configurations.config(this).loggerSwitchSave(false)
+            //升级后打开日志
+            Configurations.config(this).gpsSwitchSave(false)
+            Configurations.config(this).loggerSwitchSave(false)
+            Configurations.config(this).isFirstInstalledSave(false)
+        }
+
+        val loggerSwitch = Configurations.config(this).loggerSwitch()
+        val gpsSwitch = Configurations.config(this).gpsSwitch()
+        "loggerSwitch ------> $loggerSwitch,gpsSwitch -----------> $gpsSwitch".logd()
 
         JoeyDownloadManager.getInstance().setCallBack(this)
 

app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayView.kt

@@ -332,7 +332,7 @@ fun FrameLayout.playLogo() {
             .into(image)
     } else {
         Glide.with(this)
-            .load(R.mipmap.logo)
+            .load(R.mipmap.logo2)
             .apply(glideOptions)
             .into(image)
     }

app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayViewModel.kt

@@ -523,13 +523,15 @@ class PlayViewModel(val lifecycle: Lifecycle, private val fl_play: FrameLayout,
 
             } else {
                 YoungUtil.YoungLog("收到的广告为空停止播放")
-//                val advertises = getAdvertise().queryBuilder().orderDesc(Properties.CreateAt).limit(5).list()
+                //#edit by ljh @2023/6/28
-//                if (advertises.isNullOrEmpty()){
+                //播放logo问题,播放logo前查一下播放列表是否含有广告
+//                val list = getAdvertise().queryBuilder().limit(2).list()
+////                val list = myListMap[Repository.getTestPlayLevels()]
+//                "当前是否存有广告：${list?.size}".loge()
+//                if (list.isNullOrEmpty()){
 //                    stopPlay()
 //                } else {
-//                    "当前播放列表不为空，playList is not null".logd()
+//                    refreshAdvertise()
-//                    handler.removeCallbacksAndMessages(null)
-//                    RefreshPlayer.refresh()
 //                }
                 stopPlay()
             }
@@ -972,7 +974,7 @@ class PlayViewModel(val lifecycle: Lifecycle, private val fl_play: FrameLayout,
                             }
                         }
                     } else {
-                        //YoungUtil.YoungLog("当前位置坐标距离上一个点小于50，不记录")
+                        YoungUtil.YoungLog("当前位置坐标距离上一个点小于50，不记录")
                         return
                     }
                 } else {
@@ -1029,6 +1031,7 @@ class PlayViewModel(val lifecycle: Lifecycle, private val fl_play: FrameLayout,
             this.longitude = longitude
             this.latitude = latitude
         }
+
         YoungUtil.YoungLog("setAdvertiseByPosition adid：${advertise.ad_id}")
 
         advertise.toString().loge()

app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayerRule.kt

@@ -51,7 +51,7 @@ fun Advertise.isReady(): Boolean {
                         ready = false
                     }
                 }else{
-                    //YoungUtil.YoungLog("${this.pathName}的广告本地不存在，重新下载 ready返回false")
+                    YoungUtil.YoungLog("${this.pathName}的广告本地不存在，重新下载 ready返回false")
                     file.delete()
                     val advertise = getAdvertise().queryBuilder().where(Properties.Ad_id.eq(this.ad_id)).unique()
                     if (advertise != null){

build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml

@@ -0,0 +1,195 @@
+<?xml version="1.0" ?>
+<sdk_metadata>
+  <library  groupId="com.urbanairship.android" artifactId="urbanairship-sdk" recommended-version="9.3.1" >
+    <versions from="9.1.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-sdk:9.1.0" />
+    <versions from="9.0.0" to="9.0.4" status="deprecated" description="Version is known issues with in-app automation. Please update to version &lt;current&gt; as soon as possible." />
+    <versions from="8.9.1" to="8.9.2" status="deprecated" description="Version is known to have stability issues. Please update to version &lt;current&gt; as soon as possible. See &lt;url&gt; for more details." url="https://github.com/urbanairship/android-library/blob/master/CHANGELOG.md#version-893---october-17-2017" />
+    <versions from="6.1.4" to="8.7.0" status="deprecated" description="Version is known to have Android O compatibility issues. Please update to version &lt;current&gt; as soon as possible." />
+    <versions from="9.3.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-sdk:9.3.0" />
+    <versions from="9.3.1" status="recommended" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-sdk:9.3.1" />
+  </library>
+  <library  groupId="com.urbanairship.android" artifactId="urbanairship-core" recommended-version="9.3.1" >
+    <versions from="9.1.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-core:9.1.0" />
+    <versions from="9.3.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-core:9.3.0" />
+    <versions from="9.3.1" status="recommended" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-core:9.3.1" />
+  </library>
+  <library  groupId="com.urbanairship.android" artifactId="urbanairship-fcm" recommended-version="9.3.1" >
+    <versions from="9.1.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-fcm:9.1.0" />
+    <versions from="9.3.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-fcm:9.3.0" />
+    <versions from="9.3.1" status="recommended" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-fcm:9.3.1" />
+  </library>
+  <library  groupId="com.urbanairship.android" artifactId="urbanairship-gcm" recommended-version="9.3.1" >
+    <versions from="9.1.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-gcm:9.1.0" />
+    <versions from="9.3.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-gcm:9.3.0" />
+    <versions from="9.3.1" status="recommended" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-gcm:9.3.1" />
+  </library>
+  <library  groupId="com.urbanairship.android" artifactId="urbanairship-adm" recommended-version="9.3.1" >
+    <versions from="9.1.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-adm:9.1.0" />
+    <versions from="9.3.0" status="recommended" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-adm:9.3.0" />
+    <versions from="9.3.1" status="recommended" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-adm:9.3.1" />
+  </library>
+  <library  groupId="com.tune" artifactId="tune-marketing-console-sdk" recommended-version="5.3.0" >
+    <versions from="5.3.0" version-literal="com.tune.BuildConfig.5.3.0" description="Bug affecting SDK data quality" />
+    <versions from="5.2.1" version-literal="com.tune.BuildConfig.5.2.1" />
+    <versions from="5.2.0" version-literal="com.tune.BuildConfig.5.2.0" />
+    <versions from="5.1.1" status="deprecated" version-literal="com.tune.BuildConfig.5.1.1" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="5.0.0" to="5.0.2" status="deprecated" version-literal="com.tune.BuildConfig.5.0.0" description="Bug affecting SDK data quality" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.15.2" to="4.16.0" status="deprecated" version-literal="com.tune.BuildConfig.4.15.2" description="Bug affecting SDK data quality" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.15.1" version-literal="com.tune.BuildConfig.4.15.1" description="Bug affecting SDK performance" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.15.0" version-literal="com.tune.BuildConfig.4.15.0" description="Bug affecting SDK performance" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.14.0" version-literal="com.tune.BuildConfig.4.14.0" description="Bug affecting SDK performance" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.13.0" status="deprecated" version-literal="com.tune.BuildConfig.4.13.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.12.1" status="deprecated" version-literal="com.tune.BuildConfig.4.12.1" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.12.0" status="deprecated" version-literal="com.tune.BuildConfig.4.12.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.11.1" status="deprecated" version-literal="com.tune.BuildConfig.4.11.1" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.11.0" status="deprecated" version-literal="com.tune.BuildConfig.4.11.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.10.2" version-literal="com.tune.BuildConfig.4.10.2" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.10.1" version-literal="com.tune.BuildConfig.4.10.1" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.10.0" version-literal="com.tune.BuildConfig.4.10.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.9.0" version-literal="com.tune.BuildConfig.4.9.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.8.0" to="4.8.1" version-literal="com.tune.BuildConfig.4.8.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="4.0.0" to="4.7.1" status="deprecated" version-literal="com.tune.BuildConfig.4.0.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="3.0.0" to="3.11.4" status="deprecated" version-literal="com.tune.BuildConfig.3.0.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
+    <versions from="0.0.0" to="3.0.0" status="deprecated" description="Bug affecting app stability" />
+  </library>
+  <library  groupId="com.android.volley" artifactId="volley" recommended-version="1.1.0" >
+    <versions from="1.1.0" />
+    <versions from="1.1.0-rc2" status="deprecated" description="Bug affecting app stability" url="https://github.com/google/volley/releases" />
+    <versions from="1.1.0-rc1" status="deprecated" description="Bug affecting app stability" url="https://github.com/google/volley/releases" />
+    <versions from="1.0.0" status="deprecated" description="Bug affecting app stability" url="https://github.com/google/volley/releases" />
+  </library>
+  <library groupId="com.crashlytics.sdk.android" artifactId="answers" recommended-version="17.4.0">
+    <versions from="1.0.0" to="1.4.7" status="deprecated" description="Fabric Answers is deprecated. To continue getting real-time analytics, switch over to using Google Analytics.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/switch-to-analytics." url="https://firebase.google.com/docs/crashlytics/switch-to-analytics?platform=android" />
+  </library>
+  <library groupId="com.crashlytics.sdk.android" artifactId="crashlytics" recommended-version="17.2.2">
+    <versions from="2.0.0" to="2.10.1" status="deprecated" description="The Fabric Crashlytics SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/upgrade-sdk" url="https://firebase.google.com/docs/crashlytics/upgrade-sdk?platform=android" />
+  </library>
+  <library groupId="com.crashlytics.sdk.android" artifactId="crashlytics-core" recommended-version="17.2.2">
+    <versions from="2.0.0" to="2.7.0" status="deprecated" description="The Fabric Crashlytics SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/upgrade-sdk" url="https://firebase.google.com/docs/crashlytics/upgrade-sdk?platform=android" />
+  </library>
+  <library groupId="com.crashlytics.sdk.android" artifactId="crashlytics-ndk" recommended-version="17.2.2">
+    <versions from="0.5.0" to="2.1.1" status="deprecated" description="The Fabric Crashlytics SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/upgrade-sdk" url="https://firebase.google.com/docs/crashlytics/upgrade-sdk?platform=android" />
+  </library>
+  <library  groupId="com.google.guava" artifactId="guava" recommended-version="24.1-jre" >
+    <versions from="24.1-jre" />
+  </library>
+  <library  groupId="com.google.guava" artifactId="guava" recommended-version="25.0-android" >
+    <versions from="25.0-android" />
+    <versions from="24.1.1-android" status="insecure" description="Moderate security vulnerability" url="https://github.com/google/guava/wiki/CVE-2018-10237" />
+    <versions from="24.1-android" status="deprecated" description="Bug affecting app performance" url="https://github.com/google/guava/releases" />
+    <versions from="24.0-android" status="deprecated" description="Bug affecting app performance" url="https://github.com/google/guava/releases" />
+  </library>
+  <library  groupId="com.google.firebase" artifactId="firebase-analytics" recommended-version="15.0.0" >
+    <versions from="15.0.0" />
+    <versions from="12.0.1" />
+    <versions from="12.0.0" />
+    <versions from="11.8.0" />
+    <versions from="11.6.2" />
+    <versions from="11.6.0" />
+    <versions from="11.4.2" />
+    <versions from="11.4.0" />
+    <versions from="11.2.2" />
+    <versions from="11.2.0" />
+    <versions from="11.0.4" />
+    <versions from="11.0.2" />
+    <versions from="11.0.1" />
+    <versions from="11.0.0" />
+    <versions from="10.2.6" />
+    <versions from="10.2.4" />
+    <versions from="10.2.1" />
+    <versions from="10.2.0" />
+    <versions from="10.0.1" />
+    <versions from="10.0.0" />
+    <versions from="9.8.0" />
+    <versions from="9.6.1" />
+    <versions from="9.6.0" />
+    <versions from="9.4.0" />
+    <versions from="9.2.1" />
+    <versions from="9.2.0" />
+    <versions from="9.0.2" />
+    <versions from="9.0.1" />
+    <versions from="9.0.0" />
+  </library>
+  <library  groupId="com.google.firebase" artifactId="firebase-appcheck-safetynet">
+    <versions from="16.0.0-beta01" to="16.0.0-beta01" status="deprecated" description="The SafetyNet Attestation API is deprecated and has been replaced by the Play Integrity API. Before June 2023, migrate to the Firebase App Check SDK for Play Integrity by following https://firebase.google.com/docs/app-check/android/play-integrity-provider." url="https://developer.android.com/training/safetynet/deprecation-timeline"/>
+    <versions from="16.0.0-beta02" to="16.0.0-beta02" status="deprecated" description="The SafetyNet Attestation API is deprecated and has been replaced by the Play Integrity API. Before June 2023, migrate to the Firebase App Check SDK for Play Integrity by following https://firebase.google.com/docs/app-check/android/play-integrity-provider." url="https://developer.android.com/training/safetynet/deprecation-timeline"/>
+    <versions from="16.0.0-beta03" to="16.0.0-beta03" status="deprecated" description="The SafetyNet Attestation API is deprecated and has been replaced by the Play Integrity API. Before June 2023, migrate to the Firebase App Check SDK for Play Integrity by following https://firebase.google.com/docs/app-check/android/play-integrity-provider." url="https://developer.android.com/training/safetynet/deprecation-timeline"/>
+    <versions from="16.0.0-beta04" to="16.0.0-beta04" status="deprecated" description="The SafetyNet Attestation API is deprecated and has been replaced by the Play Integrity API. Before June 2023, migrate to the Firebase App Check SDK for Play Integrity by following https://firebase.google.com/docs/app-check/android/play-integrity-provider." url="https://developer.android.com/training/safetynet/deprecation-timeline"/>
+    <versions from="16.0.0-beta05" to="16.0.0-beta05" status="deprecated" description="The SafetyNet Attestation API is deprecated and has been replaced by the Play Integrity API. Before June 2023, migrate to the Firebase App Check SDK for Play Integrity by following https://firebase.google.com/docs/app-check/android/play-integrity-provider." url="https://developer.android.com/training/safetynet/deprecation-timeline"/>
+    <versions from="16.0.0-beta06" to="16.0.0-beta06" status="deprecated" description="The SafetyNet Attestation API is deprecated and has been replaced by the Play Integrity API. Before June 2023, migrate to the Firebase App Check SDK for Play Integrity by following https://firebase.google.com/docs/app-check/android/play-integrity-provider." url="https://developer.android.com/training/safetynet/deprecation-timeline"/>
+    <versions from="16.0.0" status="deprecated" description="The SafetyNet Attestation API is deprecated and has been replaced by the Play Integrity API. Before June 2023, migrate to the Firebase App Check SDK for Play Integrity by following https://firebase.google.com/docs/app-check/android/play-integrity-provider." url="https://developer.android.com/training/safetynet/deprecation-timeline"/>
+  </library>
+  <library groupId="com.google.firebase" artifactId="firebase-config">
+    <versions from="21.1.0" to="21.1.0" status="deprecated" description="Bug affecting some locales causing HTTP errors" url="https://firebase.google.com/docs/remote-config/get-started?platform=android" />
+  </library>
+  <library groupId="com.google.firebase" artifactId="firebase-crashlytics" recommended-version="18.3.1">
+    <versions from="17.0.0-beta01" to="17.0.0-beta01" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
+    <versions from="17.0.0-beta02" to="17.0.0-beta02" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
+    <versions from="17.0.0-beta03" to="17.0.0-beta03" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
+    <versions from="17.0.0-beta04" to="17.0.0-beta04" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
+    <versions from="18.3.0" to="18.3.0" status="deprecated" description="We detected an issue in this version of the Crashlytics Android SDK. We strongly recommend either using v18.2.13 or earlier or upgrading to v18.3.1+." url="https://github.com/firebase/firebase-android-sdk/issues/4223" />
+  </library>
+  <library groupId="com.google.firebase" artifactId="firebase-crashlytics-ndk" recommended-version="18.3.2">
+    <versions from="17.0.0-beta01" to="17.0.0-beta01" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
+    <versions from="17.0.0-beta02" to="17.0.0-beta02" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
+    <versions from="17.0.0-beta03" to="17.0.0-beta03" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
+    <versions from="17.0.0-beta04" to="17.0.0-beta04" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
+    <versions from="18.3.0" to="18.3.0" status="deprecated" description="We detected an issue in this version of the Crashlytics Android SDK. We strongly recommend either using v18.2.13 or earlier or upgrading to v18.3.1+." url="https://github.com/firebase/firebase-android-sdk/issues/4223" />
+    <versions from="18.3.1" to="18.3.1" status="deprecated" description="We detected an issue in this version of the Crashlytics Android SDK. We strongly recommend either using v18.2.13 or earlier or upgrading to v18.3.2+." url="https://github.com/firebase/firebase-android-sdk/issues/4313" />
+  </library>
+  <library  groupId="com.google.firebase" artifactId="firebase-messaging" recommended-version="20.1.2" >
+    <versions from="20.1.1" status="deprecated" description="Bug affecting app stability" url="https://firebase.google.com/support/release-notes/android#messaging_v20-1-1" />
+  </library>
+  <library  groupId="com.google.firebase" artifactId="firebase-ml-vision">
+    <versions from="15.0.0" to="24.1.0" status="deprecated" description="For more information, refer to documentation for specific features.&#13;&#10;Text recognition: https://firebase.google.com/docs/ml/android/recognize-text&#13;&#10;Image labeling: https://firebase.google.com/docs/ml/android/label-images&#13;&#10;Landmark recognition: https://firebase.google.com/docs/ml/android/recognize-landmarks " />
+  </library>
+  <library  groupId="com.google.firebase" artifactId="firebase-ml-model-interpreter">
+    <versions from="15.0.0" to="22.0.4" status="deprecated" description="The Firebase ML Model Interpreter library is deprecated in favor of the Firebase ML Model Downloader library. For more information, visit https://firebase.google.com/docs/ml/android/use-custom-models" />
+  </library>
+
+  <library  groupId="com.google.firebase" artifactId="firebase-perf">
+    <versions to="16.2.1" status="deprecated" description="This version will soon be deprecated. Update to version 19.0.10 or higher to get real time performance data. For more information, visit https://firebase.google.com/docs/perf-mon/troubleshooting" url="https://firebase.google.com/docs/perf-mon/troubleshooting?platform=android#faq-real-time-data"/>
+  </library>
+
+  <library  groupId="com.google.dagger" artifactId="dagger-android" recommended-version="2.35.1" >
+    <versions from="2.15" />
+    <versions from="2.14.1" status="deprecated" description="Bug affecting SDK performance" url="https://github.com/google/dagger/releases/tag/2.15" />
+    <versions from="2.14" status="deprecated" description="Bug affecting SDK performance" url="https://github.com/google/dagger/releases/tag/2.15" />
+    <versions from="2.13" status="deprecated" description="Bug affecting app performance" url="https://github.com/google/dagger/releases/tag/2.15" />
+    <versions from="2.12" status="deprecated" description="Bug affecting app performance" url="https://github.com/google/dagger/releases/tag/2.15" />
+    <versions from="2.11" status="deprecated" description="Bug affecting SDK performance" url="https://github.com/google/dagger/releases/tag/2.15" />
+    <versions from="2.11-rc2" status="deprecated" description="Bug affecting SDK performance" url="https://github.com/google/dagger/releases/tag/2.15" />
+    <versions from="2.11-rc1" status="deprecated" description="Bug affecting SDK performance" url="https://github.com/google/dagger/releases/tag/2.15" />
+    <versions from="2.10" status="deprecated" url="https://github.com/google/dagger/releases/tag/2.15" />
+  </library>
+  <library  groupId="AppsFlyer" artifactId="af-android-sdk" recommended-version="4.8.10" >
+    <versions from="4.8.9" version-literal="!SDK-VERSION-STRING!:com.appsflyer:af-android-sdk:4.8.9" />
+    <versions from="4.8.10" version-literal="!SDK-VERSION-STRING!:com.appsflyer:af-android-sdk:4.8.10" />
+  </library>
+  <library  groupId="com.kochava" artifactId="tracker" recommended-version="3.4.0" >
+    <versions from="3.4.0" />
+    <versions from="3.3.1" version-literal="&quot;AndroidTracker 3.3.1&quot;, &quot;control.kochava.com&quot;" />
+    <versions from="3.3.0" version-literal="&quot;AndroidTracker 3.3.0&quot;, &quot;control.kochava.com&quot;" />
+    <versions from="3.2.0" version-literal="&quot;AndroidTracker 3.2.0&quot;, &quot;control.kochava.com&quot;" />
+    <versions from="3.1.1" version-literal="&quot;AndroidTracker 3.1.1&quot;, &quot;control.kochava.com&quot;" />
+    <versions from="3.1.0" status="deprecated" version-literal="&quot;AndroidTracker 3.1.0&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="3.0.0" status="deprecated" version-literal="&quot;AndroidTracker 3.0.0&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="20170303" status="deprecated" version-literal="&quot;Android20170303&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="20170216" status="deprecated" version-literal="&quot;Android20170216&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="20170127" status="deprecated" version-literal="&quot;Android20170127&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="20170106" status="deprecated" version-literal="&quot;Android20170106&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="20161122" status="deprecated" version-literal="&quot;Android20161122&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="20160914" status="deprecated" version-literal="&quot;Android20160914&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="20160902" status="deprecated" version-literal="&quot;Android20160902&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="20160811" status="deprecated" version-literal="&quot;Android20160811&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="20160615" status="deprecated" version-literal="&quot;Android20160615&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="20160427" status="deprecated" version-literal="&quot;Android20160427&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="20160222" status="deprecated" version-literal="&quot;Android20160222&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="20151109" status="deprecated" version-literal="&quot;Android20151109&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="20150511" status="deprecated" version-literal="&quot;Android20150511&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
+    <versions from="20150312" status="insecure" version-literal="&quot;Android20150312&quot;, &quot;control.kochava.com&quot;" description="Moderate security vulnerability" />
+    <versions from="20150128" status="insecure" version-literal="&quot;Android20150128&quot;, &quot;control.kochava.com&quot;" description="Moderate security vulnerability" />
+    <versions from="20141023" status="insecure" version-literal="&quot;Android20141023&quot;, &quot;control.kochava.com&quot;" description="Moderate security vulnerability" />
+    <versions from="20140825" status="insecure" version-literal="&quot;Android20140825&quot;, &quot;control.kochava.com&quot;" description="Moderate security vulnerability" />
+  </library>
+</sdk_metadata>

debug/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":187,"versionName":"3.3.3-beta26.3.3.8.2-debug","enabled":true,"outputFile":"TaxiApp_v3.3.3-beta26.3.3.8.2-debug{187}.apk","fullName":"debug","baseName":"debug","dirName":""},"path":"TaxiApp_v3.3.3-beta26.3.3.8.2-debug{187}.apk","properties":{}}]

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.
-#Tue Apr 18 13:34:15 GMT+08:00 2023
+#Wed Jun 28 13:44:25 GMT+08:00 2023
 sdk.dir=D\:\\Android\\sdk

release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":178,"versionName":"3.3.3-beta26.3.5-release","enabled":true,"outputFile":"TaxiApp_v3.3.3-beta26.3.5-release{178}.apk","fullName":"release","baseName":"release","dirName":""},"path":"TaxiApp_v3.3.3-beta26.3.5-release{178}.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":188,"versionName":"3.3.3-beta26.3.3.8.3-release","enabled":true,"outputFile":"TaxiApp_v3.3.3-beta26.3.3.8.3-release{188}.apk","fullName":"release","baseName":"release","dirName":""},"path":"TaxiApp_v3.3.3-beta26.3.3.8.3-release{188}.apk","properties":{}}]