From 8ebf19ae9ae9096934615ddf28f60a16423b4fd5 Mon Sep 17 00:00:00 2001
From: Ming <18642047181@163.com>
Date: Mon, 4 Apr 2022 12:32:38 +0800
Subject: [PATCH] =?UTF-8?q?[function]=E6=88=90=E7=BB=A9=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skipping/activity/begin/BeginActivity.kt  | 22 ++++++++++++++-----
 .../skipping/activity/begin/BeginPresenter.kt |  4 +++-
 .../skipping/activity/home/HomeActivity.kt    |  1 +
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/skipping/activity/begin/BeginActivity.kt b/app/src/main/java/com/skipping/activity/begin/BeginActivity.kt
index df021ed..7518db5 100644
--- a/app/src/main/java/com/skipping/activity/begin/BeginActivity.kt
+++ b/app/src/main/java/com/skipping/activity/begin/BeginActivity.kt
@@ -4,6 +4,7 @@ import android.app.Activity
 import android.app.AlertDialog
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import androidx.recyclerview.widget.GridLayoutManager
 import com.libs.fragment.BaseActivity
 import com.libs.utils.LogUtil
@@ -148,7 +149,13 @@ class BeginActivity : BaseActivity<BeginPresenter>() {
             var info = ScoreReqBean.CandidatesBean.InfoBean()
             info.personID = it.personID
             info.score = it.score
-            info.detail = cute()
+            cute(position).apply {
+                LogUtil.e("this",this)
+                if (this !== null) {
+                    info.detail == this
+                }
+            }
+            LogUtil.e("11", info)
             list.add(info)
         }
         bean.info = list
@@ -159,14 +166,15 @@ class BeginActivity : BaseActivity<BeginPresenter>() {
         }
     }
 
-    fun cute(): List<Int> {
+    fun cute(position: Int): List<Int>? {
         var list = ConnectManager.getSingleton().scoreMap.get(position + 1)
-        LogUtil.e("111", list)
+        if (list == null) {
+            return null
+        }
         var newList = mutableListOf<Int>()
         for (i in 0..(list?.size!! / 2 - 1)) {
-            newList.add(list[i])
+            newList.add(list[i * 2])
         }
-        LogUtil.e("222", newList)
         return newList
     }
 
@@ -175,4 +183,8 @@ class BeginActivity : BaseActivity<BeginPresenter>() {
         ConnectManager.getSingleton().stopJump()
     }
 
+    fun scoreResult() {
+        finish()
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/skipping/activity/begin/BeginPresenter.kt b/app/src/main/java/com/skipping/activity/begin/BeginPresenter.kt
index 739a631..e110f28 100644
--- a/app/src/main/java/com/skipping/activity/begin/BeginPresenter.kt
+++ b/app/src/main/java/com/skipping/activity/begin/BeginPresenter.kt
@@ -44,10 +44,12 @@ class BeginPresenter() : BasePresenter<BeginActivity>() {
 
 //        concise.request(v, concise.api.score(bean), object : CallBack<BaseBean<*>> {
 //            override fun onSuccess(k: BaseBean<*>?) {
-//
+//                ToastUtil.longToast("成绩提交成功")
+//                v.scoreResult()
 //            }
 //
 //            override fun onFailed(e: Throwable?) {
+//                ToastUtil.longToast("成绩提交失败")
 //            }
 //
 //        })
diff --git a/app/src/main/java/com/skipping/activity/home/HomeActivity.kt b/app/src/main/java/com/skipping/activity/home/HomeActivity.kt
index 3ed85a0..a4a49fd 100644
--- a/app/src/main/java/com/skipping/activity/home/HomeActivity.kt
+++ b/app/src/main/java/com/skipping/activity/home/HomeActivity.kt
@@ -213,6 +213,7 @@ class HomeActivity : BaseActivity<HomePresenter>() {
     override fun onRestart() {
         ScreenUtil.setCustomDensity(this)
         super.onRestart()
+        p.getActivityList(1)
     }
 
     override fun onResume() {