云盘上传下载功能ui展示

韩亚云
1 parent 5b60b4a9
Showing 36 changed files with 1462 additions and 38 deletions
app/src/main/java/com/cnlive/updown/MainActivity.java
updownfile/libs/mylib.jar
updownfile/src/main/AndroidManifest.xml
updownfile/src/main/java/com/cnlive/updownfile/util/UploadUtil.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/adapter/TaskDoneItemAdapter.java
updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/bean/TaskInfoItem.java
updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/ui/BaseFragment.java
updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/DiretoryActivity.java → updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/ui/DiretoryActivity.java
updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/InitViewActivity.java → updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/ui/InitViewActivity.java
updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/ui/TaskActivity.java
updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/ui/TaskDoingFragment.java
updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/ui/TaskDoneFragment.java
updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/view/GlideUrlNoToken.java
updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/view/RayGlide.java
updownfile/src/main/java/com/cnlive/updownfile/xiaoRay/view/WrapLinearLayout.java
updownfile/src/main/res/drawable-hdpi/bg_doc.webp
updownfile/src/main/res/drawable-hdpi/bg_music.webp
updownfile/src/main/res/drawable-hdpi/bg_photo.webp
@@ -4,7 +4,7 @@ import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import com.cnlive.updownfile.xiaoRay.InitViewActivity;
+import com.cnlive.updownfile.xiaoRay.ui.InitViewActivity;
 public class MainActivity extends AppCompatActivity {
@@ -8,8 +8,9 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <application>
-        <activity android:name=".xiaoRay.DiretoryActivity" />
-        <activity android:name=".xiaoRay.InitViewActivity" />
+        <activity android:name=".xiaoRay.ui.TaskActivity"></activity>
+        <activity android:name=".xiaoRay.ui.DiretoryActivity" />
+        <activity android:name=".xiaoRay.ui.InitViewActivity" />
         <activity android:name="com.cnlive.filespicker.ui.FilePickerActivity" />
         <service android:name="com.xiaoray.raysdk.service.TaskUploadService" />
@@ -40,7 +40,7 @@ public class UploadUtil {
     private static final String OBJECT_PIC_KEY = AppConfig.isDebug() ? TEST_OBJECT_PIC__KEY : RELEASE_OBJECT_PIC__KEY;
     /**
-     * 七牛文件上传
+     * 七牛文件上传文件
      * @param context
      * @param file
      * @param objectKey
@@ -74,7 +74,7 @@ public class UploadUtil {
     /**
-     * 上传多张图片
+     * 七牛上传多张图片
      * @param context
      * @param file
      * @param uploadToken
@@ -15,13 +15,16 @@ public class Constant {
     public static final int IMAGE_MAX_SIZE = 20 * 1024 * 1024;
     //聊天页面文件最大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) {
-        RayLib.init(context);
-        ProgressDialog waitingDialog = new ProgressDialog(context);
-        waitingDialog.setMessage("正在连接IP地址");
-        waitingDialog.setIndeterminate(true);
-        waitingDialog.setCancelable(false);
+        if(waitingDialog == null){
+            RayLib.init(context);
+            waitingDialog = new ProgressDialog(context);
+            waitingDialog.setMessage("正在连接IP地址");
+            waitingDialog.setIndeterminate(true);
+            waitingDialog.setCancelable(false);
+        }
         waitingDialog.show();
         RayLib.connectCloud(context, mac, u_id, code,
                 term_id, new ConnectCloudListener() {
+package com.cnlive.updownfile.xiaoRay.adapter;
+
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.cnlive.updownfile.R;
+import com.cnlive.updownfile.xiaoRay.bean.TaskInfoItem;
+import com.cnlive.updownfile.xiaoRay.view.RayGlide;
+import com.xiaoray.raysdk.constant.FileType;
+import com.xiaoray.raysdk.constant.ProgressState;
+import com.xiaoray.raysdk.constant.TaskState;
+import com.xiaoray.raysdk.constant.TaskType;
+import com.xiaoray.raysdk.utils.RayPath;
+import com.xiaoray.raysdk.utils.RayUtil;
+import java.util.List;
+
+public class TaskDoingAdapter extends BaseQuickAdapter<TaskInfoItem, BaseViewHolder> {
+    public static final int TYPE_LEVEL_0 = 0;
+    public static final int TYPE_LEVEL_1 = 1;
+
+
+    public TaskDoingAdapter(int layoutResId, @Nullable List<TaskInfoItem> data) {
+        super(layoutResId, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, TaskInfoItem lv1) {
+
+
+        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.getTaskType() == TaskType.UPLOAD) {
+//            RayGlide.loadFromRes(mContext,
+//                    R.mipmap.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));
+        }
+        if (!TextUtils.isEmpty(((TaskInfoItem) lv1).getSpeed())) {
+            helper.setText(R.id.tv_speed, ((TaskInfoItem) lv1).getSpeed());
+        }
+
+        if (lv1.getEtDoing().getTaskState() == TaskState.EXECUTE_UPLOAD_RETURN_ONE) {
+            helper.setText(R.id.tv_file_size, lv1.getEtDoing().getErrorInfo());
+            helper.setText(R.id.tv_speed, "");
+            helper.getView(R.id.tv_speed).setVisibility(View.GONE);
+        } else if (lv1.getEtDoing().getTaskState() == TaskState.EXECUTE_FILE_NOT_EXIT) {
+            helper.setText(R.id.tv_file_size, lv1.getEtDoing().getErrorInfo());
+            helper.setText(R.id.tv_speed, "");
+            helper.getView(R.id.tv_speed).setVisibility(View.GONE);
+        } else {
+            if (lv1.getProgress() > 0) {
+                helper.setText(R.id.tv_file_size, RayUtil.getFormatSize(mContext,
+                        ((TaskInfoItem) lv1).getCurrentFileSize()) + "/" + RayUtil.getFormatSize(mContext, lv1.getTotalFileSize()));
+                helper.getView(R.id.tv_speed).setVisibility(View.VISIBLE);
+            } else if (lv1.getProgress() == 0) {
+                helper.setText(R.id.tv_file_size, R.string.waiting);
+                helper.setText(R.id.tv_speed, "");
+                helper.getView(R.id.tv_speed).setVisibility(View.VISIBLE);
+            } else if (lv1.getProgress() == ProgressState.PROGRESS_PAUSE) {
+                helper.setText(R.id.tv_file_size, R.string.pause);
+                helper.setText(R.id.tv_speed, "");
+                helper.getView(R.id.tv_speed).setVisibility(View.VISIBLE);
+                if (lv1.getTaskType() == TaskType.UPLOAD) {
+                } else if (lv1.getTaskType() == TaskType.DOWNLOAD) {
+                }
+            } else if (lv1.getProgress() == ProgressState.PROGRESS_ERROR) {
+                helper.setText(R.id.tv_file_size, lv1.getErrorInfo());
+                helper.setText(R.id.tv_speed, "");
+                helper.getView(R.id.tv_speed).setVisibility(View.GONE);
+            } else if (lv1.getProgress() == ProgressState.PROGRESS_CHECK_MD5) {
+                helper.setText(R.id.tv_file_size, R.string.upload_check_md5);
+                helper.setText(R.id.tv_speed, "");
+                helper.getView(R.id.tv_speed).setVisibility(View.VISIBLE);
+            } else {
+                helper.setText(R.id.tv_file_size, R.string.no_known_condition_happen);
+                helper.setText(R.id.tv_speed, "");
+                helper.getView(R.id.tv_speed).setVisibility(View.GONE);
+            }
+        }
+
+        if (lv1.getEtDoing().getFileType() == FileType.TYPE_PHOTO) {
+            if (lv1.getTaskType() == TaskType.UPLOAD) {
+                RayGlide.loadLocalRound(mContext, lv1.getEtDoing().getLocalPath(),
+                        R.drawable.bg_photo, (ImageView) helper.getView(R.id.iv_file_type));
+            } else if (lv1.getTaskType() == TaskType.DOWNLOAD) {
+                RayGlide.resRound(mContext, RayPath.downloadUrl(lv1.getEtDoing().getCloudPath()),
+                        R.drawable.bg_photo, (ImageView) helper.getView(R.id.iv_file_type));
+            }
+        } else if (lv1.getEtDoing().getFileType() == FileType.TYPE_VIDEO) {
+            if (lv1.getTaskType() == TaskType.UPLOAD) {
+                RayGlide.loadLocalRound(mContext, lv1.getEtDoing().getLocalPath(),
+                        R.drawable.bg_video, (ImageView) helper.getView(R.id.iv_file_type));
+            } else if (lv1.getTaskType() == TaskType.DOWNLOAD) {
+                RayGlide.resRound(mContext, RayPath.downloadUrl(lv1.getEtDoing().getCloudPath()),
+                        R.drawable.bg_video, (ImageView) helper.getView(R.id.iv_file_type));
+            }
+        } else if (lv1.getEtDoing().getFileType() == FileType.TYPE_OTHER || lv1.getEtDoing().getFileType() == FileType.TYPE_DOCUMENT) {
+            RayGlide.resRound(mContext, R.drawable.bg_doc,
+                    (ImageView) helper.getView(R.id.iv_file_type));
+        } else if (lv1.getEtDoing().getFileType() == FileType.TYPE_MUSIC) {
+            RayGlide.resRound(mContext, R.drawable.bg_music,
+                    (ImageView) helper.getView(R.id.iv_file_type));
+        } else {
+            RayGlide.resRound(mContext, R.drawable.bg_unknown,
+                    (ImageView) helper.getView(R.id.iv_file_type));
+        }
+
+
+    }
+
+
+}
+package com.cnlive.updownfile.xiaoRay.adapter;
+
+import android.support.annotation.Nullable;
+import android.widget.ImageView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.cnlive.updownfile.R;
+import com.cnlive.updownfile.xiaoRay.view.RayGlide;
+import com.xiaoray.raysdk.constant.FileType;
+import com.xiaoray.raysdk.entity.green.TaskDone;
+import com.xiaoray.raysdk.utils.RayUtil;
+
+import java.util.List;
+
+public class TaskDoneItemAdapter extends BaseQuickAdapter<TaskDone, BaseViewHolder> {
+
+    public TaskDoneItemAdapter(int layoutResId, @Nullable List<TaskDone> data) {
+        super(layoutResId, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, TaskDone item) {
+        helper.setText(R.id.tv_name, item.getFileName());
+        helper.setText(R.id.tv_file_size, RayUtil.getFormatSize(mContext, item.getFileSize()));
+        helper.setText(R.id.tv_time, RayUtil.formatPhotoDateSecond(item.getTaskDoneTime()));
+        if (item.getFileType() == FileType.TYPE_PHOTO || item.getFileType() == FileType.TYPE_VIDEO) {
+            RayGlide.loadLocalRound(mContext, item.getFileLocalPath(), R.drawable.ic_launcher, (ImageView) helper.getView(R.id.iv_file_type));
+        } else if (item.getFileType() == FileType.TYPE_OTHER || item.getFileType() == FileType.TYPE_DOCUMENT) {
+            String prefix = RayUtil.getPrefixString(item.getFileLocalPath());
+            RayGlide.resRound(mContext, R.drawable.ic_launcher, (ImageView) helper.getView(R.id.iv_file_type));
+        } else if (item.getFileType() == FileType.TYPE_MUSIC) {
+            RayGlide.resRound(mContext, R.drawable.ic_launcher, (ImageView) helper.getView(R.id.iv_file_type));
+        }
+    }
+}
+package com.cnlive.updownfile.xiaoRay.bean;
+
+import com.xiaoray.raysdk.entity.green.TaskDone;
+import com.xiaoray.raysdk.entity.green.TaskUndone;
+
+/**
+ * @author zww
+ * @date on 2018/6/12
+ * @function
+ * @filename TaskInfoItem
+ */
+public class TaskInfoItem {
+
+    private TaskUndone etDoing;
+    private int progress;
+    private String errorInfo;
+    private TaskDone etDone;
+    private int taskType;
+    private long currentFileSize;
+    private String speed;
+    private long totalFileSize;
+
+    /**
+     * 正在进行中的
+     */
+    public TaskInfoItem(TaskUndone etDoing, int progress, String errorInfo, int taskType) {
+        this.etDoing = etDoing;
+        this.progress = progress;
+        this.errorInfo = errorInfo;
+        this.taskType = taskType;
+    }
+
+    public long getTotalFileSize() {
+        return totalFileSize;
+    }
+
+    public void setTotalFileSize(long totalFileSize) {
+        this.totalFileSize = totalFileSize;
+    }
+
+    public long getCurrentFileSize() {
+        return currentFileSize;
+    }
+
+    public void setCurrentFileSize(long currentFileSize) {
+        this.currentFileSize = currentFileSize;
+    }
+
+    public String getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(String speed) {
+        this.speed = speed;
+    }
+
+    /**
+     * 完成的
+     */
+    public TaskInfoItem(TaskDone etDone) {
+        this.etDone = etDone;
+    }
+
+    public TaskDone getEtDone() {
+        return etDone;
+    }
+
+    public void setEtDone(TaskDone etDone) {
+        this.etDone = etDone;
+    }
+
+    public TaskUndone getEtDoing() {
+        return etDoing;
+    }
+
+    public void setEtDoing(TaskUndone etDoing) {
+        this.etDoing = etDoing;
+    }
+
+    public String getErrorInfo() {
+        return errorInfo;
+    }
+
+    public void setErrorInfo(String errorInfo) {
+        this.errorInfo = errorInfo;
+    }
+
+    public int getProgress() {
+        return progress;
+    }
+
+    public void setProgress(int progress) {
+        this.progress = progress;
+    }
+
+    public int getTaskType() {
+        return taskType;
+    }
+
+    public void setTaskType(int taskType) {
+        this.taskType = taskType;
+    }
+
+//    @Override
+//    public int getItemType() {
+//        return TaskDoingAdapter.TYPE_LEVEL_1;
+//    }
+
+    @Override
+    public String toString() {
+        return "TaskInfoItem{" +
+                "etDoing=" + etDoing +
+                ", progress=" + progress +
+                ", errorInfo='" + errorInfo + '\'' +
+                ", etDone=" + etDone +
+                ", taskType=" + taskType +
+                ", currentFileSize=" + currentFileSize +
+                ", speed='" + speed + '\'' +
+                '}';
+    }
+}
+package com.cnlive.updownfile.xiaoRay.ui;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.xiaoray.raysdk.utils.RayLog;
+
+
+
+public abstract class BaseFragment extends Fragment {
+    /* 布局View */
+    public View mLayoutView = null;
+    public String TAG = getClass().getSimpleName();
+    protected FragmentActivity mContext;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        RayLog.i("----------------------------------------------  " + TAG + "  ---------------------------------------");
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        mLayoutView = inflater.inflate(getLayout(), container, false);
+        return mLayoutView;
+    }
+
+    @Override
+    public void onAttach(Activity context) {
+        super.onAttach(context);
+        mContext = (FragmentActivity) context;  //保存Context引用
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mContext = null;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        isVisible = true;
+        initView();
+        initData();
+        initListener();
+    }
+
+    /**
+     * @bref 绑定视图
+     */
+    protected abstract int getLayout();
+
+    /**
+     * @bref 初始化View
+     */
+    public abstract void initView();
+
+
+    /**
+     * @bref 初始化其他工具
+     */
+    public abstract void initData();
+
+
+    /**
+     * @bref 设置监听器
+     */
+    public abstract void initListener();
+
+    /**
+     * @bref findViewById
+     */
+    @SuppressWarnings("unchecked")
+    public <T extends View> T findView(int id) {
+        return (T) mLayoutView.findViewById(id);
+    }
+
+    private boolean isVisible;
+    private ProgressDialog waitDialog;
+
+
+
+
+    public void hideLoadingDialog() {
+        if (isVisible && waitDialog != null) {
+            try {
+                waitDialog.dismiss();
+                waitDialog = null;
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+}
-package com.cnlive.updownfile.xiaoRay;
+package com.cnlive.updownfile.xiaoRay.ui;
 import android.Manifest;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Bitmap;
-import android.media.ThumbnailUtils;
 import android.os.Environment;
-import android.provider.MediaStore;
 import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -15,7 +12,6 @@ import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
-import android.view.Gravity;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -34,7 +30,9 @@ import com.cnlive.media.picker.ImagePicker;
 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.UploadUtil;
+import com.cnlive.updownfile.xiaoRay.Constant;
 import com.cnlive.updownfile.xiaoRay.adapter.ShowDiretoryAdapter;
 import com.cnlive.updownfile.xiaoRay.bean.DirectoryBean;
 import com.cnlive.updownfile.xiaoRay.bean.DirectoryTypeBean;
@@ -48,6 +46,9 @@ import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
 import com.xiaoray.raysdk.RayLib;
 import com.xiaoray.raysdk.constant.FileType;
 import com.xiaoray.raysdk.entity.bean.LocalCloudPath;
+import com.xiaoray.raysdk.entity.bus.BusTaskDoneAdd;
+import com.xiaoray.raysdk.entity.bus.BusTaskDoneDel;
+import com.xiaoray.raysdk.listener.RayDoneListener;
 import com.xiaoray.raysdk.manager.RayConstant;
 import com.xiaoray.raysdk.service.TaskDownloadService;
 import com.xiaoray.raysdk.utils.OkHttpUtils.HttpResult;
@@ -69,6 +70,7 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
     Button add_picture;
     Button add_file;
     Button clear_recyfile;
+    Button check_updown;
     RadioGroup file_type;
     RadioGroup file_time;
@@ -122,12 +124,14 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
         file_updown = findViewById(R.id.file_updown);
         sure = findViewById(R.id.sure);
         choose = findViewById(R.id.choose);
+        check_updown = findViewById(R.id.check_updown);
         if ("recy".equals(type)) {
             add_file.setVisibility(View.GONE);
             add_picture.setVisibility(View.GONE);
             clear_recyfile.setVisibility(View.VISIBLE);
             choose.setVisibility(View.GONE);
             btnCreateNewFolder.setVisibility(View.GONE);
+            check_updown.setVisibility(View.GONE);
         }
         refreshDataShow.setHeaderView(new RefreshHeaderView(this));
         showFilesAdapter = new ShowDiretoryAdapter(R.layout.item_directory, new ArrayList<FileBean>());
@@ -152,6 +156,10 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
                     @Override
                     public boolean onMenuItemClick(MenuItem item) {
                         if (item.getItemId() == R.id.delete) {//删除
+                            if("61445".equals(fileBean.getInode()) || "4098".equals(fileBean.getInode()) || "65556".equals(fileBean.getInode()) ||"937991".equals(fileBean.getInode()) ){
+                                RayToast.showShort("该文件暂不支持删除");
+                                return false;
+                            }
                             JSONArray jsonArray = new JSONArray();
                             JSONArray jsonArray1 = new JSONArray();
                             jsonArray1.put(fileBean.getInode());
@@ -193,6 +201,10 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
                             });
                             builder.create().show();
                         } else if (item.getItemId() == R.id.rename) {//重命名
+                            if("61445".equals(fileBean.getInode()) || "4098".equals(fileBean.getInode()) || "65556".equals(fileBean.getInode()) ||"937991".equals(fileBean.getInode()) ){
+                                RayToast.showShort("该文件暂不支持重命名");
+                                return false;
+                            }
                             final EditText editText = new EditText(DiretoryActivity.this);
                             editText.setText(fileBean.getFname());
                             AlertDialog.Builder builder = new AlertDialog.Builder(DiretoryActivity.this)
@@ -282,8 +294,7 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
                             localCloudPath.setCloud(fileBean.getUrl());
                             localCloudPath.setLocal(localPath);
                             arrayLists.add(localCloudPath);
-                            RayLib.controlDownload(DiretoryActivity.this, TaskDownloadService
-                                    .FROM_SELECT_DOWNLOAD, arrayLists);
+                            DownloadUtil.addDownload(DiretoryActivity.this, arrayLists);
                         }
                         return false;
                     }
@@ -295,6 +306,22 @@ 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() {
@@ -320,7 +347,6 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
                     intent.putExtra("path", showFilesAdapter.getData().get(position).getPath() + showFilesAdapter.getData().get(position).getFname() + File.separator);
                     startActivity(intent);
                 }
-
             }
         });
         btnCreateNewFolder.setOnClickListener(this);
