|
@@ -71,6 +71,7 @@ import com.sheep.gamegroup.util.UMConfigUtils;
|
|
|
import com.sheep.gamegroup.util.ViewUtil;
|
|
import com.sheep.gamegroup.util.ViewUtil;
|
|
|
import com.sheep.gamegroup.view.adapter.AdpTaskDetailChildListview;
|
|
import com.sheep.gamegroup.view.adapter.AdpTaskDetailChildListview;
|
|
|
import com.sheep.gamegroup.view.adapter.TaskdetailSonListviewAdp;
|
|
import com.sheep.gamegroup.view.adapter.TaskdetailSonListviewAdp;
|
|
|
|
|
+import com.sheep.gamegroup.view.customview.SheepGSYVideoView;
|
|
|
import com.sheep.jiuyan.samllsheep.BuildConfig;
|
|
import com.sheep.jiuyan.samllsheep.BuildConfig;
|
|
|
import com.sheep.jiuyan.samllsheep.R;
|
|
import com.sheep.jiuyan.samllsheep.R;
|
|
|
import com.sheep.jiuyan.samllsheep.SheepApp;
|
|
import com.sheep.jiuyan.samllsheep.SheepApp;
|
|
@@ -239,7 +240,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
|
|
|
|
|
//------------------------
|
|
//------------------------
|
|
|
@BindView(R.id.video_player_view)
|
|
@BindView(R.id.video_player_view)
|
|
|
- StandardGSYVideoPlayer videoPlayerView;
|
|
|
|
|
|
|
+ SheepGSYVideoView videoPlayerView;
|
|
|
@BindView(R.id.about_merchandise_tile)
|
|
@BindView(R.id.about_merchandise_tile)
|
|
|
View about_merchandise_tile;
|
|
View about_merchandise_tile;
|
|
|
@BindView(R.id.most_discount_tag)
|
|
@BindView(R.id.most_discount_tag)
|
|
@@ -306,6 +307,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
}
|
|
}
|
|
|
CommonUtil.getInstance().callActionWithUserInfo(userEntity -> ViewUtil.setVisibility(task_detail_pay_vip_tv, userEntity == null || !userEntity.isVIP()));
|
|
CommonUtil.getInstance().callActionWithUserInfo(userEntity -> ViewUtil.setVisibility(task_detail_pay_vip_tv, userEntity == null || !userEntity.isVIP()));
|
|
|
videoPlayerView.getBackButton().setVisibility(View.GONE);
|
|
videoPlayerView.getBackButton().setVisibility(View.GONE);
|
|
|
|
|
+ videoPlayerView.disableProgressDrag();
|
|
|
int height = (ScreenUtil.getScreenWidth(this) - ScreenUtil.dip2px(this, 24) * 2) * 9 / 16;
|
|
int height = (ScreenUtil.getScreenWidth(this) - ScreenUtil.dip2px(this, 24) * 2) * 9 / 16;
|
|
|
if (videoPlayerView != null) {
|
|
if (videoPlayerView != null) {
|
|
|
videoPlayerView.getLayoutParams().height = height;
|
|
videoPlayerView.getLayoutParams().height = height;
|
|
@@ -1821,9 +1823,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
public void onNext(BaseMessage baseMessage) {
|
|
public void onNext(BaseMessage baseMessage) {
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
- ViewUtil.setImageRes(watch_video_ico, R.mipmap.icon_select);
|
|
|
|
|
- ViewUtil.setVisibility(video_player_layer, false);
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+ ViewUtil.setImageRes(watch_video_ico, R.mipmap.icon_select);
|
|
|
|
|
+ ViewUtil.setVisibility(video_player_layer, false);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|