fix bug

app/src/main/java/com/sheep/gamegroup/presenter/PhonePresenter.java

@@ -9,6 +9,7 @@ import com.sheep.gamegroup.exception.ExceptionEngine;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.ChannelContent;
 import com.sheep.gamegroup.util.XXTEA;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
@@ -75,6 +76,7 @@ public class PhonePresenter implements PhoneContract.Presenter {
         com.alibaba.fastjson.JSONObject m = new com.alibaba.fastjson.JSONObject();
         m.put("account",telphone);
         m.put("sec_code",code);
+        m.put("invitation_code", ChannelContent.getInstance().getChannel_name() );
 
         apiService.loginByCaptcha(m)
                 .subscribeOn(Schedulers.io())

app/src/main/java/com/sheep/gamegroup/view/activity/DialogActivity.java

@@ -33,6 +33,7 @@ import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskState;
 import com.sheep.gamegroup.presenter.TaskDialogContract;
 import com.sheep.gamegroup.presenter.TaskDialogPresenter;
+import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyListview;
@@ -248,7 +249,8 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
             switch (type){
                 case 0://开始任务
                     JSONObject object = new JSONObject();
-                    object.put("device_id", new DeviceUtils(activity).getIMEI()+"");
+
+                    object.put("device_id",DeviceUtil.getDeviceId(activity));
                     object.put("release_task_id", Integer.valueOf(task_entity.getRelease_task_id()+""));
                     preference.acceptedTask(object);
                     break;

app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java

@@ -128,7 +128,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
             @Override
             public void onCancel(SHARE_MEDIA platform, int action) {
 
-                showToast("微信授权失败");
+                showToast("微信授权取消");
                 hideProgress();
             }
         });

app/src/main/java/com/sheep/gamegroup/view/xutils/download/DefaultDownloadViewHolder.java

@@ -1,48 +0,0 @@
-package com.sheep.gamegroup.view.xutils.download;
-
-import android.view.View;
-import android.widget.Toast;
-
-import org.xutils.common.Callback;
-import org.xutils.x;
-
-import java.io.File;
-
-/**
- * Created by wyouflf on 15/11/11.
- */
-public class DefaultDownloadViewHolder extends DownloadViewHolder {
-
-    public DefaultDownloadViewHolder(View view, DownloadInfo downloadInfo) {
-        super(view, downloadInfo);
-    }
-
-    @Override
-    public void onWaiting() {
-
-    }
-
-    @Override
-    public void onStarted() {
-
-    }
-
-    @Override
-    public void onLoading(long total, long current) {
-
-    }
-
-    @Override
-    public void onSuccess(File result) {
-        Toast.makeText(x.app(), "下载完成", Toast.LENGTH_LONG).show();
-    }
-
-    @Override
-    public void onError(Throwable ex, boolean isOnCallback) {
-        Toast.makeText(x.app(), "下载失败", Toast.LENGTH_LONG).show();
-    }
-
-    @Override
-    public void onCancelled(Callback.CancelledException cex) {
-    }
-}

app/src/main/java/com/sheep/gamegroup/view/xutils/download/DownloadCallback.java

