全屏预览图片长按事件测试优化

韩亚云
1 parent 2be20c32
Showing 5 changed files with 66 additions and 30 deletions
app/strike/src/main/java/com/cnlive/strike/imgutil/ImgActivity.java
core/imageload/src/main/java/com/cnlive/core/ui/activity/PreViewImageActivity.java
core/imageload/src/main/java/com/cnlive/core/ui/model/PreViewImgInfo.java
core/imageload/src/main/java/com/cnlive/core/ui/presenter/PreViewImagePresenter.java
core/imageload/src/main/java/com/cnlive/core/ui/view/PreViewImageView.java
@@ -26,8 +26,11 @@ import com.cnlive.core.imageload.preview.model.PreviewData;
 import com.cnlive.core.imageload.util.DownLoadImageService;
 import com.cnlive.cloud.R;
 import com.cnlive.cloud.user.auth.UserService;
+import com.cnlive.core.ui.model.PreViewImgData;
+import com.cnlive.core.ui.model.PreViewImgInfo;
 import java.util.ArrayList;
+import java.util.List;
 public class ImgActivity extends AppCompatActivity {
@@ -89,14 +92,29 @@ public class ImgActivity extends AppCompatActivity {
         findViewById(R.id.simpla_see).setOnClickListener(view -> startActivity(new Intent(this,SimplePrevActivity.class)));
         findViewById(R.id.pre_btn).setOnClickListener(view -> {
-//            ArrayList<String> list = new ArrayList<>();
-//            list.add("https://b-ssl.duitang.com/uploads/item/201505/09/20150509221719_kyNrM.jpeg");
-//            list.add("https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1035013881,3985887911&fm=26&gp=0.gif");
-//            list.add("https://b-ssl.duitang.com/uploads/item/201505/11/20150511122951_MAwVZ.jpeg");
-//            list.add("https://b-ssl.duitang.com/uploads/item/201704/23/20170423205828_BhNSv.jpeg");
-//            ARouter.getInstance().build("/preview/PreViewImageActivity")
-//                    .withStringArrayList("paths", list)
-//                    .navigation(this);
+            PreViewImgData data = new PreViewImgData();
+            data.setType("1");
+            PreViewImgInfo cuData = new PreViewImgInfo();
+            cuData.setImgUrl("https://b-ssl.duitang.com/uploads/item/201505/09/20150509221719_kyNrM.jpeg");
+            data.setCurrPrewInfo(cuData);
+
+            List<PreViewImgInfo> preViewImgInfos = new ArrayList<>();
+            preViewImgInfos.add(cuData);
+            PreViewImgInfo cuData1 = new PreViewImgInfo();
+            cuData1.setImgUrl("https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1035013881,3985887911&fm=26&gp=0.gif");
+            preViewImgInfos.add(cuData1);
+            PreViewImgInfo cuData2 = new PreViewImgInfo();
+            cuData2.setImgUrl("https://b-ssl.duitang.com/uploads/item/201505/11/20150511122951_MAwVZ.jpeg");
+            preViewImgInfos.add(cuData2);
+
+            data.setPicInfoList(preViewImgInfos);
+            data.setFriend(true);
+            data.setCollection(true);
+            data.setLife(true);
+            data.setSave(true);
+            ARouter.getInstance().build("/preview/PreViewImageActivity")
+                    .withSerializable("data", data)
+                    .navigation(this);
         });
     }
@@ -11,7 +11,6 @@ import com.cnlive.core.imageload.databinding.ActivityPreviewImageBinding;
 import com.cnlive.core.imageload.preview.PreviewImageViewActivity;
 import com.cnlive.core.imagepreview.ViewerStatus;
 import com.cnlive.core.imagepreview.listener.OnItemClickListener;
-import com.cnlive.core.imagepreview.listener.OnItemLongPressListener;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.ui.model.PreViewImgData;
 import com.cnlive.core.ui.presenter.PreViewImagePresenter;
@@ -39,7 +38,7 @@ public class PreViewImageActivity extends BaseActivity&lt;PreViewImageView, PreView
     }
     @Override