@@ -329,6 +355,7 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
         add_file.setOnClickListener(this);
         clear_recyfile.setOnClickListener(this);
         sure.setOnClickListener(this);
+        check_updown.setOnClickListener(this);
         file_type.setOnCheckedChangeListener(this);
         file_time.setOnCheckedChangeListener(this);
@@ -376,7 +403,7 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
                 }
             });
         } else {
-            if (hasType) {//全部加载
+            if (hasType) {//全部加载,另一个是回收站
                 RayLib.getFilesByDirectory(0, folderPath, page = header ? 1 : page, 50, 1, 1, this, new HttpResult() {
                     @Override
                     public void onError(int errorCode, String error) {
@@ -530,6 +557,8 @@ public class DiretoryActivity extends AppCompatActivity implements View.OnClickL
             });
         } else if (vid == R.id.sure) {
             getDiretorys(true, fileType == 0 ? true : false);
+        }else if(vid == R.id.check_updown){//查看上传下载任务
+            TaskActivity.startTaskActivity(DiretoryActivity.this);
         }
     }
@@ -550,6 +579,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();
                 break;
             case 1009:
-package com.cnlive.updownfile.xiaoRay;
+package com.cnlive.updownfile.xiaoRay.ui;
 import android.os.Environment;
 import android.support.v7.app.AppCompatActivity;
@@ -7,6 +7,7 @@ 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;
@@ -20,6 +21,7 @@ public class InitViewActivity extends AppCompatActivity implements View.OnClickL
     private TextView show_data;
     private TextView enter_file;
     private TextView recyclerFiles;
+    private TextView again;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -33,11 +35,13 @@ public class InitViewActivity extends AppCompatActivity implements View.OnClickL
         show_data = findViewById(R.id.show_data);
         enter_file = findViewById(R.id.enter_file);
         recyclerFiles = findViewById(R.id.recyclerFiles);
+        again = findViewById(R.id.again);
         show_data.setOnClickListener(this);
         enter_file.setOnClickListener(this);
         recyclerFiles.setOnClickListener(this);
+        again.setOnClickListener(this);
     }
     @Override
@@ -58,19 +62,8 @@ public class InitViewActivity extends AppCompatActivity implements View.OnClickL
                     DiretoryActivity.startDiretoryActivity(InitViewActivity.this,"recy","/");
                 }
             });
