Merge branch 'jj' into qa_1.1.7
This commit is contained in:
@@ -83,12 +83,12 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
|
||||
}
|
||||
|
||||
override fun updateStartImage() {
|
||||
super.updateStartImage()
|
||||
|
||||
when (mCurrentState) {
|
||||
GSYVideoView.CURRENT_STATE_PAUSE -> start.visibility = View.VISIBLE
|
||||
else -> start.visibility = View.INVISIBLE
|
||||
}
|
||||
// super.updateStartImage()
|
||||
//
|
||||
// when (mCurrentState) {
|
||||
// GSYVideoView.CURRENT_STATE_PAUSE -> start.visibility = View.VISIBLE
|
||||
// else -> start.visibility = View.INVISIBLE
|
||||
// }
|
||||
}
|
||||
|
||||
fun setFullClickListener(listener: OnClickListener) {
|
||||
|
||||
@@ -28,8 +28,7 @@
|
||||
android:layout_width="@dimen/dp_110"
|
||||
android:layout_height="@dimen/dp_110"
|
||||
android:layout_centerInParent="true"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/v2x_icon_live_logo" />
|
||||
android:scaleType="centerCrop" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -72,13 +71,13 @@
|
||||
|
||||
<!--GSYVideoControlView mLoadingProgressBar-->
|
||||
//加载中圈圈
|
||||
<!-- <ProgressBar-->
|
||||
<!-- android:id="@+id/loading"-->
|
||||
<!-- android:layout_width="@dimen/dp_56"-->
|
||||
<!-- android:layout_height="@dimen/dp_56"-->
|
||||
<!-- android:layout_centerHorizontal="true"-->
|
||||
<!-- android:layout_centerVertical="true"-->
|
||||
<!-- android:indeterminateTint="#256BFF"-->
|
||||
<!-- android:visibility="gone" />-->
|
||||
<ProgressBar
|
||||
android:id="@+id/loading"
|
||||
android:layout_width="@dimen/dp_56"
|
||||
android:layout_height="@dimen/dp_56"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:indeterminateTint="#256BFF"
|
||||
android:visibility="gone" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
Reference in New Issue
Block a user