云盘上传下载提交

韩亚云
1 parent bc6fd306
Showing 12 changed files with 175 additions and 65 deletions
updownfile/libs/mylib.jar
updownfile/src/main/java/com/cnlive/updownfile/util/EnterFile.java
updownfile/src/main/java/com/cnlive/updownfile/util/ZipUtil.java
updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/Constant.java
updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/adapter/TaskDoingAdapter.java
updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/ui/DiretoryActivity.java
updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/ui/InitViewActivity.java
updownfile/src/main/res/drawable-hdpi/icon_list_download.png
updownfile/src/main/res/drawable-hdpi/icon_list_upload.png
updownfile/src/main/res/layout/activity_init_view.xml
updownfile/src/main/res/layout/item_task_info.xml
updownfile/src/main/res/values/strings.xml
@@ -6,7 +6,6 @@ import android.content.Intent;
 import com.cnlive.media.picker.ImagePicker;
 import com.cnlive.media.picker.PickerConfig;
 import com.cnlive.media.picker.entity.Media;
-import com.cnlive.updownfile.xiaoRay.Constant;
 import java.util.ArrayList;
@@ -15,9 +15,19 @@ import com.cnlive.updownfile.xiaoRay.view.MD5;
 import com.qiniu.pili.droid.shortvideo.PLShortVideoTranscoder;
 import com.qiniu.pili.droid.shortvideo.PLVideoSaveListener;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 import io.reactivex.disposables.Disposable;
 import top.zibin.luban.CompressionPredicate;
@@ -220,4 +230,107 @@ public class ZipUtil {
             4000 * 1000,
             8000 * 1000,
     };
+
+    /**
+     * 解压缩功能.
+     * 将zipFile文件解压到folderPath目录下.
+     *
+     * @throws Exception
+     */
+    public static void upZipFile(File zipFile, String folderPath, String url, Context context) throws IOException {
+        File dirFile = new File(folderPath);
+        if (!dirFile.exists()) {
+            dirFile.mkdir();
+        }
+        ZipFile zfile = new ZipFile(zipFile);
+        Enumeration zList = zfile.entries();
+        ZipEntry ze = null;
+        byte[] buf = new byte[1024];
+        while (zList.hasMoreElements()) {
+            ze = (ZipEntry) zList.nextElement();
+            if (ze.isDirectory()) {
+                String dirstr = folderPath + ze.getName();
+                dirstr = new String(dirstr.getBytes("8859_1"), "GB2312");
+                File tmpFile = new File(dirstr);
+                continue;
+            }
+            File file = getRealFileName(folderPath, ze.getName());
+            if (file.exists()) {
+                continue;
+            }
+            OutputStream os = new BufferedOutputStream(new FileOutputStream(getRealFileName(folderPath, ze.getName())));
+            InputStream is = new BufferedInputStream(zfile.getInputStream(ze));
+            int readLen = 0;
+            while ((readLen = is.read(buf, 0, 1024)) != -1) {
+                os.write(buf, 0, readLen);
+            }
+            is.close();
+            os.close();
+        }
+        zfile.close();
+        //下载成功后，把文件名当作key,保存
+//        Hawk.put(zipFile.getName(),"1");
+        //解压完之后  删除压缩包
+        deleteDir(zipFile);
+    }
+
+    /**
+     * 给定根目录，返回一个相对路径所对应的实际文件名.
+     *
+     * @param baseDir     指定根目录
+     * @param absFileName 相对路径名，来自于ZipEntry中的name
+     * @return java.io.File 实际的文件
+     */
+    public static File getRealFileName(String baseDir, String absFileName) {
+        String[] dirs = absFileName.split("/");
+        File ret = new File(baseDir);
+        String substr = null;
+        if (dirs.length > 1) {
+            for (int i = 0; i < dirs.length - 1; i++) {
+                substr = dirs[i];
+                try {
+                    substr = new String(substr.getBytes("8859_1"), "GB2312");
+                } catch (UnsupportedEncodingException e) {
+                    e.printStackTrace();
+                }
+                ret = new File(ret, substr);
+            }
+            if (!ret.exists()) {
+                ret.mkdirs();
+            }
+            substr = dirs[dirs.length - 1];
+            try {
+                substr = new String(substr.getBytes("8859_1"), "GB2312");
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+
+            ret = new File(ret, substr);
+            return ret;
+        }
+        return ret;
+    }
+
+
+    /**
+     * 删除整个文件夹 或者文件
+     *
+     * @param file
+     */
+    public static void deleteDir(File file) {
+        if (!file.exists()) {
+            return;
+        }
+        if (file.isDirectory()) {
+            File[] childFiles = file.listFiles();
+            if (childFiles == null || childFiles.length == 0) {
+                file.delete();
+            }
+
+            for (int index = 0; index < childFiles.length; index++) {
+                deleteDir(childFiles[index]);
+            }
+        }
+        file.delete();
+    }
 }
