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 a1ea07f..63076e3 100644
--- a/app/src/main/java/com/skipping/activity/begin/BeginActivity.kt
+++ b/app/src/main/java/com/skipping/activity/begin/BeginActivity.kt
@@ -1,6 +1,7 @@
 package com.skipping.activity.begin
 
 import android.app.Activity
+import android.app.AlertDialog
 import android.content.Intent
 import android.os.Bundle
 import android.view.Window
@@ -16,6 +17,7 @@ import com.skipping.activity.home.HomeGridAdaper
 import com.skipping.activity.perform.PerformActivity
 import com.skipping.activity.setting.SettingActivity
 import com.skipping.net.DetailActivityBean
+import com.skipping.net.GradleBean
 import com.skipping.utils.NumberUtil
 import com.skipping.utils.ScreenUtil
 import com.skipping.utils.StatusBarUtil
@@ -24,6 +26,8 @@ import com.skipping.view.bubblewindow.BubbleWindow
 import com.skipping.view.bubblewindow.Direction
 import com.skipping.view.bubblewindow.OnItemClick
 import com.skipping.view.bubblewindow.itemview.TextItemView
+import com.skipping.view.dialog.DialogBean
+import com.skipping.view.dialog.DialogTool
 import com.tencent.mmkv.MMKV
 import kotlinx.android.synthetic.main.activity_begin.*
 import kotlinx.android.synthetic.main.activity_home.*
@@ -42,6 +46,9 @@ class BeginActivity : BaseActivity<BeginPresenter>() {
     lateinit var detailBean: DetailActivityBean
     lateinit var future: ScheduledFuture<*>
     lateinit var bubbleWindow: BubbleWindow
+    lateinit var dialog: AlertDialog
+    var choseCla: List<DetailActivityBean.CandidatesBean>? = null
+    var choseGradeBeanList = mutableListOf<DialogBean<List<DetailActivityBean.CandidatesBean>>>()
 
     companion object {
         val ID = "id"
@@ -88,28 +95,23 @@ class BeginActivity : BaseActivity<BeginPresenter>() {
             }
         }
         begin_listRL.setOnClickListener {
-            bubbleWindow.show(begin_list)
+            dialog = DialogTool(this).buildList(this, choseGradeBeanList) {
+//                choseCla = it.bean
+//                chooseIV.text = it.bean.groupName + "班"
+//                activityNameEdit?.setText(it.bean.groupName + "班活动")
+                begin_list.text = it.content
+                dialog.dismiss()
+            }
+
         }
     }
 
     fun activityDetailResult(bean: DetailActivityBean) {
-        bean.candidates
-        bubbleWindow = BubbleWindow.Builder(this).apply {
-            for (i in 0..bean.candidates.size) {
-                val num = NumberUtil.numberToChinese(i)
-                this.setItemView(TextItemView(this@BeginActivity, i.toString(), "第{$num}组"))
-            }
-        }.setOnItemClick(object : OnItemClick {
-            override fun onClick(tag: String?, position: Int, bubbleWindow: BubbleWindow?) {
-                val num = NumberUtil.numberToChinese(tag?.toInt()!!)
-                begin_list.text = "第{$num}组"
-            }
-        })
-//                .setMargining(com.libs.utils.ScreenUtil.getActionBarHeight(this))
-                .setDirection(Direction.BOTTOM)
-                .build()
-
-
+        choseGradeBeanList.clear()
+        bean.candidates.forEachIndexed { index, mutableList ->
+            val num = NumberUtil.numberToChinese(index + 1)
+            choseGradeBeanList.add(DialogBean("第 $num 组", mutableList))
+        }
         detailBean = bean
         begin_name.text = bean.activityName
         if (detailBean.activityType == TIMING) {
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 97dd504..972abec 100644
--- a/app/src/main/java/com/skipping/activity/home/HomeActivity.kt
+++ b/app/src/main/java/com/skipping/activity/home/HomeActivity.kt
@@ -34,7 +34,6 @@ import kotlinx.android.synthetic.main.activity_home.*
  */
 class HomeActivity : BaseActivity<HomePresenter>() {
     lateinit var classList: List<GradleBean>
-    lateinit var bubbleWindow: BubbleWindow
     lateinit var dialog:AlertDialog
     var choseGradeBeanList = mutableListOf<DialogBean<GradleBean>>()
     var choseCla: GradleBean? = null
@@ -162,7 +161,6 @@ class HomeActivity : BaseActivity<HomePresenter>() {
 
 
     fun showList(page: Int, list: List<ActivityBean>) {
-        LogUtil.e(page, list.size)
         if (refreshLayout.isRefreshing) {
             refreshLayout.isRefreshing = false
         }
@@ -193,20 +191,6 @@ class HomeActivity : BaseActivity<HomePresenter>() {
         classList.forEach {
             choseGradeBeanList.add(DialogBean(it.groupName + "班学生", it))
         }
-//        bubbleWindow = BubbleWindow.Builder(this).apply {
-//            classList.forEach {
-//                this.setItemView(TextItemView(this@HomeActivity, it.groupID, it.groupName + "班学生"))
-//            }
-//        }.setOnItemClick(object : OnItemClick {
-//            override fun onClick(tag: String?, position: Int, bubbleWindow: BubbleWindow?) {
-//                choseCla = list[position]
-//                chooseIV.text = list[position].groupName + "班"
-//                activityNameEdit?.setText(list[position].groupName + "班活动")
-//                bubbleWindow?.dismiss()
-//            }
-//        }).setMargining(com.libs.utils.ScreenUtil.getActionBarHeight(this))
-//                .setDirection(Direction.BOTTOM)
-//                .build()
     }
 
     fun addActivityResult() {