图片工具代码更新

韩亚云
1 parent 4f62092f
Showing 6 changed files with 27 additions and 123 deletions
app/strike/src/main/java/com/cnlive/strike/imgutil/ImgActivity.java
core/imageload/src/main/java/com/cnlive/core/imagepreview/uti/DownloadUtil.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
core/imageload/src/main/res/layout/activity_preview_image_view.xml
core/imageload/src/main/res/layout/item_process_html.xml
@@ -21,8 +21,6 @@ import com.cnlive.core.imageload.callback.ImageDownLoadCallBack;
 import com.cnlive.core.imageload.config.PriorityMode;
 import com.cnlive.core.imageload.config.ScaleMode;
 import com.cnlive.core.imageload.loader.ImageLoader;
-import com.cnlive.core.imageload.preview.model.ImagePreviewShowInfo;
-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;
@@ -143,22 +141,19 @@ public class ImgActivity extends AppCompatActivity {
                 .scale(ScaleMode.CENTER_CROP)
                 .into(iv_test1);
-        PreviewData data = new PreviewData();
-        data.setCollection(true);
-        data.setSid(UserService.getUid(this));
-        data.setType("1");
-        data.setUserId(UserService.getUid(this));
-        data.setSave(true);
-
-        ArrayList<ImagePreviewShowInfo> list = new ArrayList<>();
-        ImagePreviewShowInfo info = new ImagePreviewShowInfo();
-        info.setImgPath(URL1);
-        info.setPreviewPath(URL1);
-        list.add(info);
-        data.setPicList(list);
-
-
-        data.setShowImg(URL1);
+//        PreViewImgData data = new PreViewImgData();
+//        data.setCollection(true);
+//        data.setType("1");
+//        data.setUserId(UserService.getUid(this));
+//        data.setSave(true);
+//        ArrayList<PreViewImgInfo> list = new ArrayList<>();
+//        PreViewImgInfo info = new PreViewImgInfo();
+//        info.setImgUrl(URL1);
+//        info.setPreviewImgUrl(URL1);
+//        list.add(info);
+//        data.setPicInfoList(list);
+//
+//        data.setShowImg(URL1);
 //        iv_test1.setOnClickListener(view -> PreviewImageViewActivity.startPreviewPictrue(this, view, data));
 //        LoadImage.with(this)
 package com.cnlive.core.imagepreview.uti;
 import android.content.Context;
+import android.os.Build;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
+import com.cnlive.core.libs.base.util.FileUtils;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -63,7 +66,7 @@ public class DownloadUtil {
                 FileOutputStream fos = null;
                 //储存下载文件的目录
-                String filePath = (AndroidQUtil.isAndroidQ()? context.getExternalFilesDir("") : Environment.getExternalStorageDirectory()) + File.separator + saveDir;
+                String filePath = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q? context.getExternalFilesDir("") : Environment.getExternalStorageDirectory()) + File.separator + saveDir;
                 String savePath = isExistDir(filePath);
                 try {
                     is = response.body().byteStream();
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Environment;
 import android.text.TextUtils;
 import android.util.Log;
@@ -12,6 +13,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.FutureTarget;
 import com.bumptech.glide.request.target.Target;
 import com.cnlive.core.imageload.api.ApiServiceStock;
+import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.FileTypeUtil;
 import com.cnlive.core.libs.base.util.FileUtils;
@@ -128,14 +130,14 @@ public class PreViewImagePresenter extends BasePresenter&lt;PreViewImageView&gt; {
         if (FileUtils.isFileExists(imagePath)) {
             List<String> list = new ArrayList();
             list.add(imagePath);
-            UploadLogic.uploadonePic(FLAG,context, true, list, new NetCallBack<List<FeedBackInfo>>() {
+            UploadLogic.uploadonePic(context, true, list, new NetCallBack<List<FeedBackInfo>>() {
                 @Override
                 public void onRequestState(int state) {
                 }
                 @Override
-                public void onSuccess(List<FeedBackInfo> data) {
+                public void onSuccess(List<com.cnlive.core.network.upload.model.FeedBackInfo> data) {
                     if (data.size() > 0) {
                         if (data.get(0).getImageUrl().contains("http")) {
                             collection(context, data.get(0).getImageUrl(), context.data);
@@ -159,7 +161,7 @@ public class PreViewImagePresenter extends BasePresenter&lt;PreViewImageView&gt; {
     private void collection(PreViewImageActivity context, String imagePath, PreViewImgData previewData) {
         if (previewData == null) return;
         Map<String, String> requestMap = new HashMap<>();
-        requestMap.put("appId", BuildConfig.APP_ID);
+        requestMap.put("appId", AppConfig.getAppId());
         requestMap.put("sid", previewData.getUserId());
         requestMap.put("type", previewData.getType());
         requestMap.put("img", imagePath);
@@ -190,7 +192,7 @@ public class PreViewImagePresenter extends BasePresenter&lt;PreViewImageView&gt; {
             requestMap.put("collectionType", previewData.getCollectionType());
         }
-        HttpConn.action(FLAG, BaseRequest.init()
+        HttpConn.action(BaseRequest.init()
                 .service(ApiServiceStock.class)
                 .collection(requestMap), new NetCallBack<BaseResult>() {
             @Override
@@ -200,12 +202,12 @@ public class PreViewImagePresenter extends BasePresenter&lt;PreViewImageView&gt; {
             @Override
             public void onSuccess(BaseResult data) {
-                if(getView() != null) getView().showSucessfulMessage("收藏成功");
+                ifViewAttached(view -> view.showSucessfulMessage("收藏成功"));
             }
             @Override
             public void onFailure(String errCode, String errMsg, Exception e) {
-                if(getView() != null) getView().showMessage(errMsg);
+                ifViewAttached(view -> view.showMessage(errMsg));
             }
         });
     }
@@ -229,7 +231,7 @@ public class PreViewImagePresenter extends BasePresenter&lt;PreViewImageView&gt; {
                 String filePath = "Strike" + File.separator + "video";
                 String md5 = MD5Util.getMD5(file);
                 InputStream inStream = new FileInputStream(file); //读入原文件
-                File appDir = new File((AndroidQUtil.isAndroidQ()? activity.getExternalFilesDir("") : Environment.getExternalStorageDirectory()), filePath);
+                File appDir = new File((Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q? activity.getExternalFilesDir("") : Environment.getExternalStorageDirectory()), filePath);
                 if (!appDir.exists()) appDir.mkdir();
                 String type = FileTypeUtil.getFileType(file.getAbsolutePath());
@@ -230,7 +230,7 @@ public class PreViewImageView extends BaseView {
         File file = new File(content); //pic 1  video 3
         if (!FileUtils.isFileExists(content)) return;
         ArrayList<Media> medialist = new ArrayList<>();
-        Media media = new Media(file.getPath(), file.getName(), 1, 1, file.length(), 0, "",Uri.fromFile(file).toString());
+        Media media = new Media(file.getPath(), file.getName(), 1, 1, file.length(), 0, "");
         medialist.add(media);
         PreviewRouters.startReleaseManagementAcityity(activity, file.getPath(), file.getName(), 1, 1, file.length(), 0, "");
         if (activity == null) activity.finish();
-<?xml version="1.0" encoding="utf-8"?>
-
-<layout>
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/black"
-        tools:context=".preview.PreviewImageViewActivity">
-
-        <ImageView
-            android:id="@+id/iv_error"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:scaleType="fitCenter"
-            android:background="@drawable/preview_zwtp"
-            android:visibility="gone"/>
-
-        <com.cnlive.core.imageload.preview.widget.MutipleTouchViewPager
-            android:id="@+id/vp_photos"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/black"
-            android:layout_centerInParent="true"
-            />
-
-        <LinearLayout
-            android:id="@+id/rl_indicator"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="40dp"
-            android:orientation="horizontal"
-            android:visibility="gone">
-            <TextView
-                android:id="@+id/tv_current"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/white"
-                android:textSize="18sp" />
-
-            <TextView
-                android:id="@+id/tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="3dp"
-                android:textColor="@color/white"
-                android:text="/"
-                android:textSize="18sp" />
-
-            <TextView
-                android:id="@+id/tv_All"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="3dp"
-                android:textSize="18sp"
-                android:textColor="@color/white"/>
-        </LinearLayout>
-    </RelativeLayout>
-</layout>
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-
-    <data>
-
-        <variable
-            name="data"
-            type="com.cnlive.core.imageload.preview.model.ProcessImageInfo" />
-    </data>
-
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/root"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white">
-
-        <TextView
-            android:id="@+id/tv_item"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:padding="15dp"
-            android:textColor="@color/color_333" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/tv_item"
-            android:background="#f2f3f4" />
-    </RelativeLayout>
-</layout>