diff --git a/app/src/main/java/com/gh/common/DefaultUrlHandler.kt b/app/src/main/java/com/gh/common/DefaultUrlHandler.kt
index 5725825da1..21041534f9 100644
--- a/app/src/main/java/com/gh/common/DefaultUrlHandler.kt
+++ b/app/src/main/java/com/gh/common/DefaultUrlHandler.kt
@@ -129,8 +129,9 @@ object DefaultUrlHandler {
val link = uri.getQueryParameter("link") ?: ""
val gameId = uri.getQueryParameter("gameId") ?: ""
val gameName = uri.getQueryParameter("gameName") ?: ""
- val isSelectedActivityLabel = uri.getBooleanQueryParameter("isSelectedActivityLabel", false)
- val linkEntity = VideoLinkEntity(title, categoryId, link, isSelectedActivityLabel)
+ val tagActivityId = uri.getQueryParameter("tagActivityId") ?: ""
+ val tagActivityName = uri.getQueryParameter("tagActivityName") ?: ""
+ val linkEntity = VideoLinkEntity(title, categoryId, link, tagActivityId, tagActivityName)
val simpleGameEntity = SimpleGameEntity(gameId, gameName)
CheckLoginUtils.checkLogin(context, null, true, EntranceUtils.ENTRANCE_BROWSER) {
DirectUtils.directToVideoManager(context, linkEntity, simpleGameEntity, EntranceUtils.ENTRANCE_BROWSER, "")
diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java
index c930029dca..a783767a19 100644
--- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java
@@ -188,8 +188,9 @@ public class SkipActivity extends BaseActivity {
String link = uri.getQueryParameter("link");
gameId = uri.getQueryParameter("gameId");
String gameName = uri.getQueryParameter("gameName");
- boolean isSelectedActivityLabel = uri.getBooleanQueryParameter("isSelectedActivityLabel", false);
- VideoLinkEntity linkEntity = new VideoLinkEntity(title, categoryId, link, isSelectedActivityLabel);
+ String tagActivityId = uri.getQueryParameter("tagActivityId");
+ String tagActivityName = uri.getQueryParameter("tagActivityName");
+ VideoLinkEntity linkEntity = new VideoLinkEntity(title, categoryId, link, tagActivityId, tagActivityName);
SimpleGameEntity simpleGameEntity = new SimpleGameEntity(gameId != null ? gameId : "", gameName != null ? gameName : "", "");
Bundle nextToBundle = VideoManagerActivity.getVideoManagerBundle(linkEntity, simpleGameEntity, EntranceUtils.ENTRANCE_BROWSER, "");
diff --git a/app/src/main/java/com/gh/gamecenter/entity/VideoLinkEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/VideoLinkEntity.kt
index 0a0d4da33e..a52f53817a 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/VideoLinkEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/VideoLinkEntity.kt
@@ -7,4 +7,5 @@ import kotlinx.android.parcel.Parcelize
data class VideoLinkEntity(val title: String? = "",
val categoryId: String? = "",
val link: String? = "",
- val isSelectedActivityLabel: Boolean = false) : Parcelable
\ No newline at end of file
+ val tagActivityId: String? = "",
+ val tagActivityName: String? = "") : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt
index 3e449d6792..dcfb4e6a06 100644
--- a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt
@@ -272,8 +272,11 @@ class UploadVideoActivity : ToolBarActivity() {
})
mViewModel.activityTagLiveData.observe(this, Observer {
mBinding.activityFlexbox.goneIf(!it)
- if (it && mVideoLink?.isSelectedActivityLabel == true) {
- startActivityForResult(VideoLabelActivity.getIntent(this), REQUEST_CODE_CHOOSE_LABEL)
+ if (it && !mVideoLink?.tagActivityId.isNullOrEmpty() && !mVideoLink?.tagActivityName.isNullOrEmpty()) {
+ mActivityLabelEntity = ActivityLabelEntity(mVideoLink?.tagActivityId
+ ?: "", mVideoLink?.tagActivityName ?: "")
+ mBinding.activityContainer.visibility = View.VISIBLE
+ mBinding.activityTv.text = mActivityLabelEntity?.name
}
})
mViewModel.processDialog.observeNonNull(this) {
@@ -474,7 +477,7 @@ class UploadVideoActivity : ToolBarActivity() {
return
}
- if (!isDraft && mViewModel.gameEntity == null) {
+ if (!isDraft && (mViewModel.gameEntity == null || mViewModel.gameEntity?.id?.isEmpty() == true)) {
toast("请选择游戏")
return
}
diff --git a/app/src/main/res/color/video_upload_source_check.xml b/app/src/main/res/color/video_upload_source_check.xml
new file mode 100644
index 0000000000..2c53fa892a
--- /dev/null
+++ b/app/src/main/res/color/video_upload_source_check.xml
@@ -0,0 +1,5 @@
+
+
+