Skip to content

android / dayu

Go to a project
Commit 8afaae07 by wukun
Options

部分相机相册功能,兼容安卓高版本

parent 33f3085f
Inline Side-by-side
Showing with 36 additions and 10 deletions
managercenter/src/main/java/com/dayu/managercenter/ui/activity/CreateOrderActivity.java
...@@ -510,7 +510,11 @@ public class CreateOrderActivity extends BaseActivity<CreateOrderPresenter, Acti ...@@ -510,7 +510,11 @@ public class CreateOrderActivity extends BaseActivity<CreateOrderPresenter, Acti
if (!TextUtils.isEmpty(selectList.get(a).getCompressPath())){ if (!TextUtils.isEmpty(selectList.get(a).getCompressPath())){
mImages.add(selectList.get(a).getCompressPath()); mImages.add(selectList.get(a).getCompressPath());
}else{ }else{
mImages.add(selectList.get(a).getPath()); String path = selectList.get(a).getPath();
if (path.contains("content")){
path = selectList.get(a).getRealPath();
}
mImages.add(path);
} }
} }
if (mImages.size() < 10) { if (mImages.size() < 10) {
......
orderCenter/src/main/java/com/dayu/order/ui/activity/MultiProcessOrderActivity.java
...@@ -15,7 +15,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; ...@@ -15,7 +15,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.base.ui.activity.BaseActivity; import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.activity.CameraActivity;
import com.dayu.base.ui.adapter.PhotoViewAdapter; import com.dayu.base.ui.adapter.PhotoViewAdapter;
import com.dayu.base.ui.adapter.SpacesItemDecoration; import com.dayu.base.ui.adapter.SpacesItemDecoration;
import com.dayu.common.Constants; import com.dayu.common.Constants;
...@@ -43,12 +42,9 @@ import org.greenrobot.eventbus.Subscribe; ...@@ -43,12 +42,9 @@ import org.greenrobot.eventbus.Subscribe;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
import cn.jzvd.Jzvd; import cn.jzvd.Jzvd;
import cn.jzvd.JzvdStd; import cn.jzvd.JzvdStd;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
/** /**
* Created by luofan * Created by luofan
...@@ -252,7 +248,11 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre ...@@ -252,7 +248,11 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
if (!TextUtils.isEmpty(selectList.get(a).getCompressPath())) { if (!TextUtils.isEmpty(selectList.get(a).getCompressPath())) {
mImages.add(selectList.get(a).getCompressPath()); mImages.add(selectList.get(a).getCompressPath());
} else { } else {
mImages.add(selectList.get(a).getPath()); String path = selectList.get(a).getPath();
if (path.contains("content")){
path = selectList.get(a).getRealPath();
}
mImages.add(path);
} }
} }
if (mImages.size() < 5) { if (mImages.size() < 5) {
...@@ -281,6 +281,9 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre ...@@ -281,6 +281,9 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
List<LocalMedia> mSelectList1 = PictureSelector.obtainSelectorList(data); List<LocalMedia> mSelectList1 = PictureSelector.obtainSelectorList(data);
if (mSelectList1 != null) { if (mSelectList1 != null) {
videoPath = mSelectList1.get(0).getPath(); videoPath = mSelectList1.get(0).getPath();
if (videoPath.contains("content")){
videoPath = mSelectList1.get(0).getRealPath();
}
File file = new File(videoPath); File file = new File(videoPath);
if (file.length() > 500 * 1024 * 1024) { if (file.length() > 500 * 1024 * 1024) {
showToast("视频文件不能大于500M"); showToast("视频文件不能大于500M");
......
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
...@@ -558,7 +558,11 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent ...@@ -558,7 +558,11 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
if (!TextUtils.isEmpty(mSelectList.get(a).getCompressPath())) { if (!TextUtils.isEmpty(mSelectList.get(a).getCompressPath())) {
mPayerImages.add(mSelectList.get(a).getCompressPath()); mPayerImages.add(mSelectList.get(a).getCompressPath());
} else { } else {
mPayerImages.add(mSelectList.get(a).getPath()); String path = mSelectList.get(a).getPath();
if (path.contains("content")){
path = mSelectList.get(a).getRealPath();
}
mPayerImages.add(path);
} }
} }
if (mPayerImages.size() < 10) { if (mPayerImages.size() < 10) {
......
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartReceiveActivity.java
...@@ -86,7 +86,11 @@ public class OrderPartReceiveActivity extends BaseActivity<PartRecievePresenter, ...@@ -86,7 +86,11 @@ public class OrderPartReceiveActivity extends BaseActivity<PartRecievePresenter,
if (!TextUtils.isEmpty(selectList.get(a).getCompressPath())) { if (!TextUtils.isEmpty(selectList.get(a).getCompressPath())) {
mImages.add(selectList.get(a).getCompressPath()); mImages.add(selectList.get(a).getCompressPath());
} else { } else {
mImages.add(selectList.get(a).getPath()); String path = selectList.get(a).getPath();
if (path.contains("content")){
path = selectList.get(a).getRealPath();
}
mImages.add(path);
} }
} }
if (mImages.size() < maxImgCount) { if (mImages.size() < maxImgCount) {
......
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartSendActivity.java
...@@ -154,7 +154,11 @@ public class OrderPartSendActivity extends BaseActivity<PartSendPresenter, Activ ...@@ -154,7 +154,11 @@ public class OrderPartSendActivity extends BaseActivity<PartSendPresenter, Activ
if (!TextUtils.isEmpty(selectList.get(a).getCompressPath())) { if (!TextUtils.isEmpty(selectList.get(a).getCompressPath())) {
mImages.add(selectList.get(a).getCompressPath()); mImages.add(selectList.get(a).getCompressPath());
} else { } else {
mImages.add(selectList.get(a).getPath()); String path = selectList.get(a).getPath();
if (path.contains("content")){
path = selectList.get(a).getRealPath();
}
mImages.add(path);
} }
} }
if (mImages.size() < maxImgCount) { if (mImages.size() < maxImgCount) {
......
orderCenter/src/main/java/com/dayu/order/ui/activity/ProcessOrderActivity.java
...@@ -373,7 +373,11 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac ...@@ -373,7 +373,11 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
if (!TextUtils.isEmpty(mSelectList.get(a).getCompressPath())){ if (!TextUtils.isEmpty(mSelectList.get(a).getCompressPath())){
mImages.add(mSelectList.get(a).getCompressPath()); mImages.add(mSelectList.get(a).getCompressPath());
}else{ }else{
mImages.add(mSelectList.get(a).getPath()); String path = mSelectList.get(a).getPath();
if (path.contains("content")){
path = mSelectList.get(a).getRealPath();
}
mImages.add(path);
} }
} }
if (mImages.size() < 10) { if (mImages.size() < 10) {
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UploadSelfLicenceActivity.java
...@@ -145,6 +145,9 @@ public class UploadSelfLicenceActivity extends BaseActivity<SImplePresenter, Act ...@@ -145,6 +145,9 @@ public class UploadSelfLicenceActivity extends BaseActivity<SImplePresenter, Act
imgPath = mSelectList.get(a).getCompressPath(); imgPath = mSelectList.get(a).getCompressPath();
} else { } else {
imgPath = mSelectList.get(a).getPath(); imgPath = mSelectList.get(a).getPath();
if (imgPath.contains("content")){
imgPath = mSelectList.get(a).getRealPath();
}
} }
GlideImageLoader.loadFit(UploadSelfLicenceActivity.this,mBind.ivImg,imgPath); GlideImageLoader.loadFit(UploadSelfLicenceActivity.this,mBind.ivImg,imgPath);
} }
......
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