@@ -2,6 +2,7 @@ package com.cnlive.updownfile.xiaoRay;
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.widget.TextView;
 import android.widget.Toast;
 import com.xiaoray.raysdk.RayLib;
@@ -9,15 +10,15 @@ import com.xiaoray.raysdk.listener.ConnectCloudListener;
 import com.xiaoray.raysdk.utils.OkHttpUtils.CloudRequest;
 public class Constant {
-    //聊天页面视频文件最大19.5M(腾讯短视频最大20M,存在问题)
-    public static final int MEDIA_MAX_SIZE = 19 * 1024 * 1024 + 512 * 1024;
-    //聊天页面图片文件最大20M
-    public static final int IMAGE_MAX_SIZE = 20 * 1024 * 1024;
+    //聊天页面视频文件最大19.5M(腾讯短视频最大20M,存在问题)19 * 1024 * 1024 + 512 * 1024;
+    public static final int MEDIA_MAX_SIZE = 19 * 1024 * 10240 + 512 * 10240;
+    //聊天页面图片文件最大200M
+    public static final int IMAGE_MAX_SIZE = 20 * 1024 * 10240;
     //聊天页面文件最大28M
     public static final int FILE_MAX_SIZE = 28 * 1024 * 1024;
     public static ProgressDialog waitingDialog;
-    public static void initXiaoRay(Context context, String mac, String u_id, String code, String term_id) {
+    public static void initXiaoRay(Context context, String mac, String u_id, String code, String term_id, TextView restle) {
         if(waitingDialog == null){
             RayLib.init(context);
             waitingDialog = new ProgressDialog(context);
@@ -31,14 +32,16 @@ public class Constant {
                     @Override
                     public void connectSuc() {
                         if(waitingDialog.isShowing())waitingDialog.dismiss();
-                        Toast.makeText(context, "连接设备成功,IP:" + CloudRequest.getInstance()
-                                .getIp(), Toast.LENGTH_LONG).show();
+                        restle.setText("连接成功");
+//                        Toast.makeText(context, "连接设备成功,IP:" + CloudRequest.getInstance()
+//                                .getIp(), Toast.LENGTH_LONG).show();
                     }
                     @Override
                     public void error(int error, String errorInfo) {
                         if(waitingDialog.isShowing())waitingDialog.dismiss();
-                        Toast.makeText(context, "连接设备失败:" + error, Toast.LENGTH_LONG)
+                        restle.setText("连接失败："+error);
+                        Toast.makeText(context, "连接设备失败:" + error+",点击重新连接", Toast.LENGTH_LONG)
                                 .show();
                     }
@@ -32,20 +32,20 @@ public class TaskDoingAdapter extends BaseQuickAdapter&lt;TaskInfoItem, BaseViewHol
         helper.setText(R.id.tv_name, lv1.getEtDoing().getFileName());
-        if (lv1.getProgress() > 0) {
-            helper.setVisible(R.id.tv_progress_num, true);
-            helper.setText(R.id.tv_progress_num, lv1.getProgress() + "");
-        } else {
-            helper.setVisible(R.id.tv_progress_num, false);
-        }
+//        if (lv1.getProgress() > 0) {
+//            helper.setVisible(R.id.tv_progress_num, true);
+//            helper.setText(R.id.tv_progress_num, lv1.getProgress() + "");
+//        } else {
+//            helper.setVisible(R.id.tv_progress_num, false);
+//        }
         if (lv1.getTaskType() == TaskType.UPLOAD) {
-//            RayGlide.loadFromRes(mContext,
-//                    R.mipmap.icon_list_upload, (ImageView) helper.getView(R.id.iv_start));
+            RayGlide.loadFromRes(mContext,
+                    R.drawable.icon_list_upload, (ImageView) helper.getView(R.id.iv_start));
         } else {
-//            RayGlide.loadFromRes(mContext,
-//                    R.mipmap.icon_list_download, (ImageView) helper.getView(R.id.iv_start));
+            RayGlide.loadFromRes(mContext,
+                    R.drawable.icon_list_download, (ImageView) helper.getView(R.id.iv_start));
         }
         if (!TextUtils.isEmpty(((TaskInfoItem) lv1).getSpeed())) {
             helper.setText(R.id.tv_speed, ((TaskInfoItem) lv1).getSpeed());
@@ -31,6 +31,7 @@ import com.cnlive.media.picker.PickerConfig;
 import com.cnlive.media.picker.entity.Media;
 import com.cnlive.updownfile.R;
 import com.cnlive.updownfile.util.DownloadUtil;
+import com.cnlive.updownfile.util.EnterFile;
 import com.cnlive.updownfile.util.UploadUtil;
 import com.cnlive.updownfile.xiaoRay.Constant;
 import com.cnlive.updownfile.xiaoRay.adapter.ShowDiretoryAdapter;
@@ -151,6 +152,10 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
                 } else {
                     popup.getMenu().getItem(2).setVisible(false);
                 }
+
+                if(fileBean.getFile_type_Int() == FileType.TYPE_DIRECTORY){
+                    popup.getMenu().getItem(4).setVisible(false);
+                }
                 //绑定菜单项的点击事件
                 popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                     @Override
@@ -285,7 +290,7 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
                                 }
                             });
                         }else if(item.getItemId() == R.id.menu_down){
-                            RayToast.showShort("本地文件中的xiaoRay查看");
+                            RayToast.showShort("已经添加到任务列表，请在本地文件中的xiaoRay查看");
                             ArrayList<LocalCloudPath> arrayLists = new ArrayList<>();
                             String localPath = Environment.getExternalStorageDirectory().toString() + "/xiaoRay";
                             File file = new File(localPath);
@@ -306,22 +311,6 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
         rcyDataShow.setAdapter(showFilesAdapter);
         refreshDataShow.setEnableLoadmore(false);
         refreshDataShow.startRefresh();
-
-        //上传完成通知刷新
-        RayLib.setDoneListener(new RayDoneListener() {
-            @Override
-            public void doneAdd(BusTaskDoneAdd busTaskDoneAdd) {
-                //下载完成
-                loadingLocal.setVisibility(View.GONE);
-                RayToast.showShort("下载完成");
-                getDiretorys(true, fileType == 0 ? true : false);
-            }
-
-            @Override
-            public void doneDel(BusTaskDoneDel busTaskDoneDel) {
-
-            }
-        });
     }
     private void initListener() {
@@ -336,7 +325,7 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
         showFilesAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
             @Override
             public void onLoadMoreRequested() {
-                getDiretorys(true, fileType == 0 ? true : false);
+                getDiretorys(false, fileType == 0 ? true : false);
             }
         });
         showFilesAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@@ -346,6 +335,8 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
                     Intent intent = new Intent(DiretoryActivity.this, DiretoryActivity.class);
                     intent.putExtra("path", showFilesAdapter.getData().get(position).getPath() + showFilesAdapter.getData().get(position).getFname() + File.separator);
                     startActivity(intent);
