Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

视频上传交互优化（第二期）20200827测试(3) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/969

Browse Source
This commit is contained in:
张玉久
2020-08-27 14:08:42 +08:00
parent b2beba4d36
commit e430b4e2de
6 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/gh/common/DefaultUrlHandler.kt
View File

@ -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, "")

5
app/src/main/java/com/gh/gamecenter/SkipActivity.java
View File

@ -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, "");

3
app/src/main/java/com/gh/gamecenter/entity/VideoLinkEntity.kt
View File

@ -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
val tagActivityId: String? = "",
val tagActivityName: String? = "") : Parcelable

9
app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt
View File

@ -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
}

5
app/src/main/res/color/video_upload_source_check.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/text_999999" android:state_enabled="false" />
<item android:color="@color/text_333333" android:state_enabled="true" />
</selector>

6
app/src/main/res/layout/activity_video_uplaod.xml
View File

@ -370,7 +370,7 @@
android:drawablePadding="4dp"
android:gravity="center"
android:text="原创"
android:textColor="@color/text_333333"
android:textColor="@color/video_upload_source_check"
android:textSize="14sp" />
<CheckedTextView
@ -382,7 +382,7 @@
android:drawablePadding="4dp"
android:gravity="center"
android:text="转载"
android:textColor="@color/text_333333"
android:textColor="@color/video_upload_source_check"
android:textSize="14sp" />
</LinearLayout>
@ -448,7 +448,7 @@
android:background="@null"
android:hint="请注明视频原来（例如转载自http://www.xx.com/vvv），标注清晰度将提高审核通过的概率哦"
android:lineSpacingExtra="8dp"
android:textColor="@color/text_333333"
android:textColor="@color/video_upload_source_check"
android:textColorHint="@color/text_cccccc"
android:textSize="14sp"
android:visibility="gone"