Bläddra i källkod

fix: 网络架构问题修复(备用域名为空会使用localhost域名发起网络请求)

DoggyZhang 2 dagar sedan
förälder
incheckning
ac21c159a2

+ 3 - 3
app/dependencies/releaseRuntimeClasspath.txt

@@ -154,7 +154,7 @@ com.gami.android:frame-aab:1.0.0
 com.gami.android:frame-apm:1.0.0
 com.gami.android:frame-audio:1.0.0
 com.gami.android:frame-base:1.0.0
-com.gami.android:frame-bom:1.0.0
+com.gami.android:frame-bom:1.0.1
 com.gami.android:frame-coroutine:1.0.0
 com.gami.android:frame-crash:1.0.0
 com.gami.android:frame-data:1.0.0
@@ -168,10 +168,10 @@ com.gami.android:frame-googleservice:1.0.0
 com.gami.android:frame-guide:1.0.0
 com.gami.android:frame-image:1.0.0
 com.gami.android:frame-locale:1.0.0
-com.gami.android:frame-log:1.0.0
+com.gami.android:frame-log:1.0.1
 com.gami.android:frame-media:1.0.0
 com.gami.android:frame-mvvm:1.0.0
-com.gami.android:frame-network:1.0.0
+com.gami.android:frame-network:1.0.1
 com.gami.android:frame-oss:1.0.0
 com.gami.android:frame-router-annotation:1.0.0
 com.gami.android:frame-router-api:1.0.0

+ 0 - 20
app/src/main/java/com/adealink/weparty/network/NetworkConfig.kt

@@ -49,15 +49,6 @@ class NetworkConfig : INetworkConfig {
         }
     override val reportUrl: String = "http://${getLocalHost()}/"
 
-    // TODO: 没有wssurl
-    override val wssUrl: String
-        get() {
-//            return when {
-//                AppBase.isRelease -> "wss://${getLocalHost()}/websocket"
-//                else -> DebugPrefs.socketUrl
-//            }
-            return ""
-        }
     override val gson: Gson
         get() = com.adealink.frame.data.json.gson
     override val httpAntiBanConfigUrl: String
@@ -118,7 +109,6 @@ class NetworkConfig : INetworkConfig {
     override val userRegion: String
         get() = ""
 
-    //get() = ProfileModule.getMyUserInfo()?.region ?: ""
     override val versionCode: String
         get() = BuildConfig.VERSION_NAME
 
@@ -190,16 +180,6 @@ class NetworkConfig : INetworkConfig {
         }
     }
 
-    override fun reportWebSocketEvent(event: WebSocketEvent) {
-//        event.uid = ProfileModule.getMyUid()
-//        event.country = getNewCountryCode()
-//        event.isp = getNetworkOperator()
-//        Log.d("tag_serve_report", "reportWebSocketEvent, event:${event}")
-//        CoroutineScope(Dispatcher.WENEXT_THREAD_POOL).launch {
-//            statHttpService.reportWebSocket(event)
-//        }
-    }
-
     override fun onStartCoreReq() {
         App.instance.downloadService.stopLowPriorityTask()
     }

+ 0 - 1
app/src/main/java/com/adealink/weparty/network/NetworkManager.kt

@@ -75,7 +75,6 @@ class NetworkManager : INetworkManager,
     private fun ping() {
         launch {
             Log.d(TAG_PING, "ping")
-            AppUtil.background
             when (val result = pingHttpService.ping()
                 .apply { Log.logRltD(TAG_PING, "ping result", this) }
             ) {

+ 0 - 0
app/src/main/java/com/adealink/weparty/network/PingSocketService.kt → app/src/main/java/com/adealink/weparty/network/PingHttpService.kt


+ 0 - 1
app/src/main/java/com/adealink/weparty/ui/MainStartUpFragment.kt

@@ -101,7 +101,6 @@ class MainStartUpFragment : BaseFragment() {
             RegisterEvent().send()
         }
 
-        App.instance.logService.subscribeNotify()
         AccountModule.refreshToken()
         approvingVersionManager.refreshApproving()
         installDynamicModule()

+ 0 - 2
frame/room/src/main/java/com/adealink/frame/room/data/RoomFlowData.kt

@@ -64,7 +64,6 @@ enum class JoinChannelReason(val reason: String) {
     REJOIN_RUNNABLE("rejoin_runnable"),
     PLAY_MUSIC("play_music"),
     RTC_CHANGED("rtc_changed"),
-    SOCKET_RECONNECTED("socket_reconnected"),
 }
 
 enum class LeaveChannelReason(val reason: String) {
@@ -73,5 +72,4 @@ enum class LeaveChannelReason(val reason: String) {
     INITIATIVE("initiative"),
     CLOSE_MUSIC("close_music"),
     RTC_CHANGED("rtc_changed"),
-    SOCKET_CLOSED("socket_closed"),
 }

+ 1 - 1
gradle/libs.versions.toml

@@ -166,7 +166,7 @@ appleAppauth = "0.11.1"
 tiktok = "2.3.0"
 
 # frame
-frameBom = "1.0.0"
+frameBom = "1.0.1"
 
 framePush = "1.0.0"