+                }else {
+
                 }
             }
         });
@@ -386,12 +377,10 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
                 public void onResponseString(String s) {
                     Gson gson = new Gson();
                     RecyclerBean bean = gson.fromJson(s, RecyclerBean.class);
-                    refreshDataShow.finishRefreshing();
                     isLoadingFinished = true;
                     if (header) {
                         showFilesAdapter.setNewData(bean.getData());
                         refreshDataShow.finishRefreshing();
-                        showFilesAdapter.loadMoreEnd();
                     } else {
                         if (bean.getData().size() > 0)
                             showFilesAdapter.addData(bean.getData());
@@ -416,12 +405,10 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
                     @Override
                     public void onResponseString(String s) {
-                        refreshDataShow.finishRefreshing();
                         isLoadingFinished = true;
                         if (header) {
                             showFilesAdapter.setNewData(parseResult(s, false));
                             refreshDataShow.finishRefreshing();
-                            showFilesAdapter.loadMoreEnd();
                         } else {
                             if (parseResult(s, false) != null && parseResult(s, false).size() > 0)
                                 showFilesAdapter.addData(parseResult(s, false));
@@ -446,12 +433,10 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
                     @Override
                     public void onResponseString(String s) {
-                        refreshDataShow.finishRefreshing();
                         isLoadingFinished = true;
                         if (header) {
                             showFilesAdapter.setNewData(parseResult(s, true));
                             refreshDataShow.finishRefreshing();
-                            showFilesAdapter.loadMoreEnd();
                         } else {
                             if (parseResult(s, true) != null && parseResult(s, true).size() > 0)
                                 showFilesAdapter.addData(parseResult(s, true));
@@ -526,17 +511,8 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
                 }
             });
         } else if (vid == R.id.add_picture) {//添加文件
-            ImagePicker imagePicker = new ImagePicker.Builder()
-                    .setSelectGif(true)
-                    .maxNum(9)
-                    .selectMode(PickerConfig.PICKER_IMAGE_VIDEO)
-                    .maxVideoSize(Constant.MEDIA_MAX_SIZE)
-                    .maxImageSize(Constant.IMAGE_MAX_SIZE)
-//                    .cachePath(CacheUtil.getConversationCachePath())
-                    .builder();
-            imagePicker.start(DiretoryActivity.this, REQUEST_PICKER, PickerConfig.DEFAULT_RESULT_CODE);
-//            EnterFile.startPickerImageAndVideo(DiretoryActivity.this,true,9, PickerConfig.PICKER_IMAGE_VIDEO,
-//                    Constant.MEDIA_MAX_SIZE,Constant.IMAGE_MAX_SIZE,"",REQUEST_PICKER);
+            EnterFile.startPickerImageAndVideo(DiretoryActivity.this,true,9, PickerConfig.PICKER_IMAGE_VIDEO,
+                    Constant.MEDIA_MAX_SIZE,Constant.IMAGE_MAX_SIZE,null,REQUEST_PICKER);
         } else if (vid == R.id.add_file) {
             startPickerFile();
         } else if (vid == R.id.clear_recyfile) {//清空回收站
@@ -579,8 +555,7 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
                     lists.add(localCloudPath);
                 }
                 UploadUtil.xiaoRayUploadFile(this, lists);
-                loadingLocal.setVisibility(View.VISIBLE);
-                Toast.makeText(this, "正在开始上传", Toast.LENGTH_LONG).show();
+                Toast.makeText(this, "已添加到任务列表", Toast.LENGTH_LONG).show();
                 break;
             case 1009:
                 if (data == null) {
@@ -598,7 +573,7 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
                     listss.add(localCloudPath);
                 }
                 UploadUtil.xiaoRayUploadFile(this, listss);
-                Toast.makeText(this, "正在开始上传", Toast.LENGTH_LONG).show();
+                Toast.makeText(this, "已添加到任务列表", Toast.LENGTH_LONG).show();
                 break;
         }
     }
 package com.cnlive.updownfile.xiaoRay.ui;
