3.0.2 (49)

* 修复登录页可能会闪退的问题（增加对refresh token接口的错误处理）。
* 统一身份认证登录页面改为全屏显示。

Author: FlowerBlackG

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.gardilily.onedottongji"
         minSdkVersion 29
         targetSdkVersion 33
-        versionCode 48
-        versionName "3.0.1"
+        versionCode 49
+        versionName "3.0.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
             android:theme="@style/Theme.OneDotTongjiRefresh.Main" />
 
         <activity android:name=".activity.TongjiOAuth"
-            android:theme="@style/Theme.OneTJ.Base" />
+            android:theme="@style/Theme.OneTJ.NoActionBar.Immersed" />
 
         <activity android:name=".activity.About"
             android:theme="@style/Theme.OneTJ.Base"/>

app/src/main/java/com/gardilily/onedottongji/activity/Login.kt

@@ -64,7 +64,7 @@ class Login : Activity() {
                 Intent(this@Login, TongjiOAuth::class.java),
                 MacroDefines.UNILOGIN_WEBVIEW_FOR_1SESSIONID
             )
-            overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
+
         }
 
         GarCloudApi.checkUpdate(this, false)
@@ -233,33 +233,13 @@ class Login : Activity() {
         when (requestCode) {
             MacroDefines.UNILOGIN_WEBVIEW_FOR_1SESSIONID -> {
 
-                val resultData = data?.getStringArrayExtra(TongjiOAuth.RESULT_KEY)
-                if (resultData == null) {
-
-                    Toast.makeText(this, "授权失败 qwq", Toast.LENGTH_SHORT).show()
-                    return
-                }
-
-                if (resultData[0] != null || resultData[1] == null) {
-
-                    Toast.makeText(this, "授权失败 qwq (${resultData[0]})", Toast.LENGTH_SHORT).show()
-                    return
-                }
-
-                val code = resultData[1]
-                setUISpinning(true)
+                data ?: return
 
-                thread {
-
-                    if (TongjiApi.instance.code2token(code, this@Login)) {
-                        runOnUiThread {
-                            startActivity(Intent(this@Login, Home::class.java))
-                            overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
-                            finish()
-                        }
-                    }
-                    runOnUiThread { setUISpinning(false) }
+                val error = data.getStringExtra(TongjiOAuth.RESULT_ERROR)
 
+                if (error == null) {
+                    startActivity(Intent(this@Login, Home::class.java))
+                    finish()
                 }
 
             } // MacroDefines.UNILOGIN_WEBVIEW_FOR_1SESSIONID ->

app/src/main/java/com/gardilily/onedottongji/activity/TongjiOAuth.kt

@@ -9,39 +9,61 @@ import android.webkit.WebResourceRequest
 import android.webkit.WebSettings
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.gardilily.onedottongji.R
 import com.gardilily.onedottongji.tools.tongjiapi.TongjiApi
 import com.google.android.material.elevation.SurfaceColors
+import kotlin.concurrent.thread
 
 /**
  *
+ * Intent 传入：
+ *   scope: String 需要授权的项目。之间用空格分开。
  *
  * activity 信息返回格式：
  *   oauthResult: Array<String?>(error, code)
  *     err 非空，表示登录失败。
  *     code 非空，可用 code 换结果。
  */
-class TongjiOAuth : AppCompatActivity() {
+class TongjiOAuth : OneTJActivityBase(
+    hasTitleBar = false,
+    withSpinning = true
+) {
 
     companion object {
-        const val RESULT_KEY = "oauthResult"
+        /**
+         * 需要授权的选项。
+         * String
+         */
+        const val INTENT_PARAM_SCOPE = "scope"
+
+        /**
+         * 授权错误信息。
+         * String
+         */
+        const val RESULT_ERROR = "oauthError"
+
+        /**
+         * 授权得到的 code。
+         * String
+         */
+        const val RESULT_AUTH_CODE = "oauthCode"
+
     }
 
     private lateinit var webView : WebView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         setContentView(R.layout.activity_tongji_oauth)
 
-        val color = SurfaceColors.SURFACE_2.getColor(this)
-        window.navigationBarColor = color
-        window.statusBarColor = color
-        title = "同济大学开放平台 - 身份认证"
+        stageSpinningProgressBar(findViewById(R.id.tongjiOAuth_rootContainer))
+
+        val scope = intent.getStringExtra(INTENT_PARAM_SCOPE)
 
         initWebView()
-        loadOAuthPage()
+        loadOAuthPage(scope)
 
     }
 
@@ -79,8 +101,34 @@ class TongjiOAuth : AppCompatActivity() {
                     val code = uri.getQueryParameter("code")
                     val error = uri.getQueryParameter("error")
 
-                    setResult(0, Intent().putExtra(RESULT_KEY, arrayOf(error, code)))
-                    finish()
+                    val resIntent = Intent()
+                    resIntent.putExtra(RESULT_AUTH_CODE, code)
+                    resIntent.putExtra(RESULT_ERROR, error)
+
+                    code?.let {
+
+                        thread {
+                            val res = TongjiApi.instance.code2token(it, this@TongjiOAuth)
+
+
+                            runOnUiThread {
+                                if (!res) {
+
+                                    Toast.makeText(
+                                        this@TongjiOAuth,
+                                        "授权失败（code2token）",
+                                        Toast.LENGTH_SHORT
+                                    ).show()
+
+                                    resIntent.putExtra(RESULT_ERROR, "code2token returns false")
+                                }
+
+                                setResult(0, resIntent)
+                                finish()
+
+                            } // runOnUiThread {
+                        } // thread {
+                    } // code?.let {
 
                     return true // 防止白屏。
                 }
@@ -92,7 +140,7 @@ class TongjiOAuth : AppCompatActivity() {
         webView.webChromeClient = object : WebChromeClient() {}
     }
 
-    private fun loadOAuthPage() {
+    private fun loadOAuthPage(scope: String?) {
         // https://api.tongji.edu.cn/docs/#/architecture/authentication
         val urlBuilder = StringBuilder("${TongjiApi.BASE_URL}/keycloak/realms/OpenPlatform/protocol/openid-connect/auth")
 
@@ -101,15 +149,17 @@ class TongjiOAuth : AppCompatActivity() {
         urlBuilder.append("&response_type=code")
 
         val scopeBuilder = StringBuilder()
-        TongjiApi.SCOPE_LIST.forEach {
-            if (it != TongjiApi.SCOPE_LIST.first()) {
-                scopeBuilder.append(' ')
-            }
+        if (scope == null) {
+            TongjiApi.SCOPE_LIST.forEach {
+                if (it != TongjiApi.SCOPE_LIST.first()) {
+                    scopeBuilder.append(' ')
+                }
 
-            scopeBuilder.append(it)
+                scopeBuilder.append(it)
+            }
         }
 
-        urlBuilder.append("&scope=$scopeBuilder")
+        urlBuilder.append("&scope=${scope ?: scopeBuilder}")
 
         webView.loadUrl(urlBuilder.toString())
 

app/src/main/java/com/gardilily/onedottongji/tools/tongjiapi/TongjiApi.kt

@@ -206,23 +206,32 @@ class TongjiApi {
         return this.addHeader("Authorization", "Bearer ${getTokenData().token}")
     }
 
-    private fun processGetTokenResponse(json: JSONObject) {
-        val accessToken = json.getString("access_token")
-        // 有效期。单位为秒（应该是吧）
-        val expiresIn = json.getLong("expires_in")
-        val currentTime = System.currentTimeMillis() / 1000
-        val expireTime = currentTime + expiresIn - 10
-
-        val refreshToken = json.getString("refresh_token")
-        val refreshTokenExpiresIn = json.getLong("refresh_expires_in")
-        val refreshTokenExpireTime = currentTime + refreshTokenExpiresIn - 10
-
-        storeTokenData(TokenData(
-            token = accessToken,
-            expireTimeSec = expireTime,
-            refreshToken = refreshToken,
-            refreshTokenExpireSec = refreshTokenExpireTime
-        ))
+    private fun processGetTokenResponse(json: JSONObject): Boolean {
+        return try {
+            val accessToken = json.getString("access_token")
+            // 有效期。单位为秒（应该是吧）
+            val expiresIn = json.getLong("expires_in")
+            val currentTime = System.currentTimeMillis() / 1000
+            val expireTime = currentTime + expiresIn - 10
+
+            val refreshToken = json.getString("refresh_token")
+            val refreshTokenExpiresIn = json.getLong("refresh_expires_in")
+            val refreshTokenExpireTime = currentTime + refreshTokenExpiresIn - 10
+
+            storeTokenData(
+                TokenData(
+                    token = accessToken,
+                    expireTimeSec = expireTime,
+                    refreshToken = refreshToken,
+                    refreshTokenExpireSec = refreshTokenExpireTime
+                )
+            )
+
+            true
+        } catch (e: Exception) {
+            e.printStackTrace()
+            false
+        }
     }
 
     fun code2token(code: String, activity: Activity): Boolean {
@@ -251,9 +260,7 @@ class TongjiApi {
         val bodyString = response.body?.string()
         val responseJson = bodyString?.let { JSONObject(it) } ?: return false
 
-        processGetTokenResponse(responseJson)
-
-        return true
+        return processGetTokenResponse(responseJson)
     }
 
     /**
@@ -292,9 +299,9 @@ class TongjiApi {
             null
         } ?: return false
 
-        processGetTokenResponse(resJson)
 
-        return false
+        return processGetTokenResponse(resJson)
+
     }
 
     data class StudentInfo(
@@ -748,6 +755,8 @@ class TongjiApi {
             allThreadsFiredSemaphore.release()
         }
 
+        val donePages = AtomicInteger(1)
+
         for (page in 2 .. pages step CONCURRENT_SIZE) {
 
             if (apiControl.stop.get()) {
@@ -783,7 +792,7 @@ class TongjiApi {
                             return@thread
                         }
 
-                        val currProgress = thisPage * 100 / pages
+                        val currProgress = donePages.incrementAndGet() * 100 / pages
                         if (currProgress > progress.get()) {
                             progress.set(currProgress)
                             onProgressUpdate?.let { it(currProgress) }

app/src/main/res/layout/activity_tongji_oauth.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:id="@+id/tongjiOAuth.rootContainer"
     tools:context=".activity.TongjiOAuth">
 
     <WebView

app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">一块钱</string>
-    <string name="app_buildTime" translatable="false">2023.07.14–14:31</string>
+    <string name="app_buildTime" translatable="false">2023.07.16–17:06</string>
     <string name="login_to_tongji_university">统一身份认证登录</string>
     <string name="version">版本</string>
     <string name="check_for_update">检查更新</string>

updateLog.txt

@@ -1,3 +1,9 @@
+Version: 3.0.2 (49)
+Build Time: 2023.07.16–17:06
+Update Log:
+* 修复登录页可能会闪退的问题（增加对refresh token接口的错误处理）。
+* 统一身份认证登录页面改为全屏显示。
+
 Version: 3.0.1 (48)
 Build Time: 2023.07.14–14:31
 Update Log: