新增 自由选择签到签退时间

新增 生成活动签到链接
修复 多次发起网络请求

Author: thriic

README.md

@@ -3,11 +3,12 @@ cuit第二课堂安卓客户端
 
 ## 基础功能
 支持校外网(Webvpn)登录  
-任意时间签到  
+任意时间签到并可**选择**签到/签退时间  
+生成进行中活动的签到签退链接
 
 ## 注意事项
 登录前**请勿**通过其他方式外网登录第二课堂，否则会登录失败  
-活动签到(即签到签退)时间选取为开始后10分钟和结束前10分钟，理论上后台只记录这两个数据  
+活动签到(即签到签退)时间默认在进行时间内随机  
 鉴于二课审核机制，暂不提供一键报名签到，选择活动前请甄选是否符合条件
 
 ## 测试环境

app/src/androidTest/java/com/thryan/secondclass/ExampleInstrumentedTest.kt

@@ -1,15 +1,12 @@
 package com.thryan.secondclass
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.thryan.secondclass.core.Webvpn
+import androidx.test.platform.app.InstrumentationRegistry
 import kotlinx.coroutines.runBlocking
-
+import org.junit.Assert.*
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

app/src/main/AndroidManifest.xml

@@ -12,7 +12,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:networkSecurityConfig="@xml/netword_config"
+        android:networkSecurityConfig="@xml/network_config"
         android:theme="@style/Theme.SecondClass"
         tools:targetApi="31">
         <activity

app/src/main/java/com/thryan/secondclass/core/SecondClass.kt

@@ -12,11 +12,11 @@ import com.thryan.secondclass.core.utils.Requests
 import com.thryan.secondclass.core.utils.after
 import com.thryan.secondclass.core.utils.before
 