-import android.os.Environment;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.TextView;
 import com.cnlive.updownfile.R;
-import com.cnlive.updownfile.util.DownloadUtil;
 import com.cnlive.updownfile.xiaoRay.Constant;
 import com.xiaoray.raysdk.RayLib;
-import com.xiaoray.raysdk.entity.bean.LocalCloudPath;
 import com.xiaoray.raysdk.utils.OkHttpUtils.HttpResult;
 import com.xiaoray.raysdk.view.RayToast;
-import java.util.ArrayList;
 public class InitViewActivity extends AppCompatActivity implements View.OnClickListener {
@@ -22,12 +18,14 @@ public class InitViewActivity extends AppCompatActivity implements View.OnClickL
     private TextView enter_file;
     private TextView recyclerFiles;
     private TextView again;
+    private TextView connect_result;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_init_view);
-        Constant.initXiaoRay(this, "a4:11:63:61:00:02", "8656", "625624", "3D6B5148-98D8-4642-9909-45AEBBEEC8E0");
+        connect_result = findViewById(R.id.connect_result);
+        Constant.initXiaoRay(this, "a4:11:63:61:00:02", "8656", "625624", "3D6B5148-98D8-4642-9909-45AEBBEEC8E0",connect_result);
         initView();
     }
@@ -38,6 +36,7 @@ public class InitViewActivity extends AppCompatActivity implements View.OnClickL
         again = findViewById(R.id.again);