@@ -1,179 +0,0 @@
-package com.sheep.gamegroup.view.xutils.download;
-
-import org.xutils.common.Callback;
-import org.xutils.common.util.LogUtil;
-import org.xutils.ex.DbException;
-
-import java.io.File;
-import java.lang.ref.WeakReference;
-
-/**
- * Created by wyouflf on 15/11/10.
- */
-/*package*/ class DownloadCallback implements
-        Callback.CommonCallback<File>,
-        Callback.ProgressCallback<File>,
-        Callback.Cancelable {
-
-    private DownloadInfo downloadInfo;
-    private WeakReference<DownloadViewHolder> viewHolderRef;
-    private DownloadManager downloadManager;
-    private boolean cancelled = false;
-    private Cancelable cancelable;
-
-    public DownloadCallback(DownloadViewHolder viewHolder) {
-        this.switchViewHolder(viewHolder);
-    }
-
-    public boolean switchViewHolder(DownloadViewHolder viewHolder) {
-        if (viewHolder == null) return false;
-
-        synchronized (DownloadCallback.class) {
-            if (downloadInfo != null) {
-                if (this.isStopped()) {
-                    return false;
-                }
-            }
-            this.downloadInfo = viewHolder.getDownloadInfo();
-            this.viewHolderRef = new WeakReference<DownloadViewHolder>(viewHolder);
-        }
-        return true;
-    }
-
-    public void setDownloadManager(DownloadManager downloadManager) {
-        this.downloadManager = downloadManager;
-    }
-
-    public void setCancelable(Cancelable cancelable) {
-        this.cancelable = cancelable;
-    }
-
-    private DownloadViewHolder getViewHolder() {
-        if (viewHolderRef == null) return null;
-        DownloadViewHolder viewHolder = viewHolderRef.get();
-        if (viewHolder != null) {
-            DownloadInfo downloadInfo = viewHolder.getDownloadInfo();
-            if (this.downloadInfo != null && this.downloadInfo.equals(downloadInfo)) {
-                return viewHolder;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public void onWaiting() {
-        try {
-            downloadInfo.setState(DownloadState.WAITING);
-            downloadManager.updateDownloadInfo(downloadInfo);
-        } catch (DbException ex) {
-            LogUtil.e(ex.getMessage(), ex);
-        }
-        DownloadViewHolder viewHolder = this.getViewHolder();
-        if (viewHolder != null) {
-            viewHolder.onWaiting();
-        }
-    }
-
-    @Override
-    public void onStarted() {
-        try {
-            downloadInfo.setState(DownloadState.STARTED);
-            downloadManager.updateDownloadInfo(downloadInfo);
-        } catch (DbException ex) {
-            LogUtil.e(ex.getMessage(), ex);
-        }
-        DownloadViewHolder viewHolder = this.getViewHolder();
-        if (viewHolder != null) {
-            viewHolder.onStarted();
-        }
-    }
-
-    @Override
-    public void onLoading(long total, long current, boolean isDownloading) {
-        if (isDownloading) {
-            try {
-                downloadInfo.setState(DownloadState.STARTED);
-                downloadInfo.setFileLength(total);
-                downloadInfo.setProgress((int) (current * 100 / total));
-                downloadManager.updateDownloadInfo(downloadInfo);
-            } catch (DbException ex) {
-                LogUtil.e(ex.getMessage(), ex);
-            }
-            DownloadViewHolder viewHolder = this.getViewHolder();
-            if (viewHolder != null) {
-                viewHolder.onLoading(total, current);
-            }
-        }
-    }
-
-    @Override
-    public void onSuccess(File result) {
-        synchronized (DownloadCallback.class) {
-            try {
-                downloadInfo.setState(DownloadState.FINISHED);
-                downloadManager.updateDownloadInfo(downloadInfo);
-            } catch (DbException ex) {
-                LogUtil.e(ex.getMessage(), ex);
-            }
-            DownloadViewHolder viewHolder = this.getViewHolder();
-            if (viewHolder != null) {
-                viewHolder.onSuccess(result);
-            }
-        }
-    }
-
-    @Override
-    public void onError(Throwable ex, boolean isOnCallback) {
-        synchronized (DownloadCallback.class) {
-            try {
-                downloadInfo.setState(DownloadState.ERROR);
-                downloadManager.updateDownloadInfo(downloadInfo);
-            } catch (DbException e) {
-                LogUtil.e(e.getMessage(), e);
-            }
-            DownloadViewHolder viewHolder = this.getViewHolder();
-            if (viewHolder != null) {
-                viewHolder.onError(ex, isOnCallback);
-            }
-        }
-    }
-
-    @Override
-    public void onCancelled(CancelledException cex) {
-        synchronized (DownloadCallback.class) {
-            try {
-                downloadInfo.setState(DownloadState.STOPPED);
-                downloadManager.updateDownloadInfo(downloadInfo);
-            } catch (DbException ex) {
-                LogUtil.e(ex.getMessage(), ex);
-            }
-            DownloadViewHolder viewHolder = this.getViewHolder();
-            if (viewHolder != null) {
-                viewHolder.onCancelled(cex);
-            }
-        }
-    }
-
-    @Override
-    public void onFinished() {
-        cancelled = false;
-    }
-
-    private boolean isStopped() {
-        DownloadState state = downloadInfo.getState();
-        return isCancelled() || state.value() > DownloadState.STARTED.value();
-    }
-
-    @Override
-    public void cancel() {
-        cancelled = true;
-        if (cancelable != null) {
-            cancelable.cancel();
-        }
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return cancelled;
-    }
-}

app/src/main/java/com/sheep/gamegroup/view/xutils/download/DownloadInfo.java

@@ -1,132 +0,0 @@
-package com.sheep.gamegroup.view.xutils.download;
-
-import org.xutils.db.annotation.Column;
-import org.xutils.db.annotation.Table;
-
-/**
- * Author: wyouflf
- * Date: 13-11-10
- * Time: 下午8:11
- */
-@Table(name = "download", onCreated = "CREATE UNIQUE INDEX index_name ON download(label,fileSavePath)")
-public class DownloadInfo {
-
-    public DownloadInfo() {
-    }
-
-    @Column(name = "id", isId = true)
-    private long id;
-
-    @Column(name = "state")
-    private DownloadState state = DownloadState.STOPPED;
-
-    @Column(name = "url")
-    private String url;
-
-    @Column(name = "label")
-    private String label;
-
-    @Column(name = "fileSavePath")
-    private String fileSavePath;
-
-    @Column(name = "progress")
-    private int progress;
-
-    @Column(name = "fileLength")
-    private long fileLength;
-
-    @Column(name = "autoResume")
-    private boolean autoResume;
-
-    @Column(name = "autoRename")
-    private boolean autoRename;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public DownloadState getState() {
-        return state;
-    }
-
-    public void setState(DownloadState state) {
-        this.state = state;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    public String getFileSavePath() {
-        return fileSavePath;
-    }
-
-    public void setFileSavePath(String fileSavePath) {
-        this.fileSavePath = fileSavePath;
-    }
-
-    public int getProgress() {
-        return progress;
-    }
-
-    public void setProgress(int progress) {
-        this.progress = progress;
-    }
-
-    public long getFileLength() {
-        return fileLength;
-    }
-
-    public void setFileLength(long fileLength) {
-        this.fileLength = fileLength;
-    }
-
-    public boolean isAutoResume() {
-        return autoResume;
-    }
-
-    public void setAutoResume(boolean autoResume) {
-        this.autoResume = autoResume;
-    }
-
-    public boolean isAutoRename() {
-        return autoRename;
-    }
-
-    public void setAutoRename(boolean autoRename) {
-        this.autoRename = autoRename;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof DownloadInfo)) return false;
-
-        DownloadInfo that = (DownloadInfo) o;
-
-        if (id != that.id) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return (int) (id ^ (id >>> 32));
-    }
-}

app/src/main/java/com/sheep/gamegroup/view/xutils/download/DownloadManager.java

@@ -1,179 +0,0 @@
-package com.sheep.gamegroup.view.xutils.download;
-
-import org.xutils.DbManager;
-import org.xutils.common.Callback;
-import org.xutils.common.task.PriorityExecutor;
-import org.xutils.common.util.LogUtil;
-import org.xutils.db.converter.ColumnConverterFactory;
-import org.xutils.ex.DbException;
-import org.xutils.http.RequestParams;
-import org.xutils.x;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
-
-/**
- * Author: wyouflf
- * Date: 13-11-10
- * Time: 下午8:10
- */
-public final class DownloadManager {
-
-    static {
-        // 注册DownloadState在数据库中的值类型映射
-        ColumnConverterFactory.registerColumnConverter(DownloadState.class, new DownloadStateConverter());
-    }
-
-    private static volatile DownloadManager instance;
-
-    private final static int MAX_DOWNLOAD_THREAD = 2; // 有效的值范围[1, 3], 设置为3时, 可能阻塞图片加载.
-
-    private final DbManager db;
-    private final Executor executor = new PriorityExecutor(MAX_DOWNLOAD_THREAD, true);
-    private final List<DownloadInfo> downloadInfoList = new ArrayList<DownloadInfo>();
-    private final ConcurrentHashMap<DownloadInfo, DownloadCallback>
-            callbackMap = new ConcurrentHashMap<DownloadInfo, DownloadCallback>(5);
-
-    private DownloadManager() {
-        DbManager.DaoConfig daoConfig = new DbManager.DaoConfig()
-                .setDbName("download")
-                .setDbVersion(1);
-        db = x.getDb(daoConfig);
-        try {
-            List<DownloadInfo> infoList = db.selector(DownloadInfo.class).findAll();
-            if (infoList != null) {
-                for (DownloadInfo info : infoList) {
-                    if (info.getState().value() < DownloadState.FINISHED.value()) {
-                        info.setState(DownloadState.STOPPED);
-                    }
-                    downloadInfoList.add(info);
-                }
-            }
-        } catch (DbException ex) {
-            LogUtil.e(ex.getMessage(), ex);
-        }
-    }
-
-    /*package*/
-    public static DownloadManager getInstance() {
-        if (instance == null) {
-            synchronized (DownloadManager.class) {
-                if (instance == null) {
-                    instance = new DownloadManager();
-                }
-            }
-        }
-        return instance;
-    }
-
-    public void updateDownloadInfo(DownloadInfo info) throws DbException {
-        db.update(info);
-    }
-
-    public int getDownloadListCount() {
-        return downloadInfoList.size();
-    }
-
-    public DownloadInfo getDownloadInfo(int index) {
-        return downloadInfoList.get(index);
-    }
-
-    public synchronized void startDownload(String url, String label, String savePath,
-                                           boolean autoResume, boolean autoRename,
-                                           DownloadViewHolder viewHolder) throws DbException {
-
-        String fileSavePath = new File(savePath).getAbsolutePath();
-        DownloadInfo downloadInfo = db.selector(DownloadInfo.class)
-                .where("label", "=", label)
-                .and("fileSavePath", "=", fileSavePath)
-                .findFirst();
-        if (downloadInfo != null) {
-            DownloadCallback callback = callbackMap.get(downloadInfo);
-            if (callback != null) {
-                if (viewHolder == null) {
-                    viewHolder = new DefaultDownloadViewHolder(null, downloadInfo);
-                }
-                if (callback.switchViewHolder(viewHolder)) {
-                    return;
-                } else {
-                    callback.cancel();
-                }
-            }
-        }
-
-        // create download info
-        if (downloadInfo == null) {
-            downloadInfo = new DownloadInfo();
-            downloadInfo.setUrl(url);
-            downloadInfo.setAutoRename(autoRename);
-            downloadInfo.setAutoResume(autoResume);
-            downloadInfo.setLabel(label);
-            downloadInfo.setFileSavePath(fileSavePath);
-            db.saveBindingId(downloadInfo);
-        }
-
-        // start downloading
-        if (viewHolder == null) {
-            viewHolder = new DefaultDownloadViewHolder(null, downloadInfo);
-        } else {
-            viewHolder.update(downloadInfo);
-        }
-        DownloadCallback callback = new DownloadCallback(viewHolder);
-        callback.setDownloadManager(this);
-        callback.switchViewHolder(viewHolder);
-        RequestParams params = new RequestParams(url);
-        params.setAutoResume(downloadInfo.isAutoResume());
-        params.setAutoRename(downloadInfo.isAutoRename());
-        params.setSaveFilePath(downloadInfo.getFileSavePath());
-        params.setExecutor(executor);
-        params.setCancelFast(true);
-        Callback.Cancelable cancelable = x.http().get(params, callback);
-        callback.setCancelable(cancelable);
-        callbackMap.put(downloadInfo, callback);
-
-        if (downloadInfoList.contains(downloadInfo)) {
-            int index = downloadInfoList.indexOf(downloadInfo);
-            downloadInfoList.remove(downloadInfo);
-            downloadInfoList.add(index, downloadInfo);
-        } else {
-            downloadInfoList.add(downloadInfo);
-        }
-    }
-
-    public void stopDownload(int index) {
-        DownloadInfo downloadInfo = downloadInfoList.get(index);
-        stopDownload(downloadInfo);
-    }
-
-    public void stopDownload(DownloadInfo downloadInfo) {
-        Callback.Cancelable cancelable = callbackMap.get(downloadInfo);
-        if (cancelable != null) {
-            cancelable.cancel();
-        }
-    }
-
-    public void stopAllDownload() {
-        for (DownloadInfo downloadInfo : downloadInfoList) {
-            Callback.Cancelable cancelable = callbackMap.get(downloadInfo);
-            if (cancelable != null) {
-                cancelable.cancel();
-            }
-        }
-    }
-
-    public void removeDownload(int index) throws DbException {
-        DownloadInfo downloadInfo = downloadInfoList.get(index);
-        db.delete(downloadInfo);
-        stopDownload(downloadInfo);
-        downloadInfoList.remove(index);
-    }
-
-    public void removeDownload(DownloadInfo downloadInfo) throws DbException {
-        db.delete(downloadInfo);
-        stopDownload(downloadInfo);
-        downloadInfoList.remove(downloadInfo);
-    }
-}

app/src/main/java/com/sheep/gamegroup/view/xutils/download/DownloadState.java

@@ -1,35 +0,0 @@
-package com.sheep.gamegroup.view.xutils.download;
-
-/**
- * Created by wyouflf on 15/11/10.
- */
-public enum DownloadState {
-    WAITING(0), STARTED(1), FINISHED(2), STOPPED(3), ERROR(4);
-
-    private final int value;
-
-    DownloadState(int value) {
-        this.value = value;
-    }
-
-    public int value() {
-        return value;
-    }
-
-    public static DownloadState valueOf(int value) {
-        switch (value) {
-            case 0:
-                return WAITING;
-            case 1:
-                return STARTED;
-            case 2:
-                return FINISHED;
-            case 3:
-                return STOPPED;
-            case 4:
-                return ERROR;
-            default:
-                return STOPPED;
-        }
-    }
-}

app/src/main/java/com/sheep/gamegroup/view/xutils/download/DownloadStateConverter.java

@@ -1,28 +0,0 @@
-package com.sheep.gamegroup.view.xutils.download;
-
-import android.database.Cursor;
-
-import org.xutils.db.converter.ColumnConverter;
-import org.xutils.db.sqlite.ColumnDbType;
-
-/**
- * Created by wyouflf on 15/11/10.
- */
-public class DownloadStateConverter implements ColumnConverter<DownloadState> {
-
-    @Override
-    public DownloadState getFieldValue(Cursor cursor, int index) {
-        int dbValue = cursor.getInt(index);
-        return DownloadState.valueOf(dbValue);
-    }
-
-    @Override
-    public Object fieldValue2DbValue(DownloadState fieldValue) {
-        return fieldValue.value();
-    }
-
-    @Override
-    public ColumnDbType getColumnDbType() {
-        return ColumnDbType.INTEGER;
-    }
-}

app/src/main/java/com/sheep/gamegroup/view/xutils/download/DownloadViewHolder.java

@@ -1,41 +0,0 @@
-package com.sheep.gamegroup.view.xutils.download;
-
-import android.view.View;
-
-import org.xutils.common.Callback;
-import org.xutils.x;
-
-import java.io.File;
-
-/**
- * Created by wyouflf on 15/11/10.
- */
-public abstract class DownloadViewHolder {
-
-    protected DownloadInfo downloadInfo;
-
-    public DownloadViewHolder(View view, DownloadInfo downloadInfo) {
-        this.downloadInfo = downloadInfo;
-        x.view().inject(this, view);
-    }
-
-    public final DownloadInfo getDownloadInfo() {
-        return downloadInfo;
-    }
-
-    public void update(DownloadInfo downloadInfo) {
-        this.downloadInfo = downloadInfo;
-    }
-
-    public abstract void onWaiting();
-
-    public abstract void onStarted();
-
-    public abstract void onLoading(long total, long current);
-
-    public abstract void onSuccess(File result);
-
-    public abstract void onError(Throwable ex, boolean isOnCallback);
-
-    public abstract void onCancelled(Callback.CancelledException cex);
-}