-class SecondClass(val twfid: String) {
+class SecondClass(private val twfid: String, var token: String = "") {
 
     private val requests =
         Requests("http://ekt-cuit-edu-cn.webvpn.cuit.edu.cn:8118/api/", Factory("JSON"))
-    var token: String = ""
+
 
     /**
      * 登录第二课堂

app/src/main/java/com/thryan/secondclass/core/Webvpn.kt

@@ -39,7 +39,7 @@ object Webvpn {
     suspend fun login(account: String, password: String): HttpResult<String> {
         val auth = auth()
         if (auth.message != "login auth success") return HttpResult(auth.message, auth.message)
-        val vpnInfo = auth.data!!
+        val vpnInfo = auth.data
         val res = requests
             .post<String> {
                 path("login_psw.csp?anti_replay=1&encrypt=1&apiversion=1")

app/src/main/java/com/thryan/secondclass/core/result/ScoreInfo.kt

@@ -1,7 +1,6 @@
 package com.thryan.secondclass.core.result
 
 import kotlinx.serialization.Serializable
-import java.math.BigDecimal
 
 /**
  * @param score 积分

app/src/main/java/com/thryan/secondclass/core/result/User.kt

@@ -6,7 +6,6 @@ import kotlinx.serialization.Serializable
  * @param id 用户id
  * @param name 用户名
  * @param sex 性别(男1女0?)
- * @param orgName 班级名
  */
 @Serializable
 data class User(val id: String, val name: String, val sex: Int)

app/src/main/java/com/thryan/secondclass/core/utils/HttpUtils.kt

@@ -4,8 +4,6 @@ import com.thryan.secondclass.core.result.HttpResult
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.Json
 import okhttp3.FormBody
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
@@ -20,8 +18,8 @@ import kotlin.coroutines.resumeWithException
 
 class Requests(val url: String, val factory: Factory) {
 
-    suspend inline fun <reified T> get(block: Request<T>.() -> Unit): HttpResult<T> {
-        val request = Request<T>().apply {
+    suspend inline fun <reified T> get(block: Request.() -> Unit): HttpResult<T> {
+        val request = Request().apply {
             block()
         }
         request.builder.url((url + request.api).also(::println))
@@ -32,12 +30,12 @@ class Requests(val url: String, val factory: Factory) {
     }
 
     @JvmName("getString")
-    suspend fun get(block: Request<String>.() -> Unit): HttpResult<String> {
+    suspend fun get(block: Request.() -> Unit): HttpResult<String> {
         return this.get<String>(block)
     }
 
-    suspend inline fun <reified T> post(block: Request<T>.() -> Unit): HttpResult<T> {
-        val request = Request<T>().apply {
+    suspend inline fun <reified T> post(block: Request.() -> Unit): HttpResult<T> {
+        val request = Request().apply {
             block()
         }
 
@@ -52,11 +50,11 @@ class Requests(val url: String, val factory: Factory) {
     }
 
     @JvmName("postString")
-    suspend fun post(block: Request<String>.() -> Unit): HttpResult<String> {
+    suspend fun post(block: Request.() -> Unit): HttpResult<String> {
        return this.post<String>(block)
     }
 
-    inner class Request<T> {
+    inner class Request {
         val builder = okhttp3.Request.Builder()
         private var params: String = ""
         private var path: String = ""
@@ -174,15 +172,3 @@ class JSON {
 }
 
 
-class Solve<T, U> {
-    var onSuccess: ((T) -> U)? = null
-    var onFailure: ((String) -> String)? = null
-
-    fun success(block: (T) -> U) {
-        onSuccess = block
-    }
-
-    fun failure(block: (String) -> String) {
-        onFailure = block
-    }
-}

app/src/main/java/com/thryan/secondclass/core/utils/Utills.kt

@@ -5,7 +5,6 @@ import com.thryan.secondclass.core.result.HttpResult
 import com.thryan.secondclass.core.result.SignInfo
 import java.time.LocalDate
 import java.time.LocalDateTime
-import java.time.LocalTime
 import java.time.format.DateTimeFormatter
 
 fun String.after(minutes: Int): String {
@@ -22,6 +21,12 @@ fun String.before(minutes: Int): String {
     return oneHourBefore.format(formatter)
 }
 
+fun String.toLocalDateTime(): LocalDateTime {
+    val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+    return LocalDateTime.parse(this, formatter)
+}
+
+
 fun String.toLocalDate(): LocalDate {
     val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
     val dateTime = LocalDateTime.parse(this, formatter)

app/src/main/java/com/thryan/secondclass/ui/MainActivity.kt

@@ -2,6 +2,7 @@ package com.thryan.secondclass.ui
 
 import android.content.Context
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.isSystemInDarkTheme
@@ -12,7 +13,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.core.view.WindowCompat
 import androidx.navigation.NavHostController
 import androidx.navigation.NavType
@@ -24,10 +24,11 @@ import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.thryan.secondclass.ui.info.Info
 import com.thryan.secondclass.ui.info.InfoViewModel
 import com.thryan.secondclass.ui.login.Login
-import com.thryan.secondclass.ui.theme.SecondClassTheme
 import com.thryan.secondclass.ui.login.LoginViewModel
-import com.thryan.secondclass.ui.page.PageViewModel
 import com.thryan.secondclass.ui.page.Page
+import com.thryan.secondclass.ui.page.PageIntent
+import com.thryan.secondclass.ui.page.PageViewModel
+import com.thryan.secondclass.ui.theme.SecondClassTheme
 
 
 class MainActivity : ComponentActivity() {
@@ -59,12 +60,16 @@ fun AppNavHost(
     startDestination: String = "login",
     context: Context
 ) {
+    var pageViewModel: PageViewModel? = null
+    var infoViewModel: InfoViewModel? = null
     NavHost(
         modifier = modifier,
         navController = navController,
         startDestination = startDestination
     ) {
+        Log.i("Main", "NavBuilder")
         composable("login") {
+
             Login(viewModel = LoginViewModel(context, navController))
         }
         composable(
@@ -74,29 +79,46 @@ fun AppNavHost(
                 navArgument("account") { type = NavType.StringType }
             )
         ) { backStackEntry ->
+            Log.i("Main", "我他妈recompose")
             val twfid = backStackEntry.arguments?.getString("twfid")
             val account = backStackEntry.arguments?.getString("account")
-            Page(
-                PageViewModel(
+            //防止viewModel多次创建多次发起网络请求
+            if (pageViewModel == null|| checkNotNull(account) != pageViewModel!!.account) {
+                pageViewModel = PageViewModel(
                     navController,
                     twfid = checkNotNull(twfid),
                     account = checkNotNull(account)
                 )
+                pageViewModel!!.send(PageIntent.Init)
+            }
+            Page(
+                viewModel = pageViewModel!!
             )
         }
         composable(
-            "info?twfid={twfid}&id={id}",
+            "info?id={id}&twfid={twfid}&token={token}",
             arguments = listOf(
-                navArgument("id") { type = NavType.StringType }
+                navArgument("id") { type = NavType.StringType },
+                navArgument("twfid") { type = NavType.StringType },
+                navArgument("token") { type = NavType.StringType }
             )
         ) { backStackEntry ->
+            Log.i("Main", "我他妈recompose")
             val id = backStackEntry.arguments?.getString("id")
+            val twfid = backStackEntry.arguments?.getString("twfid")
+            val token = backStackEntry.arguments?.getString("token")
+            if (infoViewModel == null || checkNotNull(id) != infoViewModel!!.id) {
+                infoViewModel = InfoViewModel(
+                    id = checkNotNull(id),
+                    twfid = checkNotNull(twfid),
+                    token = checkNotNull(token)
+                )
+            }
             Info(
                 navController,
-                InfoViewModel(
-                    id = checkNotNull(id)
-                )
+                infoViewModel!!
             )
+
         }
     }
 }
@@ -112,12 +134,4 @@ fun TransparentSystemBars() {
             isNavigationBarContrastEnforced = false,
         )
     }
-}
-
-
-@Preview(showBackground = true)
-@Composable
-fun DefaultPreview() {
-    SecondClassTheme {
-    }
 }

app/src/main/java/com/thryan/secondclass/ui/component/Button.kt

@@ -0,0 +1,56 @@
+package com.thryan.secondclass.ui.component
+
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.material3.Button
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import kotlinx.coroutines.delay
+
+@Composable
+fun DebouncedButton(
+    modifier: Modifier = Modifier,
+    outline: Boolean = true,
+    enabled: Boolean = true,
+    onClick: () -> Unit,
+    content: @Composable (RowScope.() -> Unit)
+) {
+    var clicked by remember {
+        mutableStateOf(!enabled)
+    }
+    LaunchedEffect(clicked) {
+        if (clicked) {
+            delay(1000L)
+            clicked = !clicked
+        }
+    }
+    if (!outline)
+        Button(
+            modifier = modifier,
+            onClick = {
+                if (enabled && !clicked) {
+                    clicked = true
+                    onClick()
+                }
+            },
+            content = content
+        )
+    else
+        OutlinedButton(
+            modifier = modifier,
+            onClick = {
+                if (enabled && !clicked) {
+                    clicked = true
+                    onClick()
+                }
+            },
+            content = content
+        )
+
+
+}

app/src/main/java/com/thryan/secondclass/ui/component/TimePicker.kt

@@ -0,0 +1,35 @@
+package com.thryan.secondclass.ui.component
+
+import android.util.Log
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.marosseleng.compose.material3.datetimepickers.time.ui.dialog.TimePickerDialog
+import com.thryan.secondclass.ui.info.InfoIntent
+import com.thryan.secondclass.ui.info.InfoViewModel
+import java.time.LocalTime
+
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun TimePicker(
+    modifier: Modifier = Modifier,
+    title: String,
+    viewModel: InfoViewModel,
+    onTimeChange: (LocalTime)->Unit
+) {
+    TimePickerDialog(
+        onDismissRequest = {
+            viewModel.send(InfoIntent.CloseDialog)
+        },
+        onTimeChange = {
+            onTimeChange(it)
+            Log.i("TimePicker",it.toString())
+            viewModel.send(InfoIntent.CloseDialog)
+        },
+        modifier = modifier,
+        is24HourFormat = true,
+        title = { Text(title) }
+    )
+}