Skip to content

android / dayu

Go to a project
Commit 05cacac4 by han xu
Options

Merge branch 'dev_xx_250104_SopVideoUpload' into dev_xx_250108_toast

parents cb213351 1bf694b7
Inline Side-by-side
Showing with 18 additions and 9 deletions
baseSDK/src/main/java/com/dayu/utils/MediaChooseUtils.java
...@@ -158,6 +158,10 @@ public class MediaChooseUtils { ...@@ -158,6 +158,10 @@ public class MediaChooseUtils {
// .setCropEngine(new ImageFileCropEngine()) // .setCropEngine(new ImageFileCropEngine())
// .setFilterMaxFileSize(maxCount) // .setFilterMaxFileSize(maxCount)
.setImageSpanCount(4) .setImageSpanCount(4)
.setRecordVideoMaxSecond(videoLength)
.setFilterVideoMinSecond(minLength)
.setRecordVideoMaxSecond(videoLength)
.setRecordVideoMinSecond(minLength)
.setSelectionMode(SelectModeConfig.MULTIPLE); .setSelectionMode(SelectModeConfig.MULTIPLE);
// .isPreviewImage(true) // .isPreviewImage(true)
// .isDisplayCamera(true) // .isDisplayCamera(true)
......
baseSDK/src/main/res/values/strings.xml
...@@ -1054,5 +1054,9 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ ...@@ -1054,5 +1054,9 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string name="certified">已合作商家</string> <string name="certified">已合作商家</string>
<string name="order_material">用料</string> <string name="order_material">用料</string>
<string name="video_file_too_large_100">视频文件不能大于100M</string>
</resources> </resources>
learnCenter/src/main/java/com/dayu/learncenter/ui/activity/EditCourseActivity.java
...@@ -247,7 +247,7 @@ public class EditCourseActivity extends BaseActivity<PubCoursePresenter, Activit ...@@ -247,7 +247,7 @@ public class EditCourseActivity extends BaseActivity<PubCoursePresenter, Activit
} }
File file = new File(videoPath); File file = new File(videoPath);
if (file.length() > 300 * 1024 * 1024) { if (file.length() > 300 * 1024 * 1024) {
showToast(R.string.video_file_too_large); showToast(R.string.video_file_too_large_300);
videoPath = ""; videoPath = "";
} else { } else {
setVideoView(); setVideoView();
...@@ -263,7 +263,7 @@ public class EditCourseActivity extends BaseActivity<PubCoursePresenter, Activit ...@@ -263,7 +263,7 @@ public class EditCourseActivity extends BaseActivity<PubCoursePresenter, Activit
} }
File file = new File(videoPath); File file = new File(videoPath);
if (file.length() > 500 * 1024 * 1024) { if (file.length() > 500 * 1024 * 1024) {
showToast(R.string.video_file_too_large); showToast(R.string.video_file_too_large_500);
videoPath = ""; videoPath = "";
} else { } else {
setVideoView(); setVideoView();
......
learnCenter/src/main/java/com/dayu/learncenter/ui/activity/PubCourseActivity.java
...@@ -183,7 +183,7 @@ public class PubCourseActivity extends BaseActivity<PubCoursePresenter, Activity ...@@ -183,7 +183,7 @@ public class PubCourseActivity extends BaseActivity<PubCoursePresenter, Activity
} }
File file = new File(videoPath); File file = new File(videoPath);
if (file.length() > 500 * 1024 * 1024) { if (file.length() > 500 * 1024 * 1024) {
showToast(R.string.video_file_too_large); showToast(R.string.video_file_too_large_500);
videoPath = ""; videoPath = "";
} else { } else {
setVideoView(); setVideoView();
...@@ -199,7 +199,7 @@ public class PubCourseActivity extends BaseActivity<PubCoursePresenter, Activity ...@@ -199,7 +199,7 @@ public class PubCourseActivity extends BaseActivity<PubCoursePresenter, Activity
} }
File file = new File(videoPath); File file = new File(videoPath);
if (file.length() > 500 * 1024 * 1024) { if (file.length() > 500 * 1024 * 1024) {
showToast(R.string.video_file_too_large); showToast(R.string.video_file_too_large_500);
videoPath = ""; videoPath = "";
} else { } else {
setVideoView(); setVideoView();
......
learnCenter/src/main/res/values/strings.xml
<resources> <resources>
<string name="app_name">LearnCenter</string> <string name="app_name">LearnCenter</string>
<string name="video_file_too_large">视频文件不能大于500M</string> <string name="video_file_too_large_300">视频文件不能大于300M</string>
<string name="video_file_too_large_500">视频文件不能大于500M</string>
<string name="take_video">拍摄</string> <string name="take_video">拍摄</string>
<string name="select_from_local">从本地选择</string> <string name="select_from_local">从本地选择</string>
<string name="video_upload_fail">视频上传失败</string> <string name="video_upload_fail">视频上传失败</string>
......
orderCenter/src/main/java/com/dayu/order/ui/activity/MultiProcessOrderActivity.java
...@@ -269,8 +269,8 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre ...@@ -269,8 +269,8 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
videoPath = mSelectList.get(0).getRealPath(); videoPath = mSelectList.get(0).getRealPath();
} }
File file = new File(videoPath); File file = new File(videoPath);
if (file.length() > 500 * 1024 * 1024) { if (file.length() > 100 * 1024 * 1024) {
showToast("视频文件不能大于500M"); showToast(R.string.video_file_too_large_100);
videoPath = ""; videoPath = "";
} else { } else {
setVideoView(); setVideoView();
...@@ -285,8 +285,8 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre ...@@ -285,8 +285,8 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
videoPath = mSelectList1.get(0).getRealPath(); videoPath = mSelectList1.get(0).getRealPath();
} }
File file = new File(videoPath); File file = new File(videoPath);
if (file.length() > 500 * 1024 * 1024) { if (file.length() > 100 * 1024 * 1024) {
showToast("视频文件不能大于500M"); showToast(R.string.video_file_too_large_100);
videoPath = ""; videoPath = "";
} else { } else {
setVideoView(); setVideoView();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment