新增LedOkAPP清除节目功能

app/build.gradle

@@ -24,7 +24,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 259
-        versionName "3.3.3-beta26.4.1.7-release"
+        versionName "3.3.3-beta26.4.1.8-release"
 
         //alphaxx - 预览版本,不会对外发布，由测试人员测试，会有很多bug
         //Betaxx - 公开测试版本，会发给其他工作人员，会有较多版本
@@ -71,6 +71,7 @@ android {
            3.3.3-beta26.4.1.6-release 修复有计次广告的时候重启后过了好几分钟才播的问题,2分钟存一次静止点
            3.3.3-beta26.4.1.7-release 增加分时段+计次功能,修复到次数的广告暂停不及时
                                       暂没解决实际播放次数和上传次数不一致,因为日志大于10条才上传
+           3.3.3-beta26.4.1.8-release 新增ledokAPP发节目
         **/
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/cn/trans88/taxiappkotlin/ledok/TaskSocketServer.kt

@@ -5,6 +5,8 @@ import android.util.Log
 import cn.trans88.taxiappkotlin.R
 import cn.trans88.taxiappkotlin.TaxiApp
 import cn.trans88.taxiappkotlin.logic.network.ConnManger
+import cn.trans88.taxiappkotlin.ui.play.PlayActivity
+import com.google.android.exoplayer2.ui.PlayerView
 import com.google.gson.GsonBuilder
 import com.trs88.kurolibrary.log.KuroLog
 import java.io.BufferedReader
@@ -448,6 +450,22 @@ class TaskSocketServer(private val context: Context, port: Int) {
                     dos = null
                     file = null
                     //TaskProcessor.getInstance(context).updateSourceFile(new SourceFile(cmd.id, servant.getCanUsedPath(context), FileState.Is_Downloaded));
+                } else if (cmd._type == "DelPrograms") {
+                    Log.d(TAG, "processPackage: DelPrograms")
+                    try {
+                        PlayActivity.instance()?.runOnUiThread {
+                            PlayActivity.instance()?.getPlayViewModel()?.playLogo()
+                        }
+                        LedOkActivity.instance()?.finish()
+                        File("$downloadDir/programs")?.deleteOnExit()
+                        val ack = "{\"_type\":\"AckSuccess\"}"
+                        sendDataToClient(ack)
+                        Log.d(TAG, "processPackage: 清楚节目")
+                    }catch (e: Exception) {
+                        Log.d(TAG, "processPackage: ${e.printStackTrace()}")
+                        val ack = "{\"_type\":\"AckFailed\"}"
+                        sendDataToClient(ack)
+                    }
                 }
 //                else if (cmd._type == "BindAccount") {
 //                    Log.d(TAG, "processPackage: BindAccount")

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

@@ -77,6 +77,12 @@ const val NOVALIDTIME = 23646086L
 class PlayActivity : AppCompatActivity(), NetworkCallback, BusCallback, OnScreenSizeListener {
     val CREATE_VIEW_MSG = 11111111
 
+    companion object {
+        private var instance: PlayActivity? = null
+        fun instance() = instance
+    }
+
+
     //glide配置
     private val glideOptions: RequestOptions = RequestOptions()
         .diskCacheStrategy(DiskCacheStrategy.NONE)
@@ -90,6 +96,9 @@ class PlayActivity : AppCompatActivity(), NetworkCallback, BusCallback, OnScreen
     private lateinit var configurations: Configurations
 
     private lateinit var playViewModel: PlayViewModel
+    fun getPlayViewModel(): PlayViewModel {
+        return playViewModel
+    }
 
     private var saveRuntimeTimer: Timer? = null
     private var startSaveRunTimer: Timer? = null
@@ -109,6 +118,7 @@ class PlayActivity : AppCompatActivity(), NetworkCallback, BusCallback, OnScreen
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         YoungUtil.YoungLog("playActivity onCreate")
+        instance = this
         TaxiApp.isActive = true
         ConnManger.sendGPSLogSwitch = false
         ConnManger.sendPlayerLogSwitch = false