lmw
1 天以前 967492f43278adf716cb3cb39d209ad9ae59590f
save
2个文件已修改
64 ■■■■ 已修改文件
app/src/main/java/com/dollearn/student/ui/home/MatchFragment.kt 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/xml/scene_fragment_match.xml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dollearn/student/ui/home/MatchFragment.kt
@@ -17,42 +17,7 @@
import com.dollearn.student.utils.Const
import com.dollearn.student.utils.event.EmptyEvent
import com.dollearn.student.utils.extention.clickDelay
import kotlinx.android.synthetic.main.fragment_choose_voice.*
import kotlinx.android.synthetic.main.fragment_match.*
import kotlinx.android.synthetic.main.fragment_match.cl_1
import kotlinx.android.synthetic.main.fragment_match.cl_2
import kotlinx.android.synthetic.main.fragment_match.cl_3
import kotlinx.android.synthetic.main.fragment_match.cl_4
import kotlinx.android.synthetic.main.fragment_match.cl_voice_end_1
import kotlinx.android.synthetic.main.fragment_match.cl_voice_end_2
import kotlinx.android.synthetic.main.fragment_match.cl_voice_end_3
import kotlinx.android.synthetic.main.fragment_match.cl_voice_end_4
import kotlinx.android.synthetic.main.fragment_match.iv1_1
import kotlinx.android.synthetic.main.fragment_match.iv1_1_end
import kotlinx.android.synthetic.main.fragment_match.iv1_2
import kotlinx.android.synthetic.main.fragment_match.iv1_2_end
import kotlinx.android.synthetic.main.fragment_match.iv1_3
import kotlinx.android.synthetic.main.fragment_match.iv1_3_end
import kotlinx.android.synthetic.main.fragment_match.iv1_4_end
import kotlinx.android.synthetic.main.fragment_match.iv2_1
import kotlinx.android.synthetic.main.fragment_match.iv2_1_end
import kotlinx.android.synthetic.main.fragment_match.iv2_2
import kotlinx.android.synthetic.main.fragment_match.iv2_2_end
import kotlinx.android.synthetic.main.fragment_match.iv2_3
import kotlinx.android.synthetic.main.fragment_match.iv2_3_end
import kotlinx.android.synthetic.main.fragment_match.iv2_4_end
import kotlinx.android.synthetic.main.fragment_match.iv_1
import kotlinx.android.synthetic.main.fragment_match.iv_2
import kotlinx.android.synthetic.main.fragment_match.iv_3
import kotlinx.android.synthetic.main.fragment_match.iv_4
import kotlinx.android.synthetic.main.fragment_match.iv_playing_1
import kotlinx.android.synthetic.main.fragment_match.iv_playing_1_end
import kotlinx.android.synthetic.main.fragment_match.iv_playing_2
import kotlinx.android.synthetic.main.fragment_match.iv_playing_2_end
import kotlinx.android.synthetic.main.fragment_match.iv_playing_3
import kotlinx.android.synthetic.main.fragment_match.iv_playing_3_end
import kotlinx.android.synthetic.main.fragment_match.iv_playing_4_end
import kotlinx.android.synthetic.main.fragment_match.motion
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.jetbrains.anko.imageResource
@@ -150,7 +115,6 @@
                if (!playing){
                    voiceIndex = index
                    handler?.sendEmptyMessage(PLAY_VOICE)
                    motion.transitionToEnd()
                }
            }
        }
@@ -516,10 +480,10 @@
    @Subscribe
    fun onEvent(e: EmptyEvent){
        if (e.code == Const.EventCode.RECOVERD){
//            if (act.fragments[act.vp.currentItem] == this){ //自动播放
//                isAutoPlaying = true
//                cl_voice_1.callOnClick()
//            }
            if (act.fragments[act.vp.currentItem] == this){ //自动播放
                isAutoPlaying = true
                cl_voice_1.callOnClick()
            }
        }
    }
@@ -544,8 +508,8 @@
        cl_voice_end_3.gone()
        cl_voice_end_4.gone()
        if (act.fragments[act.vp.currentItem] == this&&act.recoverd) { //自动播放
//            isAutoPlaying = true
//            cl_voice_1.callOnClick()
            isAutoPlaying = true
            cl_voice_1.callOnClick()
        }
    }
app/src/main/res/xml/scene_fragment_match.xml
@@ -43,9 +43,9 @@
            motion:layout_constraintStart_toStartOf="@+id/line1"
            motion:layout_constraintEnd_toEndOf="@+id/line1"
            motion:layout_constraintTop_toTopOf="parent"
            android:layout_width="159dp"
            android:layout_width="200dp"
            android:layout_marginTop="15dp"
            android:layout_height="52dp"/>
            android:layout_height="40dp"/>
    </ConstraintSet>
    <ConstraintSet android:id="@+id/start_2">
@@ -53,9 +53,9 @@
            motion:layout_constraintStart_toStartOf="@+id/line2"
            motion:layout_constraintEnd_toEndOf="@+id/line2"
            motion:layout_constraintTop_toTopOf="parent"
            android:layout_width="159dp"
            android:layout_width="200dp"
            android:layout_marginTop="15dp"
            android:layout_height="52dp"/>
            android:layout_height="40dp"/>
    </ConstraintSet>
    <ConstraintSet android:id="@+id/start_3">
@@ -63,9 +63,9 @@
            motion:layout_constraintStart_toStartOf="@+id/line3"
            motion:layout_constraintEnd_toEndOf="@+id/line3"
            motion:layout_constraintTop_toTopOf="parent"
            android:layout_width="159dp"
            android:layout_width="200dp"
            android:layout_marginTop="15dp"
            android:layout_height="52dp"/>
            android:layout_height="40dp"/>
    </ConstraintSet>
    <ConstraintSet android:id="@+id/start_4">
@@ -73,9 +73,9 @@
            motion:layout_constraintStart_toStartOf="@+id/line4"
            motion:layout_constraintEnd_toEndOf="@+id/line4"
            motion:layout_constraintTop_toTopOf="parent"
            android:layout_width="159dp"
            android:layout_width="200dp"
            android:layout_marginTop="15dp"
            android:layout_height="52dp"/>
            android:layout_height="40dp"/>
    </ConstraintSet>
    <ConstraintSet android:id="@+id/end_1_1">