Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
RvApp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lify
RvApp
Commits
696a6cf8
Commit
696a6cf8
authored
Dec 05, 2019
by
linfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
推广短视频
parent
19433ee6
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
25 additions
and
29 deletions
+25
-29
SendVideoActivity.java
...main/java/com/xxfc/discovery/other/SendVideoActivity.java
+1
-1
icon_pop_add_discovery_content_bg.png
.../res/drawable-xhdpi/icon_pop_add_discovery_content_bg.png
+0
-0
pop_add_discovery_content.xml
...scovery/src/main/res/layout/pop_add_discovery_content.xml
+2
-2
MyReleaseVideoAdapter.java
...ain/java/com/rv/rvmine/adapter/MyReleaseVideoAdapter.java
+1
-1
PreviewxActivity.java
...c/main/java/com/xxrv/video/activity/PreviewxActivity.java
+6
-1
TriListActivity.java
...rc/main/java/com/xxrv/video/activity/TriListActivity.java
+11
-20
JcvTrillVideo.java
...eo/src/main/java/com/xxrv/video/weight/JcvTrillVideo.java
+1
-1
activity_previewx.xml
plugin_video/src/main/res/layout/activity_previewx.xml
+3
-3
No files found.
module_discovery/src/main/java/com/xxfc/discovery/other/SendVideoActivity.java
View file @
696a6cf8
...
@@ -188,7 +188,7 @@ public class SendVideoActivity extends BaseStatusActivity<DiscoveryPresenter> {
...
@@ -188,7 +188,7 @@ public class SendVideoActivity extends BaseStatusActivity<DiscoveryPresenter> {
public
void
onViewClicked
(
View
view
)
{
public
void
onViewClicked
(
View
view
)
{
int
id
=
view
.
getId
();
int
id
=
view
.
getId
();
if
(
id
==
R
.
id
.
rl_item_select_video
)
{
if
(
id
==
R
.
id
.
rl_item_select_video
)
{
startActivityForResult
(
SelectVideoActivity
.
getIntent
(
mActivity
),
109
);
//
startActivityForResult(SelectVideoActivity.getIntent(mActivity), 109);
}
else
if
(
id
==
R
.
id
.
ll_item_select_address
)
{
}
else
if
(
id
==
R
.
id
.
ll_item_select_address
)
{
ARouter
.
getInstance
()
ARouter
.
getInstance
()
...
...
module_discovery/src/main/res/drawable-xhdpi/icon_pop_add_discovery_content_bg.png
View replaced file @
19433ee6
View file @
696a6cf8
2.38 KB
|
W:
|
H:
3.27 KB
|
W:
|
H:
2-up
Swipe
Onion skin
module_discovery/src/main/res/layout/pop_add_discovery_content.xml
View file @
696a6cf8
...
@@ -42,7 +42,8 @@
...
@@ -42,7 +42,8 @@
android:textColor=
"@color/textGray"
android:textColor=
"@color/textGray"
android:text=
"短视频"
/>
android:text=
"短视频"
/>
<include
layout=
"@layout/common_line"
/>
<include
layout=
"@layout/common_line"
android:visibility=
"gone"
/>
<TextView
<TextView
android:id=
"@+id/tv_ask_questions"
android:id=
"@+id/tv_ask_questions"
...
@@ -56,7 +57,6 @@
...
@@ -56,7 +57,6 @@
android:textSize=
"@dimen/text_16"
android:textSize=
"@dimen/text_16"
android:textColor=
"@color/textGray"
android:textColor=
"@color/textGray"
android:text=
"去提问"
/>
android:text=
"去提问"
/>
</LinearLayout>
</LinearLayout>
</FrameLayout>
</FrameLayout>
</LinearLayout>
</LinearLayout>
module_mine/src/main/java/com/rv/rvmine/adapter/MyReleaseVideoAdapter.java
View file @
696a6cf8
...
@@ -70,7 +70,7 @@ public class MyReleaseVideoAdapter extends BaseQuickAdapter<DiscoveryDataBean, B
...
@@ -70,7 +70,7 @@ public class MyReleaseVideoAdapter extends BaseQuickAdapter<DiscoveryDataBean, B
TransformationUtil
utils
=
new
TransformationUtil
(
image
);
TransformationUtil
utils
=
new
TransformationUtil
(
image
);
Glide
.
with
(
mContext
)
Glide
.
with
(
mContext
)
.
asBitmap
()
.
asBitmap
()
.
load
(
body
.
getVideos
().
get
(
0
).
getOur
l
())
.
load
(
item
.
getFirstImageOrigina
l
())
.
apply
(
options
)
.
apply
(
options
)
.
apply
(
RequestOptions
.
bitmapTransform
(
new
RoundedCorners
(
12
)).
override
(
image
.
getWidth
(),
image
.
getHeight
()))
.
apply
(
RequestOptions
.
bitmapTransform
(
new
RoundedCorners
(
12
)).
override
(
image
.
getWidth
(),
image
.
getHeight
()))
.
into
(
utils
);
.
into
(
utils
);
...
...
plugin_video/src/main/java/com/xxrv/video/activity/PreviewxActivity.java
View file @
696a6cf8
...
@@ -375,7 +375,12 @@ public class PreviewxActivity extends BaseStatusActivity<VideoPresenter> {
...
@@ -375,7 +375,12 @@ public class PreviewxActivity extends BaseStatusActivity<VideoPresenter> {
}
}
}
else
if
(
id
==
R
.
id
.
tv_item_next
)
{
}
else
if
(
id
==
R
.
id
.
tv_item_next
)
{
onNext
();
if
(
loadCover
==
RecorderUtils
.
COVER_LOADING
){
showToast
(
"亲,封面获取中,请稍后"
);
}
else
{
onNext
();
}
}
else
if
(
id
==
R
.
id
.
tv_item_volume
)
{
}
else
if
(
id
==
R
.
id
.
tv_item_volume
)
{
//音量
//音量
...
...
plugin_video/src/main/java/com/xxrv/video/activity/TriListActivity.java
View file @
696a6cf8
package
com
.
xxrv
.
video
.
activity
;
package
com
.
xxrv
.
video
.
activity
;
import
android.app.ProgressDialog
;
import
android.content.ClipData
;
import
android.content.ClipData
;
import
android.content.ClipboardManager
;
import
android.content.ClipboardManager
;
import
android.content.ContentResolver
;
import
android.content.ContentValues
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.os.Environment
;
import
android.os.Handler
;
import
android.os.Handler
;
import
android.os.Looper
;
import
android.os.Message
;
import
android.os.Message
;
import
android.provider.MediaStore
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.NonNull
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.PagerSnapHelper
;
import
android.support.v7.widget.PagerSnapHelper
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.RecyclerView
;
import
android.text.TextUtils
;
import
android.util.Log
;
import
android.util.Log
;
import
android.view.View
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
android.view.Window
;
import
android.widget.LinearLayout
;
import
android.widget.LinearLayout
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
...
@@ -55,13 +48,6 @@ import com.xxrv.video.presenter.VideoPresenter;
...
@@ -55,13 +48,6 @@ import com.xxrv.video.presenter.VideoPresenter;
import
com.xxrv.video.util.DownloadVideo
;
import
com.xxrv.video.util.DownloadVideo
;
import
com.xxrv.video.weight.JcvTrillVideo
;
import
com.xxrv.video.weight.JcvTrillVideo
;
import
com.yuyife.okgo.OkGoUtil
;
import
com.yuyife.okgo.OkGoUtil
;
import
java.io.BufferedInputStream
;
import
java.io.File
;
import
java.io.FileOutputStream
;
import
java.io.InputStream
;
import
java.net.HttpURLConnection
;
import
java.net.URL
;
import
java.util.LinkedHashMap
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -144,7 +130,6 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
...
@@ -144,7 +130,6 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
if
(
cur
!=
position
)
{
if
(
cur
!=
position
)
{
position
=
cur
;
position
=
cur
;
// TrillStatisticsHelper.play(mContext, coreManager, urlList.get(cur)); //观看数量统计
// TrillStatisticsHelper.play(mContext, coreManager, urlList.get(cur)); //观看数量统计
loadImToken
();
loadImToken
();
}
}
}
}
...
@@ -257,20 +242,26 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
...
@@ -257,20 +242,26 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
UMShareAPI
.
get
(
this
).
release
();
UMShareAPI
.
get
(
this
).
release
();
}
}
String
titles
=
""
;
public
void
onShare
(
String
imageUrl
,
String
videoUrl
,
String
title
,
int
position
)
{
public
void
onShare
(
String
imageUrl
,
String
videoUrl
,
String
url
,
String
title
,
int
position
)
{
/**
/**
* 初始化分享
* 初始化分享
*/
*/
String
code
=
Cookie
.
getStringValue
(
getApplicationContext
(),
SPConstance
.
USER_JSON_CODE
,
""
);
String
code
=
Cookie
.
getStringValue
(
getApplicationContext
(),
SPConstance
.
USER_JSON_CODE
,
""
);
String
sVideoUrl
=
videoU
rl
+
"&code="
+
code
;
String
sVideoUrl
=
u
rl
+
"&code="
+
code
;
if
(
TextUtils
.
isEmpty
(
title
))
{
titles
=
"#短视频#记录您和房车的精彩瞬间"
;
}
else
{
titles
=
title
;
}
shareManager
=
new
ShareManager
(
this
,
new
ShareBoardlistener
()
{
shareManager
=
new
ShareManager
(
this
,
new
ShareBoardlistener
()
{
@Override
@Override
public
void
onclick
(
SnsPlatform
snsPlatform
,
SHARE_MEDIA
share_media
)
{
public
void
onclick
(
SnsPlatform
snsPlatform
,
SHARE_MEDIA
share_media
)
{
if
(
snsPlatform
.
mShowWord
.
equals
(
"下载视频"
))
{
if
(
snsPlatform
.
mShowWord
.
equals
(
"下载视频"
))
{
DownloadVideo
.
getInstance
().
downMp4
(
sV
ideoUrl
,
mActivity
);
DownloadVideo
.
getInstance
().
downMp4
(
v
ideoUrl
,
mActivity
);
}
else
if
(
snsPlatform
.
mShowWord
.
equals
(
"复制链接"
))
{
}
else
if
(
snsPlatform
.
mShowWord
.
equals
(
"复制链接"
))
{
ClipboardManager
myClipboard
=
(
ClipboardManager
)
getSystemService
(
CLIPBOARD_SERVICE
);
ClipboardManager
myClipboard
=
(
ClipboardManager
)
getSystemService
(
CLIPBOARD_SERVICE
);
...
@@ -284,7 +275,7 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
...
@@ -284,7 +275,7 @@ public class TriListActivity extends BaseStatusActivity<VideoPresenter> {
}
}
}
}
shareManager
.
showShareVideo
(
share_media
,
sVideoUrl
,
title
,
"
"
,
imageUrl
shareManager
.
showShareVideo
(
share_media
,
sVideoUrl
,
title
s
,
"[滴房车app]房车,让生活更美好
"
,
imageUrl
,
new
CustomShareListener
(
mActivity
)
{
,
new
CustomShareListener
(
mActivity
)
{
@Override
@Override
...
...
plugin_video/src/main/java/com/xxrv/video/weight/JcvTrillVideo.java
View file @
696a6cf8
...
@@ -406,7 +406,7 @@ public class JcvTrillVideo extends FrameLayout implements BaseView, View.OnClick
...
@@ -406,7 +406,7 @@ public class JcvTrillVideo extends FrameLayout implements BaseView, View.OnClick
if
(
mShareListener
!=
null
)
{
if
(
mShareListener
!=
null
)
{
String
url
=
VideoApi
.
DISCOVERY_SHORT_VIDEO
+
"?id="
+
mMessageid
+
"&shareType=app"
;
String
url
=
VideoApi
.
DISCOVERY_SHORT_VIDEO
+
"?id="
+
mMessageid
+
"&shareType=app"
;
mShareListener
.
onShare
(
imageUrl
,
url
,
title
,
position
);
mShareListener
.
onShare
(
imageUrl
,
sVideoUrl
,
url
,
title
,
position
);
}
}
}
}
...
...
plugin_video/src/main/res/layout/activity_previewx.xml
View file @
696a6cf8
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
android:background=
"@color/gray_313131"
>
<fm.jiecao.jcvideoplayer_lib.JCVideoViewbyXuan
<fm.jiecao.jcvideoplayer_lib.JCVideoViewbyXuan
android:id=
"@+id/x_video"
android:id=
"@+id/x_video"
...
@@ -12,8 +13,7 @@
...
@@ -12,8 +13,7 @@
<ImageView
<ImageView
android:id=
"@+id/iv_thumb"
android:id=
"@+id/iv_thumb"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
/>
android:scaleType=
"fitXY"
/>
<com.ruiwenliu.wrapper.statusbar.StatusBarHeightView
<com.ruiwenliu.wrapper.statusbar.StatusBarHeightView
android:id=
"@+id/shv"
android:id=
"@+id/shv"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment