diff --git a/app/src/main/java/com/gh/common/util/DirectUtils.kt b/app/src/main/java/com/gh/common/util/DirectUtils.kt
index 7424c36a6d..673a3bb4bb 100644
--- a/app/src/main/java/com/gh/common/util/DirectUtils.kt
+++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt
@@ -19,6 +19,7 @@ import com.gh.gamecenter.eventbus.EBReuse
import com.gh.gamecenter.eventbus.EBSkip
import com.gh.gamecenter.fragment.MainWrapperFragment
import com.gh.gamecenter.game.columncollection.detail.ColumnCollectionDetailActivity
+import com.gh.gamecenter.gamedetail.GameDetailFragment
import com.gh.gamecenter.manager.UserManager
import com.gh.gamecenter.mygame.PlayedGameActivity
import com.gh.gamecenter.personalhome.UserHomeActivity
@@ -199,7 +200,14 @@ object DirectUtils {
*/
@JvmStatic
fun directToGameDetailVideoStreaming(context: Context, id: String, entrance: String? = null) {
- GameDetailActivity.startGameDetailToVideoStreaming(context, id, entrance)
+ val bundle = Bundle()
+ bundle.putString(KEY_TO, GameVideoActivity::class.java.name)
+ bundle.putString(KEY_ENTRANCE, entrance)
+ bundle.putString(KEY_GAMEID, id)
+ bundle.putBoolean(KEY_OPEN_VIDEO_STREAMING, true)
+ bundle.putInt(KEY_TARGET, GameDetailFragment.INDEX_DESC)
+// GameDetailActivity.startGameDetailToVideoStreaming(context, id, entrance)
+ jumpActivity(context, bundle)
}
// 跳转至用户玩过的游戏
@@ -475,7 +483,12 @@ object DirectUtils {
*/
@JvmStatic
fun directToVideoManager(context: Context, entrance: String? = null, path: String? = "") {
- context.startActivity(VideoManagerActivity.getIntent(context, entrance, path))
+ val bundle = Bundle()
+ bundle.putString(KEY_PATH, path)
+ bundle.putString(KEY_TO, VideoManagerActivity::class.java.name)
+ bundle.putString(KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
+ //context.startActivity(VideoManagerActivity.getIntent(context, entrance, path))
+ jumpActivity(context, bundle)
}
/**
@@ -483,6 +496,12 @@ object DirectUtils {
*/
@JvmStatic
fun directToGameVideo(context: Context, gameId: String, entrance: String? = null, path: String? = "") {
- context.startActivity(GameVideoActivity.getIntent(context, gameId, entrance, path))
+ val bundle = Bundle()
+ bundle.putString(KEY_PATH, path)
+ bundle.putString(KEY_TO, GameVideoActivity::class.java.name)
+ bundle.putString(KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
+ bundle.putString(KEY_GAMEID, gameId)
+// context.startActivity(GameVideoActivity.getIntent(context, gameId, entrance, path))
+ jumpActivity(context, bundle)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java
index b6f796756e..72e5614aa3 100644
--- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java
@@ -12,15 +12,12 @@ import com.gh.common.util.EntranceUtils;
import com.gh.common.util.PlatformUtils;
import com.gh.common.util.RunningUtils;
import com.gh.gamecenter.entity.CommunityEntity;
-import com.gh.gamecenter.eventbus.EBReuse;
import com.gh.gamecenter.manager.UserManager;
import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel;
+import com.halo.assistant.HaloApp;
import com.lightgame.config.CommonDebug;
import com.lightgame.utils.Utils;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
import static com.gh.common.util.EntranceUtils.ENTRANCE_BROWSER;
import static com.gh.common.util.EntranceUtils.HOST_ANSWER;
import static com.gh.common.util.EntranceUtils.HOST_ARTICLE;
@@ -43,7 +40,6 @@ import static com.gh.common.util.EntranceUtils.KEY_NAME;
import static com.gh.common.util.EntranceUtils.KEY_PACKAGENAME;
import static com.gh.common.util.EntranceUtils.KEY_PLATFORM;
import static com.gh.common.util.EntranceUtils.KEY_VERSION;
-import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG;
/**
* Created by LGT on 2016/11/16.
@@ -106,6 +102,7 @@ public class SkipActivity extends BaseActivity {
DirectUtils.directToToolbox(this, uri.getQueryParameter("gameId"), uri.getQueryParameter("toolboxUrl"), ENTRANCE_BROWSER);
break;
case HOST_COMMUNITY:
+ case HOST_VIDEO_STREAMING_HOME:
Intent intent;
UserManager.getInstance().setCommunityData(new CommunityEntity(id, name));
// 把切换放到 MainActivity 处理
@@ -156,17 +153,17 @@ public class SkipActivity extends BaseActivity {
if (CheckLoginUtils.isLogin()) {
DirectUtils.directToVideoManager(this, ENTRANCE_BROWSER, "浏览器");
} else {
+ HaloApp.put(HOST_UPLOAD_VIDEO,true);
CheckLoginUtils.checkLogin(this, ENTRANCE_BROWSER, null);
- return;
}
break;
case HOST_VIDEO_SINGLE:
break;
case HOST_VIDEO_MORE:
break;
- case HOST_VIDEO_STREAMING_HOME:
- DirectUtils.directToCommunity(this);
- break;
+// case HOST_VIDEO_STREAMING_HOME:
+// DirectUtils.directToCommunity(this);
+// break;
case HOST_VIDEO_STREAMING_DESC:
DirectUtils.directToGameDetailVideoStreaming(this, id, ENTRANCE_BROWSER);
break;
@@ -181,11 +178,4 @@ public class SkipActivity extends BaseActivity {
}
finish();
}
-
- @Subscribe(threadMode = ThreadMode.MAIN)
- public void onEventMainThread(EBReuse reuse) {
- if (reuse.getType().equals(LOGIN_TAG)) { // 登入
- DirectUtils.directToVideoManager(this, ENTRANCE_BROWSER, "浏览器");
- }
- }
}
diff --git a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java
index ec17e5465e..ea49550dd8 100644
--- a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java
@@ -16,6 +16,7 @@ import android.widget.EditText;
import android.widget.TextView;
import com.gh.base.fragment.WaitingDialogFragment;
+import com.gh.common.util.DirectUtils;
import com.gh.common.util.LogUtils;
import com.gh.common.util.LoginHelper;
import com.gh.common.util.LoginUtils;
@@ -50,6 +51,9 @@ import androidx.lifecycle.ViewModelProviders;
import butterknife.BindView;
import butterknife.OnClick;
+import static com.gh.common.util.EntranceUtils.ENTRANCE_BROWSER;
+import static com.gh.common.util.EntranceUtils.HOST_UPLOAD_VIDEO;
+
/**
* Created by khy on 14/08/17.
*/
@@ -261,6 +265,11 @@ public class LoginFragment extends NormalFragment implements LoginUtils.onCaptch
if (TextUtils.isEmpty(UserManager.getInstance().getToken())) {
mUserViewModel.retryCheckLogin();
}
+ Object gotoUploadVideo = HaloApp.get(HOST_UPLOAD_VIDEO, true);
+ if (gotoUploadVideo != null) {
+ DirectUtils.directToVideoManager(requireContext(), ENTRANCE_BROWSER, "浏览器");
+ }
+
if (getActivity() != null) getActivity().finish();
}
}
diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt
index 70200e025a..4d0ad84006 100644
--- a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt
@@ -207,6 +207,10 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib
}
}
}
+ download_btn.setOnClickListener {
+ MtaHelper.onEvent("视频详情", "下载游戏", "${mVideoEntity!!.title}（${mVideoEntity!!.id}）")
+// MtaHelper.onEvent("视频详情", "预约游戏", "${mVideoEntity!!.title}（${mVideoEntity!!.id}）")
+ }
}
override fun showWifiDialog() {
@@ -382,6 +386,9 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib
override fun onStartTrackingTouch(seekBar: SeekBar?) {
super.onStartTrackingTouch(seekBar)
byStartedClick = true
+ if (mIfCurrentIsFullscreen) {
+ MtaHelper.onEvent("视频详情", "全屏播放-拖动进度条", "${mVideoEntity!!.title}（${mVideoEntity!!.id}）")
+ }
}
override fun getEnlargeImageRes(): Int {
@@ -392,27 +399,6 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib
return R.drawable.ic_game_detail_exit_full_screen
}
- /*override fun startPlayLogic() {
- //super.startPlayLogic()
- if (mVideoAllCallBack != null) {
- Debuger.printfLog("onClickStartThumb")
- mVideoAllCallBack.onClickStartThumb(mOriginUrl, mTitle, this)
- }
- prepareVideo()
- }
-
- override fun resolveUIState(state: Int) {
- when (state) {
- CURRENT_STATE_PREPAREING -> {
- changeUiToPreparingShow()
- }
- CURRENT_STATE_PLAYING -> {
- changeUiToPlayingShow()
- }
- else -> super.resolveUIState(state)
- }
- }*/
-
override fun netWorkErrorLogic() {
super.netWorkErrorLogic()
@@ -498,8 +484,10 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib
R.id.start -> {
if (currentState != GSYVideoView.CURRENT_STATE_PLAYING) {
MtaHelper.onEvent("视频详情", "播放", mCombinedTitleAndId)
+ MtaHelper.onEvent("视频详情", if (mIfCurrentIsFullscreen) "全屏播放-继续播放" else "继续播放", "${mVideoEntity!!.title}（${mVideoEntity!!.id}）")
} else {
MtaHelper.onEvent("视频详情", "暂停", mCombinedTitleAndId)
+ MtaHelper.onEvent("视频详情", if (mIfCurrentIsFullscreen) "全屏播放-点击暂停" else "点击暂停", "${mVideoEntity!!.title}（${mVideoEntity!!.id}）")
}
super.onClick(v)
}
@@ -544,6 +532,7 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib
if (isManual) {
Utils.toast(context, "当前处于静音状态")
+ MtaHelper.onEvent("视频详情", if (mIfCurrentIsFullscreen) "全屏播放-点击静音" else "点击静音", "${mVideoEntity!!.title}（${mVideoEntity!!.id}）")
}
}
@@ -551,7 +540,9 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib
mVideoEntity?.videoIsMuted = false
volume.setImageResource(R.drawable.ic_game_detail_volume_on)
(gsyVideoManager as CustomManager).isNeedMute = false
-
+ if (isManual) {
+ MtaHelper.onEvent("视频详情", if (mIfCurrentIsFullscreen) "全屏播放-解除静音" else "解除静音", "${mVideoEntity!!.title}（${mVideoEntity!!.id}）")
+ }
}
fun getVideoAllCallBack(): VideoAllCallBack = mVideoAllCallBack
diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt
index 9ae85f7a16..63af35b4ce 100644
--- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt
@@ -5,6 +5,7 @@ import android.content.Context
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import com.gh.common.constant.Constants
+import com.gh.common.util.MtaHelper
import com.gh.download.cache.CacheManager
import com.gh.download.cache.CacheObserver
import com.gh.gamecenter.entity.VideoEntity
@@ -53,6 +54,7 @@ class VideoAdapter(val mContext: Context, val mViewModel: VideoDetailContainerVi
override fun onQuitFullscreen(url: String?, vararg objects: Any) {
mOrientationUtils.backToProtVideo()
videoView.hideAllButton(false)
+ MtaHelper.onEvent("视频详情", "全屏播放-退出全屏", "${videoList[position].title}（${videoList[position].id}）")
}
})
.build(videoView)
@@ -62,6 +64,9 @@ class VideoAdapter(val mContext: Context, val mViewModel: VideoDetailContainerVi
videoView.updateThumb(videoList[position].getThumb())
videoView.updateMuteStatus()
videoView.fullscreenButton.setOnClickListener {
+ if (mOrientationUtils.isLand == 0) {
+ MtaHelper.onEvent("视频详情", "进入全屏", "${videoList[position].title}（${videoList[position].id}）")
+ }
videoView.hideAllButton(true)
mOrientationUtils.resolveByClick()
val fullVideoPlayer = videoView.startWindowFullscreen(mContext, true, true) as DetailPlayerView
@@ -74,10 +79,10 @@ class VideoAdapter(val mContext: Context, val mViewModel: VideoDetailContainerVi
videoView.isNeedShowWifiTip = HaloApp.get(Constants.SHOULD_SHOW_VIDEO_MOBILE_WARNING, false) as Boolean?
?: false
if (position == mViewModel.startPosition) {
- if (position + 2 <= videoList.size - 1) {
+ if (position + 2 <= videoList.size - 1) {//预加载视频
CacheManager.getInstance().download(videoList[position + 1].url, object : CacheObserver() {})
CacheManager.getInstance().download(videoList[position + 2].url, object : CacheObserver() {})
- } else if (position + 1 <= videoList.size - 1) {//预加载视频
+ } else if (position + 1 <= videoList.size - 1) {
CacheManager.getInstance().download(videoList[position + 1].url, object : CacheObserver() {})
}
videoView.startButton.performClick()
diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt
index 85f23c44a7..7cf9b2b9cf 100644
--- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt
@@ -70,7 +70,8 @@ class VideoDetailContainerFragment : NormalFragment(), OnBackPressedListener {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
-
+ marquee_ad_title.isSelected = true
+ initListener()
if (mLocation == VideoDetailContainerViewModel.Location.USER_UPLOADED_VIDEO.value) {
titleTv.text = ""
} else {
@@ -147,17 +148,17 @@ class VideoDetailContainerFragment : NormalFragment(), OnBackPressedListener {
val pos = mViewPagerLayoutManager.findFirstCompletelyVisibleItemPosition()
val videoView = findFirstCompletelyVisibleVideoViewByPosition()
- if (pos + 2 <= mAdapter.videoList.size - 1) {
+ if (pos + 2 <= mAdapter.videoList.size - 1) {//预加载视频
CacheManager.getInstance().download(mAdapter.videoList[pos + 1].url, object : CacheObserver() {})
CacheManager.getInstance().download(mAdapter.videoList[pos + 2].url, object : CacheObserver() {})
- } else if (pos + 1 <= mAdapter.videoList.size - 1) {//预加载视频
+ } else if (pos + 1 <= mAdapter.videoList.size - 1) {
CacheManager.getInstance().download(mAdapter.videoList[pos + 1].url, object : CacheObserver() {})
}
if (videoView?.isInPlayingState != true) {
CacheManager.getInstance().cancel(mAdapter.videoList[pos].url)
videoView?.startPlayLogic()
mBaseHandler.postDelayed({
- videoView?.startPlayLogic()
+ videoView?.updateMuteStatus()
}, 500)
}
mViewModel.addHistoryRecord(mAdapter.videoList[pos])
@@ -197,15 +198,19 @@ class VideoDetailContainerFragment : NormalFragment(), OnBackPressedListener {
}
}
- /*override fun onResume() {
- super.onResume()
- val videoView = findFirstCompletelyVisibleVideoViewByPosition()
- if (videoView?.currentState == GSYVideoView.CURRENT_STATE_PAUSE || videoView?.isInPlayingState != true) {
- val seekOnStart = videoView?.currentPositionWhenPlaying
- videoView?.seekOnStart = seekOnStart?.toLong() ?: 0
- videoView?.startPlayLogic()
+ private fun initListener() {
+ marquee_ad.setOnClickListener {
+ val pos = mViewPagerLayoutManager.findFirstCompletelyVisibleItemPosition()
+ val videoEntity = mAdapter.videoList[pos]
+ MtaHelper.onEvent("视频详情", "视频广告", "${videoEntity.title}（${videoEntity.id}）")
}
- }*/
+ icon_ad.setOnClickListener {
+ val pos = mViewPagerLayoutManager.findFirstCompletelyVisibleItemPosition()
+ val videoEntity = mAdapter.videoList[pos]
+ MtaHelper.onEvent("视频详情", "视频广告", "${videoEntity.title}（${videoEntity.id}）")
+ }
+
+ }
override fun onResume() {
super.onResume()
@@ -341,7 +346,10 @@ class VideoDetailContainerFragment : NormalFragment(), OnBackPressedListener {
}
override fun onHandleBackPressed(): Boolean {
- return mAdapter.onBackPressed(findFirstCompletelyVisibleVideoViewByPosition())
+ if (::mAdapter.isInitialized) {
+ return mAdapter.onBackPressed(findFirstCompletelyVisibleVideoViewByPosition())
+ }
+ return false
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java
index 980cd670f7..6f7feb5231 100644
--- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java
+++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java
@@ -6,10 +6,6 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
import com.gh.base.OnRequestCallBackListener;
import com.gh.common.util.CheckLoginUtils;
import com.gh.common.view.Concern_LinearLayout;
@@ -24,6 +20,10 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.List;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.OnClick;
@@ -73,6 +73,12 @@ public class MyConcernFragment extends NormalFragment implements View.OnClickLis
}
+ @Override
+ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+ setNavigationTitle("我的关注");
+ }
+
@Override
public void loadDone() { // 关注推荐 回调
mConcernTitleRl.setVisibility(View.VISIBLE);
diff --git a/app/src/main/res/drawable-hdpi/video_detail_marquee_ad_notice.png b/app/src/main/res/drawable-hdpi/video_detail_marquee_ad_notice.png
new file mode 100644
index 0000000000..6576e6ef95
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/video_detail_marquee_ad_notice.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_video_detail_game.png b/app/src/main/res/drawable-xxhdpi/ic_video_detail_game.png
index 887cbf66ad..979661e8fd 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_video_detail_game.png and b/app/src/main/res/drawable-xxhdpi/ic_video_detail_game.png differ
diff --git a/app/src/main/res/drawable/bg_video_detail_marquee.xml b/app/src/main/res/drawable/bg_video_detail_marquee.xml
new file mode 100644
index 0000000000..46ef6a62d4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_video_detail_marquee.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_video_detail_name.xml b/app/src/main/res/drawable/bg_video_detail_name.xml
new file mode 100644
index 0000000000..092eb87944
--- /dev/null
+++ b/app/src/main/res/drawable/bg_video_detail_name.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progressbar_video_detail.xml b/app/src/main/res/drawable/progressbar_video_detail.xml
index 2252830111..3421065519 100644
--- a/app/src/main/res/drawable/progressbar_video_detail.xml
+++ b/app/src/main/res/drawable/progressbar_video_detail.xml
@@ -2,7 +2,7 @@
-
-
+
@@ -10,7 +10,7 @@
-
-
+
diff --git a/app/src/main/res/drawable/video_detail_btn_download_up.xml b/app/src/main/res/drawable/video_detail_btn_download_up.xml
new file mode 100644
index 0000000000..50bb3f6612
--- /dev/null
+++ b/app/src/main/res/drawable/video_detail_btn_download_up.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/video_detail_seek_progress.xml b/app/src/main/res/drawable/video_detail_seek_progress.xml
new file mode 100644
index 0000000000..65951d6eac
--- /dev/null
+++ b/app/src/main/res/drawable/video_detail_seek_progress.xml
@@ -0,0 +1,28 @@
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_video_detail_container.xml b/app/src/main/res/layout/fragment_video_detail_container.xml
index f03adba7c1..660f1d8bd4 100644
--- a/app/src/main/res/layout/fragment_video_detail_container.xml
+++ b/app/src/main/res/layout/fragment_video_detail_container.xml
@@ -1,6 +1,7 @@
@@ -9,21 +10,26 @@
android:id="@+id/smartRefreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- app:srlEnableRefresh="false"
- app:srlEnableLoadMore="true">
+ app:srlEnableLoadMore="true"
+ app:srlEnableRefresh="false">
+
+ android:layout_height="wrap_content" />
+
+
+ app:srlTextSizeTitle="12sp" />
+
@@ -68,4 +74,54 @@
android:textStyle="bold" />
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_video_detail_surface.xml b/app/src/main/res/layout/layout_video_detail_surface.xml
index 90690a7ddc..e482c670df 100644
--- a/app/src/main/res/layout/layout_video_detail_surface.xml
+++ b/app/src/main/res/layout/layout_video_detail_surface.xml
@@ -26,42 +26,12 @@
-
-
-
-
-
-
-
-
-
+ android:layout_gravity="bottom"
+ android:background="@drawable/bg_video_detail_name"
+ android:orientation="horizontal"
+ android:paddingLeft="10dp"
+ android:paddingTop="5dp"
+ android:paddingRight="10dp"
+ android:paddingBottom="5dp">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ android:layout_marginBottom="12dp">
+ android:layout_marginRight="20dp">
-
-
+ app:roundAsCircle="true"
+ app:roundingBorderColor="@color/white"
+ app:roundingBorderWidth="1dp" />
-
-
+ android:layout_marginLeft="8dp"
+ android:layout_toRightOf="@+id/userIconIv"
+ android:gravity="center"
+ android:orientation="vertical">
+ android:textSize="14sp"
+ android:textStyle="bold"
+ tools:text="赞布罗塔" />
+
+
+
+
+
+
+
@@ -208,7 +227,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
- android:textColor="@color/white"
+ android:textColor="@color/text_999999"
android:textSize="12sp"
tools:text="1.0W" />
@@ -218,13 +237,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
- android:layout_marginLeft="20dp"
+ android:layout_marginLeft="32dp"
android:gravity="center"
android:orientation="vertical">
@@ -245,7 +264,7 @@
android:id="@+id/layout_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="#99000000"
+ android:layout_marginTop="25dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
@@ -266,9 +285,10 @@
android:id="@+id/current"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="7dp"
+ android:layout_marginLeft="8dp"
android:text="00:00"
- android:textColor="#ffffff" />
+ android:textColor="@color/white"
+ android:textSize="12sp" />
+ android:textColor="@color/white"
+ android:textSize="12sp" />
+ android:padding="5dp"
+ android:src="@drawable/ic_game_detail_enter_full_screen" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 21f3609615..397edd608b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -140,5 +140,7 @@
#FF9B06
#D8D8D8
#FAFAFA
+ #3BABFF
+ #2461FF
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c14adad86a..905715b0d0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -114,7 +114,7 @@
最新
关注
存号箱
- 游戏库
+ 游戏
资讯
首页
我的光环