+        }else if(i == R.id.again){
+            Constant.initXiaoRay(this, "a4:11:63:61:00:02", "8656", "625624", "3D6B5148-98D8-4642-9909-45AEBBEEC8E0");
         }
     }
-
-    /**
-     * 文件下载
-     */
-    private void addDownload(String cloudPath) {
-        ArrayList<LocalCloudPath> arrayLists = new ArrayList<>();
-        String localPath = Environment.getExternalStorageDirectory().toString();
-        LocalCloudPath localCloudPath = new LocalCloudPath();
-        localCloudPath.setCloud(cloudPath);
-        localCloudPath.setLocal(localPath);
-        arrayLists.add(localCloudPath);
-        DownloadUtil.addDownload(InitViewActivity.this, arrayLists);
-    }
 }
+package com.cnlive.updownfile.xiaoRay.ui;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.PopupWindow;
+import android.widget.RadioGroup;
+import android.widget.TextView;
+
+import com.cnlive.updownfile.R;
+import com.xiaoray.raysdk.RayLib;
+import com.xiaoray.raysdk.service.TaskDownloadService;
+import com.xiaoray.raysdk.service.TaskUploadService;
+
+public class TaskActivity extends AppCompatActivity {
+
+    private RadioGroup radioGroup;
+    private TaskDoingFragment doingFragment;
+    private TaskDoneFragment doneFragment;
+    private ImageView pop;
+
+    public static void startTaskActivity(Context context){
+        Intent intent = new Intent(context,TaskActivity.class);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_task);
+        radioGroup = findViewById(R.id.module_task_tab);
+        pop = findViewById(R.id.pop);
+        doingFragment = new TaskDoingFragment();
+        doneFragment = new TaskDoneFragment();
+
+        radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+                FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+                if ((group.getChildAt(0).getId()) == checkedId) {
+                    fragmentTransaction.hide(doneFragment);
+                    fragmentTransaction.show(doingFragment);
+                } else {
+                    fragmentTransaction.hide(doingFragment);
+                    fragmentTransaction.show(doneFragment);
+                }
+                fragmentTransaction.commit();
+            }
+        });
+
+        pop.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showPopupWindow();
+            }
+        });
+        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+        fragmentTransaction.add(R.id.fm_fragment, doingFragment);
+        fragmentTransaction.add(R.id.fm_fragment, doneFragment);
+        fragmentTransaction.commit();
+
+        radioGroup.check(radioGroup.getChildAt(0).getId());
+        fragmentTransaction.show(doingFragment);
+        fragmentTransaction.hide(doneFragment);
+    }
+
+    private void showPopupWindow() {
+        View contentView = LayoutInflater.from(getBaseContext()).inflate(R.layout.popupp_exercise, (ViewGroup) findViewById(R.id.exercise_ll), false);
+        TextView delete = contentView.findViewById(R.id.all_delete);
+        final TextView start = contentView.findViewById(R.id.all_start);
+        TextView cancel = contentView.findViewById(R.id.cancel_popup);
+        start.setVisibility(radioGroup.getCheckedRadioButtonId() == R.id.rb_doing ? View.VISIBLE : View.GONE);
+        if (radioGroup.getCheckedRadioButtonId() == R.id.rb_doing) {
+            delete.setText(R.string.all_delete);
+        } else {
+            delete.setText("清除完成的任务");
+        }
+        if (TaskUploadService.isPauseState && TaskDownloadService.isAllPauseState) {
+            start.setText(R.string.all_start);
+        } else {
+            start.setText(R.string.all_pause);
+        }
+        final PopupWindow popupWindow = new PopupWindow(contentView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        start.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (TaskUploadService.isPauseState && TaskDownloadService.isAllPauseState) {
+                    RayLib.controlUpload(getBaseContext(), TaskUploadService.FROM_START_ALL, null);
+                    RayLib.controlDownload(getBaseContext(), TaskDownloadService.FROM_CLICK_START, null);
+                } else {
+                    RayLib.controlUpload(getBaseContext(), TaskUploadService.FROM_PAUSE_ALL, null);
+                    RayLib.controlDownload(getBaseContext(), TaskDownloadService.FROM_CLICK_PAUSE, null);
+                }
+                popupWindow.dismiss();
+            }
+        });
+        delete.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (radioGroup.getCheckedRadioButtonId() == R.id.rb_doing) {
+                    RayLib.controlUpload(getBaseContext(), TaskUploadService.FROM_DELETE_DOING, null);
+                    RayLib.controlDownload(getBaseContext(), TaskDownloadService.FROM_DELETE_DOING, null);
+                } else {
+                    RayLib.controlUpload(getBaseContext(), TaskUploadService.FROM_DELETE_DONE, null);
+                }
+                popupWindow.dismiss();
+            }
+        });
+        cancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                popupWindow.dismiss();
+            }
+        });
+        popupWindow.setBackgroundDrawable(new BitmapDrawable());
+        popupWindow.setOutsideTouchable(true);
+        popupWindow.showAtLocation(findViewById(R.id.exercise_ll), Gravity.BOTTOM, 0, 0);
+
+    }
+}
+package com.cnlive.updownfile.xiaoRay.ui;
+
+import android.os.Handler;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import com.cnlive.updownfile.R;
+import com.cnlive.updownfile.xiaoRay.adapter.TaskDoingAdapter;
+import com.cnlive.updownfile.xiaoRay.bean.TaskInfoItem;
+import com.cnlive.updownfile.xiaoRay.view.WrapLinearLayout;
+import com.xiaoray.raysdk.RayLib;
+import com.xiaoray.raysdk.constant.ProgressState;
+import com.xiaoray.raysdk.constant.TaskType;
+import com.xiaoray.raysdk.entity.bus.BusTaskDoingDeleteDone;
+import com.xiaoray.raysdk.entity.bus.TaskCheckMd5;
+import com.xiaoray.raysdk.entity.bus.TaskClickPause;
+import com.xiaoray.raysdk.entity.bus.TaskClickStart;
+import com.xiaoray.raysdk.entity.bus.TaskDeleteDoing;
+import com.xiaoray.raysdk.entity.bus.TaskErrorBus;
+import com.xiaoray.raysdk.entity.bus.TaskProgress;
+import com.xiaoray.raysdk.entity.green.TaskUndone;
+import com.xiaoray.raysdk.listener.RayProgressListener;
+import com.xiaoray.raysdk.utils.RayLog;
+import com.xiaoray.raysdk.utils.dataHelper.TaskDoingHelper;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TaskDoingFragment extends BaseFragment {
+
+    private RecyclerView taskRecyclerView;
+    private TaskDoingAdapter taskDoingAdapter;
+    private LinearLayout llRoot;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_task;
+    }
+
+    @Override
+    public void initView() {
+        taskRecyclerView = findView(R.id.task_recycler);
+        llRoot = findView(R.id.ll_root);
+        taskRecyclerView.setLayoutManager(new WrapLinearLayout(mContext,
+                LinearLayoutManager.VERTICAL, false));
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void initData() {
+        getUploading();
+    }
+
+    private void getUploading() {
+        TaskDoingHelper.deleteLocalPathValid();
+        TaskDoingHelper.deleteValidData();
+        List<TaskUndone> upload = TaskDoingHelper.selectDoingFile(TaskType.UPLOAD);
+        List<TaskUndone> download = TaskDoingHelper.selectDoingFile(TaskType.DOWNLOAD);
+
+        ArrayList<TaskInfoItem> adapterList = new ArrayList<>();
+        if (upload != null && upload.size() > 0) {
+            for (int i = 0; i < upload.size(); i++) {
+                TaskUndone et = upload.get(i);
+                adapterList.add(new TaskInfoItem(et, 0, "", TaskType.UPLOAD));
+            }
+        }
+        if (download != null && download.size() > 0) {
+            for (int i = 0; i < download.size(); i++) {
+                TaskUndone et = download.get(i);
+                adapterList.add(new TaskInfoItem(et, 0, "", TaskType.DOWNLOAD));
+            }
+        }
+        taskDoingAdapter = new TaskDoingAdapter(R.layout.item_task_info, adapterList);
+        taskRecyclerView.setAdapter(taskDoingAdapter);
+        taskDoingAdapter.notifyDataSetChanged();
+        showNoDataView();
+        RayLog.e("taskDoingAdapter :" + taskDoingAdapter.getData());
+    }
+
+
+    @Override
+    public void initListener() {
+
+
+        /**
+         * 里面的回调都是在子线程，需要发送到主线程， 没有采用Handler，用的是Eventbus
+         */
+        RayLib.setProgressListener(new RayProgressListener() {
+            @Override
+            public void onProgressChange(TaskProgress event) {
+                EventBus.getDefault().post(new TaskProgress(event.getId(),
+                        event.getCloudPath(),
+                        event.getTaskType(), event.getCurrentFileSize(), event.getSpeed(),
+                        event.getProgress(), event.getTotalFileSize()));
+            }
+
+
+            /**
+             *检查md5
+             */
+            public void md5(TaskCheckMd5 event) {
+                EventBus.getDefault().post(new TaskCheckMd5(event.getId(),
+                        event.getTaskType()));
+            }
+
+            /**
+             * 删除完成的任务
+             */
+            public void done(BusTaskDoingDeleteDone event) {
+                EventBus.getDefault().post(new BusTaskDoingDeleteDone(event.getId(),
+                        event.getCloudPath(), event.getTaskType()));
+            }
+
+            /**
+             * 展示出错的任务
+             */
+            public void error(TaskErrorBus event) {
+                EventBus.getDefault().post(new TaskErrorBus(event.getId(),
+                        event.getTaskType(), event.getFileName(), event.getFileSize(),
+                        event.getErrorInfo()));
+            }
+
+            /**
+             * 点击开始
+             */
+            public void start(TaskClickStart event) {
+                EventBus.getDefault().post(new TaskClickStart());
+            }
+
+            /**
+             * 点击暂停
+             */
+            public void pause(TaskClickPause event) {
+                EventBus.getDefault().post(new TaskClickPause(event.isAll(),
+                        event.getFileId()));
+            }
+
+            /**
+             * 删除所有的进行中的任务
+             */
+            public void delete(TaskDeleteDoing event) {
+                EventBus.getDefault().post(new TaskDeleteDoing());
+            }
+        });
+        startLog();
+    }
+
+    Handler handler = new Handler();
+    private void startLog() {
+        handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                Log.e("打印获取任务", "进度信息：" + RayLib.getProgressInfo());
+                startLog();
+            }
+        }, 1000);
+    }
+
+
+    private void showNoDataView() {
+        if (taskDoingAdapter.getData().size() == 0) {
+            taskDoingAdapter.getData().clear();
+            taskDoingAdapter.notifyDataSetChanged();
+            taskDoingAdapter.setEmptyView(R.layout.layout_no_data_text,
+                    (ViewGroup) taskRecyclerView.getParent());
+        }
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        EventBus.getDefault().unregister(this);
+        handler.removeCallbacksAndMessages(null);
+    }
+
+    /**
+     * 更新进度条
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void doing(TaskProgress event) {
+        for (int i = 0; i < taskDoingAdapter.getData().size(); i++) {
+            if (((TaskInfoItem) taskDoingAdapter.getData().get(i)).getEtDoing().getId() ==
+                    event.getId()) {
+                TaskInfoItem taskInfoItem = ((TaskInfoItem) taskDoingAdapter.getData().get
+                        (i));
+                taskInfoItem.setProgress(event.getProgress());
+                taskInfoItem.setCurrentFileSize(event.getCurrentFileSize());
+                taskInfoItem.setTotalFileSize(event.getTotalFileSize());
+                taskInfoItem.setSpeed(event.getSpeed());
+                taskDoingAdapter.notifyItemChanged(i);
+            }
+        }
+    }
+
+    /**
+     * *检查md5
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void md5(TaskCheckMd5 event) {
+        for (int i = 0; i < taskDoingAdapter.getData().size(); i++) {
+            if (((TaskInfoItem) taskDoingAdapter.getData().get(i)).getEtDoing().getId() ==
+                    event.getId()) {
+                TaskInfoItem taskInfoItem = ((TaskInfoItem) taskDoingAdapter.getData().get
+                        (i));
+                taskInfoItem.setProgress(ProgressState.PROGRESS_CHECK_MD5);
+                taskDoingAdapter.notifyItemChanged(i);
+            }
+        }
+    }
+
+    /**
+     * 上传或者下载完成的监听。
+     *
+     * 删除完成的任务
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void done(BusTaskDoingDeleteDone event) {
+        for (int i = 0; i < taskDoingAdapter.getData().size(); i++) {
+            if (((TaskInfoItem) taskDoingAdapter.getData().get(i)).getEtDoing().getId() ==
+                    event.getId()) {
+                taskDoingAdapter.remove(i);
+                break;
+            }
+        }
+        showNoDataView();
+    }
+
+    /**
+     * 展示出错的任务
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void error(TaskErrorBus event) {
+        for (int i = 0; i < taskDoingAdapter.getData().size(); i++) {
+            if (((TaskInfoItem) taskDoingAdapter.getData().get(i)).getEtDoing().getId() ==
+                    event.getId()) {
+                ((TaskInfoItem) taskDoingAdapter.getData().get(i)).setProgress
+                        (ProgressState.PROGRESS_ERROR);
+                ((TaskInfoItem) taskDoingAdapter.getData().get(i)).setErrorInfo(event
+                        .getErrorInfo());
+                taskDoingAdapter.notifyItemChanged(i);
+                break;
+            }
+        }
+    }
+
+    /**
+     * 点击开始
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void start(TaskClickStart event) {
+        for (int i = 0; i < taskDoingAdapter.getData().size(); i++) {
+            ((TaskInfoItem) taskDoingAdapter.getData().get(i)).setProgress(0);
+        }
+        taskDoingAdapter.notifyDataSetChanged();
+    }
+
+    /**
+     * 点击暂停
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void pause(TaskClickPause event) {
+        if (event.isAll()) {
+            for (int i = 0; i < taskDoingAdapter.getData().size(); i++) {
+                ((TaskInfoItem) taskDoingAdapter.getData().get(i)).setProgress
+                        (ProgressState.PROGRESS_PAUSE);
+            }
+            taskDoingAdapter.notifyDataSetChanged();
+        } else {
+            for (int i = 0; i < taskDoingAdapter.getData().size(); i++) {
+                if (((TaskInfoItem) taskDoingAdapter.getData().get(i)).getEtDoing().getId()
+                        == event.getFileId()) {
+                    ((TaskInfoItem) taskDoingAdapter.getData().get(i)).setProgress
+                            (ProgressState.PROGRESS_PAUSE);
+                    taskDoingAdapter.notifyItemChanged(i);
+                    break;
+                }
+            }
+        }
+
+    }
+
+    /**
+     * 删除所有的进行中的任务
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void delete(TaskDeleteDoing event) {
+        taskDoingAdapter.getData().clear();
+        taskDoingAdapter.notifyDataSetChanged();
+        taskDoingAdapter.setEmptyView(R.layout.layout_no_data_text, llRoot);
+    }
+}
+package com.cnlive.updownfile.xiaoRay.ui;
+
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import com.cnlive.updownfile.R;
+import com.cnlive.updownfile.xiaoRay.adapter.TaskDoneItemAdapter;
+import com.xiaoray.raysdk.RayLib;
+import com.xiaoray.raysdk.entity.bus.BusTaskDoneAdd;
+import com.xiaoray.raysdk.entity.bus.BusTaskDoneDel;
+import com.xiaoray.raysdk.entity.green.TaskDone;
+import com.xiaoray.raysdk.listener.RayDoneListener;
+import com.xiaoray.raysdk.utils.dataHelper.TaskDoneHelper;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.List;
+
+/**
+ * 完成的任务
+ */
+public class TaskDoneFragment extends BaseFragment {
+
+    private RecyclerView taskRecyclerView;
+    private TaskDoneItemAdapter taskItemAdapter;
+    private LinearLayout llRoot;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_task;
+    }
+
+    @Override
+    public void initView() {
+        EventBus.getDefault().register(this);
+        taskRecyclerView = findView(R.id.task_recycler);
+        llRoot = findView(R.id.ll_root);
+    }
+
+    @Override
+    public void initListener() {
+
+
+        /**
+         * 里面的回调都是在子线程，需要发送到主线程， 没有采用Handler，用的是Eventbus
+         */
+        RayLib.setDoneListener(new RayDoneListener() {
+            @Override
+            public void doneAdd(BusTaskDoneAdd event) {
+                EventBus.getDefault().post(new BusTaskDoneAdd(event.getTaskDone()));
+            }
+
+            @Override
+            public void doneDel(BusTaskDoneDel busDeleteDone) {
+                EventBus.getDefault().post(new BusTaskDoneDel());
+            }
+        });
+
+    }
+
+    @Override
+    public void initData() {
+        taskRecyclerView.setLayoutManager(new LinearLayoutManager(mContext));
+        List<TaskDone> youngUploading = TaskDoneHelper.selectDoneFile();
+        taskItemAdapter = new TaskDoneItemAdapter(R.layout.item_task_done_info, youngUploading);
+        taskRecyclerView.setAdapter(taskItemAdapter);
+        taskItemAdapter.expandAll();
+        showNoDataView();
+    }
+
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        EventBus.getDefault().unregister(this);
+    }
+
+    private void showNoDataView() {
+        if (taskItemAdapter.getData().size() == 0) {
+            taskItemAdapter.getData().clear();
+            taskItemAdapter.notifyDataSetChanged();
+            taskItemAdapter.setEmptyView(R.layout.layout_no_data_text, (ViewGroup) taskRecyclerView.getParent());
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void done(BusTaskDoneAdd event) {
+        taskItemAdapter.addData(0, event.getTaskDone());
+        taskRecyclerView.smoothScrollToPosition(0);
+    }
+
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void pause(BusTaskDoneDel event) {
+        taskItemAdapter.getData().clear();
+        taskItemAdapter.notifyDataSetChanged();
+        taskItemAdapter.setEmptyView(R.layout.layout_no_data_text, llRoot);
+    }
+}
+package com.cnlive.updownfile.xiaoRay.view;
+
+import com.bumptech.glide.load.model.GlideUrl;
+import com.bumptech.glide.load.model.Headers;
+import com.xiaoray.raysdk.entity.bean.GlobalCacheBean;
+
+import java.net.URL;
+
+/**
+ * Created by 24479 on 2018/3/20.
+ */
+
+public class GlideUrlNoToken extends GlideUrl {
+    private long size;
+
+    public GlideUrlNoToken(URL url) {
+        super(url);
+    }
+
+    public GlideUrlNoToken(URL url, Headers headers) {
+        super(url, headers);
+    }
+
+    public GlideUrlNoToken(String url) {
+        super(url);
+    }
+
+    public GlideUrlNoToken(String url, long size) {
+        super(url);
+        this.size=size;
+    }
+
+    public GlideUrlNoToken(String url, Headers headers) {
+        super(url, headers);
+    }
+
+    /**
+     * http://192.168.88.36/v4/static/thumb/32/033_L2.jpg?token=8aa68cfd7c7442ff4ef6f740ee01e60b
+     * 这是最新的模板
+     */
+    @Override
+    public String getCacheKey() {
+        String url = toStringUrl();
+        int startIndex = 0;
+        int lastIndex = 0;
+        if (url.contains("//")) {
+            String url1 = url.substring(url.indexOf("//") + 2);
+            if (url1.contains("/") && url1.contains("?token=")) {
+                startIndex = url1.indexOf("/");
+                lastIndex = url1.lastIndexOf("?token=");
+                url1 = url1.substring(startIndex, lastIndex);
+                url1 = GlobalCacheBean.getCurrentCloudMac() + "/" + url1;
+                return url1;
+            }
+        }
+        return url;
+    }
+}
@@ -61,4 +61,33 @@ public class RayGlide {
     public static void GlideClearMemory(Context mContext) {
         Glide.get(mContext).clearMemory();
     }
+    /**
+     * 加载圆形图  本地路径
+     */
+    public static void loadLocalRound(Context mContext, String path, int defaultResId, ImageView mImageView) {
+        Glide.with(mContext).load(path).apply(roundOptions(defaultResId)).into(mImageView);
+    }
+
+    private static RequestOptions roundOptions(int defaultResId) {
+        return normalOptions(defaultResId);
+    }
+
+    /**
+     * 加载圆角图
+     */
+    public static void resRound(Context mContext, int resId, ImageView mImageView) {
+        Glide.with(mContext).load(resId).apply(roundOptions()).into(mImageView);
+    }
+
+
+    /**
+     * 加载圆形图   网上路径
+     */
+    public static void resRound(Context mContext, String path, int defaultRedId , ImageView mImageView) {
+        Glide.with(mContext).load(new GlideUrlNoToken(path)).apply(roundOptions(defaultRedId)).into(mImageView);
+    }
+
+    private static RequestOptions roundOptions() {
+        return normalOptions(R.drawable.ic_launcher);
+    }
 }
+package com.cnlive.updownfile.xiaoRay.view;
+
+import android.content.Context;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.AttributeSet;
+
+
+public class WrapLinearLayout extends LinearLayoutManager {
+    public WrapLinearLayout(Context context) {
+        super(context);
+    }
+
+    public WrapLinearLayout(Context context, int orientation, boolean reverseLayout) {
+        super(context, orientation, reverseLayout);
+    }
+
+    public WrapLinearLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+        try {
+            super.onLayoutChildren(recycler, state);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:state_checked="true">
+        <layer-list>
+
+            <item android:top="38dp" android:left="15dp" android:right="15dp">
+
+                <shape android:shape="rectangle" >
+                    <solid android:color="@color/color_FF7733" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+
+    <item android:drawable="@color/white"></item>
+
+</selector>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/color_FF7733" android:state_checked="true"></item>
+    <item android:color="@color/color_666666" android:state_checked="false"></item>
+</selector>
 \ No newline at end of file
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".xiaoRay.DiretoryActivity">
+    tools:context=".xiaoRay.ui.DiretoryActivity">
     <LinearLayout
         android:id="@+id/choose"
@@ -210,6 +210,15 @@
         android:layout_gravity="right"
         android:visibility="gone"
         android:text="清空回收站" />
+    <Button
+        android:id="@+id/check_updown"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:background="@drawable/gr_bg_nor"
+        android:padding="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_gravity="right"
+        android:text="上传下载任务" />
 </LinearLayout>
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="50dp"
-    tools:context=".xiaoRay.InitViewActivity">
+    tools:context=".xiaoRay.ui.InitViewActivity">
     <TextView
         android:id="@+id/show_data"
         android:layout_width="match_parent"
@@ -40,4 +40,15 @@
         android:text="进入回收站"
         android:gravity="center"
         />
+
+    <TextView
+        android:id="@+id/again"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:background="@drawable/anchor_barrage_bg_nor"
+        android:padding="10dp"
+        android:text="重新连接"
+        android:gravity="center"
+        />
 </LinearLayout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".xiaoRay.ui.TaskActivity"
+    android:id="@+id/exercise_ll"
+    android:orientation="vertical">
+<RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="48dp">
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="任务列表"
+        android:textSize="18sp"
+        android:textColor="#000000"
+        android:layout_centerInParent="true"/>
+    <ImageView
+        android:id="@+id/pop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/icon_vertical_more"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:padding="10dp"
+        />
+</RelativeLayout>
+    <RadioGroup
+        android:id="@+id/module_task_tab"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:paddingLeft="18dp"
+        android:paddingRight="18dp">
+
+        <RadioButton
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@drawable/sel_button_underline"
+            android:button="@null"
+            android:id="@+id/rb_doing"
+            android:gravity="center"
+            android:text="@string/module_task_doing"
+            android:textColor="@drawable/sel_text_color"
+            android:textSize="15dp" />
+
+        <RadioButton
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@drawable/sel_button_underline"
+            android:button="@null"
+            android:gravity="center"
+            android:text="@string/module_task_finished"
+            android:textColor="@drawable/sel_text_color"
+            android:textSize="15dp" />
+    </RadioGroup>
+    <FrameLayout
+        android:id="@+id/fm_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</LinearLayout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/color_F4F4F4"
+    android:orientation="vertical"
+    android:id="@+id/ll_root"
+    >
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/task_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+
+
+</LinearLayout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/com_swipe_down"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:padding="@dimen/dp_10">
+
+    <ImageView
+        android:id="@+id/iv_file_type"
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"
+        android:layout_gravity="center_vertical"
+        android:scaleType="centerCrop" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="left"
+            android:ellipsize="middle"
+            android:gravity="left"
+            android:singleLine="true"
+            android:text=""
+            android:textColor="@color/color_333333"
+            android:textSize="15sp"
+            android:layout_marginRight="100dp"
+            />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_4"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="left"
+                android:layout_weight="1"
+                android:gravity="left"
+                android:singleLine="true"
+                android:text=""
+                android:textColor="@color/color_AAAAAA"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/tv_file_size"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_4"
+                android:layout_marginRight="@dimen/dp_10"
+                android:ellipsize="middle"
+                android:gravity="right|bottom"
+                android:maxLength="10"
+                android:singleLine="true"
+                android:text=""
+                android:textColor="@color/color_AAAAAA"
+                android:textSize="@dimen/sp_12" />
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+
+</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/com_swipe_down"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:gravity="center_vertical"
+    android:minHeight="60dp"
+    android:orientation="horizontal"
+    android:paddingLeft="@dimen/dp_10">
+
+    <ImageView
+        android:id="@+id/iv_file_type"
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"
+        android:layout_gravity="center_vertical"
+        android:scaleType="centerCrop" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="left"
+            android:ellipsize="middle"
+            android:gravity="left"
+            android:singleLine="true"
+            android:text="任务名称"
+            android:textColor="@color/color_333333"
+            android:textSize="15sp" />
+
+        <TextView
+            android:id="@+id/tv_file_size"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="left|bottom"
+            android:ellipsize="start"
+            android:gravity="left"
+            android:maxLines="6"
+            android:text="filesize"
+            android:textColor="@color/color_999999"
+            android:textSize="@dimen/sp_12" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tv_speed"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_marginRight="@dimen/dp_10"
+        android:gravity="bottom|right"
+        android:minWidth="70dp"
+        android:singleLine="true"
+        android:text="速度"
+        android:textColor="@color/color_999999"
+        android:textSize="@dimen/sp_12" />
+
+    <TextView
+        android:id="@+id/tv_progress_num"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:gravity="bottom|right"
+        android:minWidth="@dimen/dp_40"
+        android:singleLine="true"
+        android:text="进度"
+        android:textColor="@color/color_999999"
+        android:textSize="@dimen/sp_12" />
+
+    <ImageView
+        android:id="@+id/iv_start"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginRight="@dimen/dp_10"
+        android:visibility="visible"
+        />
+</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+    <ImageView
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        />
+    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="12dp"
+        android:gravity="center"
+        android:text="没有任务"
+        android:textColor="#999999"
+        android:textSize="13sp" />
+</LinearLayout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#D5D5D5"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/all_start"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="12dp"
+        android:paddingTop="12dp"
+        android:text="全部暂停"
+        android:gravity="center"
+        android:background="#ffffff"
+        android:textColor="@color/color_333333"
+        android:layout_marginBottom="0.5dp"
+        android:textSize="18sp" />
+
+    <TextView
+        android:id="@+id/all_delete"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="12dp"
+        android:paddingTop="12dp"
+        android:text="全部删除"
+        android:background="#ffffff"
+        android:gravity="center"
+        android:textColor="@color/color_333333"
+        android:textSize="18sp" />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        />
+    <TextView
+        android:id="@+id/cancel_popup"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="12dp"
+        android:paddingTop="12dp"
+        android:text="取消"
+        android:background="#ffffff"
+        android:gravity="center"
+        android:textColor="@color/color_333333"
+        android:textSize="18sp" />
+</LinearLayout>
 \ No newline at end of file
@@ -14,6 +14,5 @@
     <item android:id="@+id/move"
         android:title="移动到ll文件夹"/>
     <item android:id="@+id/menu_down"
-        android:title="下载"
-        android:visible="false"/>
-</menu>
 \ No newline at end of file
+        android:title="下载"/>
+</menu>
@@ -5,4 +5,15 @@
     <string name="pull_down_refresh">下拉刷新</string>
     <string name="release_refresh">释放刷新</string>
     <string name="is_refreshing">正在刷新</string>
+    <string name="module_task_doing">进行中</string>
+    <string name="module_task_finished">已完成</string>
+
+    <string name="all_start">全部开始</string>
+    <string name="all_pause">全部暂停</string>
+    <string name="all_delete">全部删除</string>
+    <string name="pause">暂停</string>
+    <string name="waiting">正在等待</string>
+    <string name="upload_check_md5">正在检验文件, 稍等</string>
+    <string name="no_known_condition_happen">发生了其他的未知情况</string>
+
 </resources>