From ce678b8741c6f03e31ce263331246bd07454cdf7 Mon Sep 17 00:00:00 2001
From: Li ZongYing <lizongying@msn.com>
Date: Sun, 11 Feb 2024 10:14:23 +0800
Subject: [PATCH] test release api

---
 app/src/main/java/com/lizongying/mytv/Request.kt     | 12 +++++++++---
 .../main/java/com/lizongying/mytv/api/ApiClient.kt   |  4 +---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/lizongying/mytv/Request.kt b/app/src/main/java/com/lizongying/mytv/Request.kt
index cd652ef..fa9e68e 100644
--- a/app/src/main/java/com/lizongying/mytv/Request.kt
+++ b/app/src/main/java/com/lizongying/mytv/Request.kt
@@ -74,7 +74,7 @@ class Request {
                         Log.i(TAG, "token ${liveInfo.data.token}")
                         ysp?.token = liveInfo.data.token
                         fetchVideo(tvModel, cookie)
-                    }  else {
+                    } else {
                         Log.e(TAG, "$title token error")
                         if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                             tvModel.retryTimes++
@@ -144,7 +144,13 @@ class Request {
         tvModel.seq = 0
         val data = ysp?.switch(tvModel)
         val request = data?.let { LiveInfoRequest(it) }
-        call = request?.let { yspApiService.getLiveInfo("guid=${ysp?.getGuid()}; $cookie", ysp!!.token, it) }
+        call = request?.let {
+            yspApiService.getLiveInfo(
+                "guid=${ysp?.getGuid()}; $cookie",
+                ysp!!.token,
+                it
+            )
+        }
 
         call?.enqueue(object : Callback<LiveInfo> {
             override fun onResponse(call: Call<LiveInfo>, response: Response<LiveInfo>) {
@@ -307,7 +313,7 @@ class Request {
             yspTokenService.getInfo()
                 .enqueue(object : Callback<Info> {
                     override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                        if (response.isSuccessful) {
+                        if (response.isSuccessful && response.body()?.data?.token != null) {
                             token = response.body()?.data?.token!!
                             Log.i(TAG, "info success $token")
                             val cookie =
diff --git a/app/src/main/java/com/lizongying/mytv/api/ApiClient.kt b/app/src/main/java/com/lizongying/mytv/api/ApiClient.kt
index 556f6b3..c3ef3ec 100644
--- a/app/src/main/java/com/lizongying/mytv/api/ApiClient.kt
+++ b/app/src/main/java/com/lizongying/mytv/api/ApiClient.kt
@@ -5,8 +5,6 @@ import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.converter.protobuf.ProtoConverterFactory
-import java.net.InetSocketAddress
-import java.net.Proxy
 import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
@@ -40,7 +38,7 @@ class ApiClient {
 
     val releaseService: ReleaseService by lazy {
         Retrofit.Builder()
-            .baseUrl(devUrl)
+            .baseUrl(myUrl)
             .client(okHttpClient)
             .addConverterFactory(GsonConverterFactory.create())
             .build().create(ReleaseService::class.java)