feat: 移除socket长连,进入首页

app/proguard-log.gradle

@@ -142,10 +142,10 @@ class RemoveConcatLogTask extends DefaultTask {
 
         if (paramClass.length() > 0 && paramLevel.length() > 0) {
             println("proguard.gradle, RemoveConcatLogTask, doTaskAction, python proguard-log paramClass:" + paramClass + " paramLevel:" + paramLevel)
-            project.exec {
-                workingDir "."
-                commandLine "python3", "proguard-log.py", "-c " + paramClass, "-l " + paramLevel
-            }
+//            project.exec {
+//                workingDir "."
+//                commandLine "python3", "proguard-log.py", "-c " + paramClass, "-l " + paramLevel
+//            }
         }
     }
 }

app/src/main/java/com/adealink/weparty/MainActivity.kt

@@ -18,7 +18,6 @@ import com.adealink.weparty.commonui.BaseActivity
 import com.adealink.weparty.module.account.Account
 import com.adealink.weparty.module.account.AccountModule
 import com.adealink.weparty.push.PushStatEvent
-import com.adealink.weparty.storage.AppPref
 import com.adealink.weparty.ui.MainStartUpFragment
 import com.adealink.weparty.ui.home.HomeFragment
 import com.adealink.weparty.update.updateManager
@@ -155,12 +154,12 @@ class MainActivity : BaseActivity() {
     }
 
     private fun needGoLoginActivity(): Boolean {
-        return true
-        //return !AccountModule.isLogin()
+        return !AccountModule.isLogin()
     }
 
     private fun needGoRegisterActivity(): Boolean {
-        return AppPref.needRegister
+        return false
+        //return AppPref.needRegister
     }
 
     private fun inflateHomeFragment(from: DispatchFrom) {

app/src/main/java/com/adealink/weparty/network/NetworkManager.kt

@@ -188,16 +188,16 @@ class NetworkManager : INetworkManager, ILoginListener, IConnectStateListener,
     }
 
     private fun socketConnect() {
-        if (!AccountModule.isLogin()) {
-            return
-        }
-
-        if (AppUtil.background) {
-            Log.i(TAG_NETWORK, "socketConnect, background")
-            return
-        }
-
-        App.instance.networkService.connect()
+//        if (!AccountModule.isLogin()) {
+//            return
+//        }
+//
+//        if (AppUtil.background) {
+//            Log.i(TAG_NETWORK, "socketConnect, background")
+//            return
+//        }
+//
+//        App.instance.networkService.connect()
     }
 
     override fun pingNow() {

module/account/src/main/java/com/adealink/weparty/account/login/BaseLoginActivity.kt

@@ -47,7 +47,7 @@ abstract class BaseLoginActivity : BaseActivity() {
 
     private fun needGoRegister(userInfo: UserInfo): Boolean {
         //todo: 是否完成注册
-        return true
+        return false
 //        AppPref.needRegister = userInfo.completedInfo != RegisterProfileActivity.HAS_FINISH_REGISTER
 //        return AppPref.needRegister
     }

module/account/src/main/java/com/adealink/weparty/account/login/datasource/remote/LoginService.kt

@@ -4,7 +4,6 @@ import com.adealink.frame.base.Rlt
 import com.adealink.frame.network.data.Res
 import com.adealink.weparty.account.login.data.GoogleLoginReq
 import com.adealink.weparty.account.login.data.LoginResult
-import com.adealink.weparty.account.login.data.RefreshTokenReq
 import retrofit2.http.Body
 import retrofit2.http.Core
 import retrofit2.http.POST
@@ -20,8 +19,8 @@ interface LoginService {
      * 刷新token
      */
     @Core
-    @POST("account/refreshToken")
-    suspend fun refreshToken(@Body req: RefreshTokenReq): Rlt<Res<String>>
+    @POST("user/renewalToken")
+    suspend fun refreshToken(): Rlt<Res<Any>>
 
 
 

module/account/src/main/java/com/adealink/weparty/account/login/manager/LoginManager.kt

@@ -18,7 +18,6 @@ import com.adealink.weparty.account.login.data.AccountInfo
 import com.adealink.weparty.account.login.data.GoogleLoginReq
 import com.adealink.weparty.account.login.data.LoginResult
 import com.adealink.weparty.account.login.data.RefreshTokenNotify
-import com.adealink.weparty.account.login.data.RefreshTokenReq
 import com.adealink.weparty.account.login.data.ThirdType
 import com.adealink.weparty.account.login.data.UserKickOutNotify
 import com.adealink.weparty.account.login.datasource.remote.LoginService
@@ -233,7 +232,7 @@ class LoginManager : BaseFrame<ILoginListener>(), ILoginManager {
         isLogin = true
         uid = userInfo.uid
         token = result.token
-        AppPref.refreshToken = result.refreshToken
+        AppPref.refreshToken = result.token
         ProfileModule.setMyUserInfo(userInfo)
         AccountLocalService.loginType = loginType.value
     }
@@ -310,22 +309,18 @@ class LoginManager : BaseFrame<ILoginListener>(), ILoginManager {
                 break@loop
             }
 
-            Log.d(TAG_ACCOUNT_LOGIN, "refresh token(${i})")
-            val rlt = loginService.refreshToken(
-                RefreshTokenReq(
-                    expiredToken = token,
-                    refreshToken = AppPref.refreshToken
-                )
-            )
+            val rlt = loginService.refreshToken()
+            Log.d(TAG_ACCOUNT_LOGIN, "refresh token(${i}), $rlt")
             when (rlt) {
                 is Rlt.Success -> {
-                    val newToken = rlt.data.data
-                    if (newToken.isNullOrEmpty()) {
-                        continue@loop
-                    }
+//                    val newToken = rlt.data.data
+//                    if (newToken.isNullOrEmpty()) {
+//                        continue@loop
+//                    }
                     refreshTokenSuccess = true
-                    token = newToken
-                    Log.d(TAG_ACCOUNT_LOGIN, "refresh token success, new Token:${newToken}")
+//                    token = newToken
+//                    Log.d(TAG_ACCOUNT_LOGIN, "refresh token success, new Token:${newToken}")
+                    Log.d(TAG_ACCOUNT_LOGIN, "refresh token success")
                     break@loop
                 }