+
         show_data.setOnClickListener(this);
         enter_file.setOnClickListener(this);
         recyclerFiles.setOnClickListener(this);
@@ -63,7 +62,8 @@ public class InitViewActivity extends AppCompatActivity implements View.OnClickL
                 }
             });
         }else if(i == R.id.again){
-            Constant.initXiaoRay(this, "a4:11:63:61:00:02", "8656", "625624", "3D6B5148-98D8-4642-9909-45AEBBEEC8E0");
+            connect_result.setText("正在连接...");
+            Constant.initXiaoRay(this, "a4:11:63:61:00:02", "8656", "625624", "3D6B5148-98D8-4642-9909-45AEBBEEC8E0",connect_result);
         }
     }
 }
@@ -7,6 +7,15 @@
     android:orientation="vertical"
     android:padding="50dp"
     tools:context=".xiaoRay.ui.InitViewActivity">
+
+    <TextView
+        android:id="@+id/connect_result"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:textColor="#000000"
+        android:text="正在连接..."
+        />
     <TextView
         android:id="@+id/show_data"
         android:layout_width="match_parent"
@@ -72,9 +72,20 @@
         android:gravity="bottom|right"
         android:minWidth="@dimen/dp_40"
         android:singleLine="true"
-        android:text="进度"
+        android:visibility="gone"
+        android:text="0"
         android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_12" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:gravity="bottom|right"
+        android:singleLine="true"
+        android:text="%"
+        android:textColor="@color/color_999999"
+        android:visibility="gone"
+        android:textSize="@dimen/sp_12" />
     <ImageView
         android:id="@+id/iv_start"
@@ -12,7 +12,7 @@
     <string name="all_pause">全部暂停</string>
     <string name="all_delete">全部删除</string>
     <string name="pause">暂停</string>
-    <string name="waiting">正在等待</string>
+    <string name="waiting">正在连接...</string>
     <string name="upload_check_md5">正在检验文件, 稍等</string>
     <string name="no_known_condition_happen">发生了其他的未知情况</string>