-    protected int getViewLayoutId() {
+    protected int getBindLayoutId() {
         return R.layout.activity_preview_image;
     }
 package com.cnlive.core.ui.model;
+import java.io.Serializable;
+
 /**
  * created by hanyayun
  * on 2020/2/21
  */
-public class PreViewImgInfo {
+public class PreViewImgInfo implements Serializable {
     //原图
     private String imgUrl;
     //预览图
@@ -52,7 +52,6 @@ import io.reactivex.schedulers.Schedulers;
  */
 public class PreViewImagePresenter extends BasePresenter<PreViewImageView> {
-
     /**
      * 分享好友、生活圈
      *
@@ -63,7 +62,8 @@ public class PreViewImagePresenter extends BasePresenter&lt;PreViewImageView&gt; {
     public void shareFriendLife(Context mContext, String type, String imgUrl) {
         if (TextUtils.isEmpty(imgUrl)) return;
         if (mContext == null) return;
-        ifViewAttached(view -> view.showLoading());
+        if(getView() != null) getView().showLoading();
+//        ifViewAttached(view -> view.showLoading());
         Observable.create((ObservableOnSubscribe<String>) emitter -> {
             if (FileUtils.isFileExists(imgUrl) && FileUtils.getFileByPath(imgUrl).length() > 0) {
                 emitter.onNext(imgUrl);
@@ -88,26 +88,35 @@ public class PreViewImagePresenter extends BasePresenter&lt;PreViewImageView&gt; {
             @Override
             public void onNext(String content) {
-                ifViewAttached(view -> view.hideLoading());
+                if(getView() != null) getView().hideLoading();
+//                ifViewAttached(view -> view.hideLoading());
                 if (!TextUtils.isEmpty(content)) {
                     if (type.equals("friends")) {
-                        ifViewAttached(view -> view.shareFriends(content));
+                        if(getView() != null) getView().shareFriends(content);
+//                        ifViewAttached(view -> view.shareFriends(content));
                     } else if (type.equals("life")) {
-                        ifViewAttached(view -> view.shareLife(content));
+                        if(getView() != null) getView().shareLife(content);
+//                        ifViewAttached(view -> view.shareLife(content));
                     } else {
-                        ifViewAttached(view -> view.showMessage("类型异常"));
+                        if(getView() != null) getView().showMessage("类型异常");
+//                        ifViewAttached(view -> view.showMessage("类型异常"));
                     }
                 } else {
-                    ifViewAttached(view -> view.showMessage("非法图片地址"));
+                    if(getView() != null) getView().showMessage("非法图片地址");
+//                    ifViewAttached(view -> view.showMessage("非法图片地址"));
                 }
             }
             @Override
             public void onError(Throwable e) {
-                ifViewAttached(view -> {
-                    view.hideLoading();
-                    view.showMessage(e.getMessage());
-                });
+//                ifViewAttached(view -> {
+                    if(getView() != null) {
+                        getView().hideLoading();
+                        getView().showMessage(e.getMessage());
+                    }
+//                    view.hideLoading();
+//                    view.showMessage(e.getMessage());
+//                });
             }
             @Override
@@ -219,17 +228,21 @@ public class PreViewImagePresenter extends BasePresenter&lt;PreViewImageView&gt; {
      * @param url
      */
     public void savePicture(Activity context, String url) {
-        ifViewAttached(view -> view.hideLoading());
+        if(getView() != null) getView().hideLoading();
+//        ifViewAttached(view -> view.hideLoading());
         if (TextUtils.isEmpty(url)) {
-            ifViewAttached(view -> view.showMessage("非法图片地址"));
+            if(getView() != null) getView().showMessage("非法图片地址");
+//            ifViewAttached(view -> view.showMessage("非法图片地址"));
             return;
         }
         if (FileUtils.isFileExists(url)) {
 //            本地图片 做copy操作
-            ifViewAttached(view -> view.saveLocalImg(url));
+            if(getView() != null) getView().saveLocalImg(url);
+//            ifViewAttached(view -> view.saveLocalImg(url));
         } else {
             if (!url.contains("http")) {
-                ifViewAttached(view -> view.showMessage("非法图片地址"));
+                if(getView() != null) getView().showMessage("非法图片地址");
+//                ifViewAttached(view -> view.showMessage("非法图片地址"));
                 return;
             }
             Observable.create(new ObservableOnSubscribe<String>() {
@@ -256,15 +269,18 @@ public class PreViewImagePresenter extends BasePresenter&lt;PreViewImageView&gt; {
                 @Override
                 public void onNext(String s) {
                     if (!TextUtils.isEmpty(s)) {
-                        ifViewAttached(view -> view.saveLocalImg(s));
+                        if(getView() != null) getView().saveLocalImg(s);
+//                        ifViewAttached(view -> view.saveLocalImg(s));
                     } else {
-                        ifViewAttached(view -> view.showMessage("数据异常"));
+                        if(getView() != null) getView().showMessage("数据异常");
+//                        ifViewAttached(view -> view.showMessage("数据异常"));
                     }
                 }
                 @Override
                 public void onError(Throwable e) {
-                    ifViewAttached(view -> view.showMessage(e.getMessage()));
+                    if(getView() != null) getView().showMessage(e.getMessage());
+//                    ifViewAttached(view -> view.showMessage(e.getMessage()));
                 }
                 @Override
@@ -79,7 +79,8 @@ public class PreViewImageView extends BaseView {
                 PreViewImgInfo curPreInfo = activity.data.getCurrPrewInfo();
                 for (int i = 0; i < preViewImgList.size(); i++) {
                     activity.picList.add(TextUtils.isEmpty(preViewImgList.get(i).getPreviewImgUrl()) ? preViewImgList.get(i).getImgUrl() : preViewImgList.get(i).getPreviewImgUrl());
-                    if (curPreInfo.getPreviewImgUrl().equals(preViewImgList.get(i).getPreviewImgUrl()) || curPreInfo.getImgUrl().equals(preViewImgList.get(i).getImgUrl())) {
+                    if ((!TextUtils.isEmpty(preViewImgList.get(i).getPreviewImgUrl()) && !TextUtils.isEmpty(curPreInfo.getPreviewImgUrl()) && curPreInfo.getPreviewImgUrl().equals(preViewImgList.get(i).getPreviewImgUrl()) )
+                            || (!TextUtils.isEmpty(preViewImgList.get(i).getImgUrl()) && !TextUtils.isEmpty(curPreInfo.getImgUrl()) && curPreInfo.getImgUrl().equals(preViewImgList.get(i).getImgUrl()))) {
                         activity.position = i;
                     }
                 }