bug 修改

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

@@ -5,6 +5,8 @@ import android.util.Log;
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
@@ -30,24 +32,21 @@ public class BindOrChangeWeixinPresenter implements BindOrChangeWeixinContract.P
     public void bindWeixin(Object o) {
         apiService.bindWeixin(((JSONObject) o).getString("code"))
                 .subscribeOn(Schedulers.io())
-                .subscribe(new Observer<BaseMessage>() {
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.context){
+
                     @Override
-                    public void onCompleted() {
-                        Log.e("onCompleted--------","onCompleted");
+                    public void onNext(BaseMessage o) {
 
+                        view.updateView(o);
                     }
 
                     @Override
-                    public void onError(Throwable throwable) {
-                        Log.e("onError--------","onError:"+throwable);
-                        view.failData(throwable);
-                    }
+                    public void onError(BaseMessage baseMessage) {
 
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        Log.e("onNext--------","onNext:"+baseMessage.toString());
-                        view.updateView(baseMessage);
+
+                        view.failData(baseMessage);
                     }
                 });
+
     }
 }

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

@@ -10,6 +10,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSONObject;
+import com.googlecode.protobuf.format.util.TextUtils;
 import com.sheep.gamegroup.di.components.DaggerBindDataComponent;
 import com.sheep.gamegroup.di.modules.BindDataModule;
 import com.sheep.gamegroup.presenter.BindDataContract;
@@ -56,7 +57,7 @@ public class BindDataAct extends BaseActivity implements BindDataContract.View {
 
     private int type = 0;
     private String key = "real_name";
-    private String value = "real_name";
+    private String value = "";
     private String title = "绑定真实姓名";
 
     @Override
@@ -116,6 +117,10 @@ public class BindDataAct extends BaseActivity implements BindDataContract.View {
     }
 
     private void submit() {
+        if(android.text.TextUtils.isEmpty(value)){
+            G.showToast("请填入数据");
+            return;
+        }
         JSONObject j = new JSONObject();
         j.put(key, value);
         showProgress();

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

@@ -12,6 +12,7 @@ import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
 import com.sheep.gamegroup.di.components.DaggerBindOrChangeWeixinComponent;
 import com.sheep.gamegroup.di.modules.BindOrChangeWeixinModule;
+import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.presenter.BindOrChangeWeixinContract;
 import com.sheep.gamegroup.presenter.BindOrChangeWeixinPresenter;
@@ -133,5 +134,6 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
     @Override
     public void failData(Object o) {
         hideProgress();
+        G.showToast(((BaseMessage)o).getMsg()+ "");
     }
 }

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

@@ -41,6 +41,7 @@ import com.sheep.gamegroup.presenter.TaskDialogPresenter;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyListview;
+import com.sheep.gamegroup.view.adapter.DownLoadTvAdp;
 import com.sheep.gamegroup.view.adapter.TaskStateAdapter;
 import com.sheep.gamegroup.view.customview.SProgress;
 import com.sheep.jiuyan.samllsheep.R;
@@ -98,6 +99,8 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     TextView start_task_tv;
     @BindView(R.id.listview)
     MyListview listview;
+    @BindView(R.id.listview_down)
+    MyListview listview_down;
     private TaskEty task_entity;
     private List<TaskState> stateList = new ArrayList<>();//状态列表
     private TaskStateAdapter stateAdapter;
@@ -111,6 +114,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     /**
      * 下载
      */
+    private DownLoadTvAdp loadTvAdp;
     private Callback.Cancelable cancelable;
 
     @Inject
@@ -159,6 +163,14 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         dialogItemNameTv.setText(task_entity.getName());
         dialogItemSizeTv.setText( task_entity.getPackage_size() + "M");
         isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, task_entity.getPackage_names());
+
+        downLoadApk();
+        /**
+         * 下载
+         */
+        loadTvAdp = new DownLoadTvAdp(activity);
+        listview_down.setAdapter(loadTvAdp);
+
         //Todo ok
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("id",task_entity.getRelease_task_id());
@@ -166,7 +178,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
 
     }
 
-    private void initViews() {
+        private void initViews() {
 
 //        startStaskSprogress.setVisibility(View.GONE);
         task_entity = (TaskEty) getIntent().getSerializableExtra("task_entity");
@@ -197,6 +209,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         listview.setAdapter(stateAdapter);
         stateAdapter.notifyDataSetChanged();
 
+
     }
 
     @OnClick({R.id.doalog_item_get_rewards_tv, R.id.dialog_item_x, R.id.start_task_tv, R.id.start_stask_sprogress})
@@ -260,13 +273,22 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
      */
     private void downLoadApk(){
 
-        start_task_tv.setVisibility(View.VISIBLE);
+        start_task_tv.setVisibility(View.GONE);
         startStaskSprogress.setVisibility(View.VISIBLE);
         if (task_entity != null) {
             ClassFileHelper.getInstance().createSDDirection();
             File mApkPath = new File(ClassFileHelper.DIR, task_entity.getTask_name() + ClassFileHelper.FILE_SUFFIX);
             if (!mApkPath.exists()) {
 //                new File(mApkPath.getAbsolutePath());
+                try{
+
+                    downloadInfo = DownloadManager.getInstance().startDownloadOne(task_entity.getPackage_names(),
+                            task_entity.getDownload_link(), task_entity.getTask_name(),
+                            mApkPath.getAbsolutePath(), task_entity.getIcon(), true, false, null);
+                    return;
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
                 DownloadInfo downloadInfo = MyDbManager.getInstance().dbFindDownLoad(task_entity.getTask_name(), mApkPath.getAbsolutePath());
                 if(downloadInfo == null){
                     downloadInfo = new DownloadInfo();
@@ -413,7 +435,10 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
             BaseMessage baseMessage = (BaseMessage) o;
             if(baseMessage.getCode() == 200){
                 handler.sendEmptyMessage(0);
+                G.showToast("接收任务成功");
             }
+
+            EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
         }catch (Exception e){
             e.printStackTrace();
         }
@@ -443,7 +468,6 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
 
             stateAdapter.notifyDataSetChanged();
 
-            EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
         }
 
 
@@ -461,4 +485,5 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
             cancelable.cancel();
         }
     }
+
 }

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

@@ -180,7 +180,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
                     Jump2View.getInstance().goBindDataView(activity, baseMessage.getCode());
                     break;
                 default:
-                    G.showToast(" 网络错误！");
+                    G.showToast(baseMessage.getMsg()+"");
                     break;
             }
         }catch (Exception e){
@@ -194,6 +194,6 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
         hideProgress();
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
 //        BaseMessage baseMessage = (BaseMessage) o;
-        Jump2View.getInstance().goWithdrawalResultview(activity, Float.valueOf(amount));
+        Jump2View.getInstance().goWithdrawalResultview(activity, amount);
     }
 }

app/src/main/java/com/sheep/gamegroup/view/adapter/DownLoadTvAdp.java

@@ -0,0 +1,289 @@
+package com.sheep.gamegroup.view.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.bumptech.glide.Glide;
+import com.sheep.gamegroup.view.customview.SProgress;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.download.DownloadInfo;
+import com.sheep.jiuyan.samllsheep.download.DownloadManager;
+import com.sheep.jiuyan.samllsheep.download.DownloadState;
+import com.sheep.jiuyan.samllsheep.download.DownloadViewHolder;
+import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
+
+import org.xutils.common.Callback;
+import org.xutils.ex.DbException;
+import org.xutils.x;
+
+import java.io.File;
+
+
+/**
+ * Created by ljy on 2018/3/25.
+ */
+
+public class DownLoadTvAdp extends BaseAdapter {
+    private Context mContext;
+    private final LayoutInflater mInflater;
+    private DownloadManager downloadManager;
+
+    public DownLoadTvAdp(Context mContext) {
+        this.mContext = mContext;
+        this.mInflater = LayoutInflater.from(mContext);
+        downloadManager = DownloadManager.getInstance();
+    }
+
+
+    @Override
+    public int getCount() {
+        if (downloadManager == null)
+            return 0;
+        return downloadManager.getDownloadListCount();
+    }
+
+    @Override
+    public Object getItem(int i) {
+        return downloadManager.getDownloadInfo(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return i;
+    }
+
+
+    @Override
+    public View getView(int i, View view, ViewGroup viewGroup) {
+        DownloadItemViewHolder holder = null;
+        DownloadInfo downloadInfo = downloadManager.getDownloadInfo(i);
+        if (view == null) {
+            view = mInflater.inflate(R.layout.down_item, null);
+            holder = new DownloadItemViewHolder(view, downloadInfo);
+            view.setTag(holder);
+        } else {
+            holder = (DownloadItemViewHolder) view.getTag();
+            holder.update(downloadInfo);
+        }
+        holder.refreshkem();
+        if (downloadInfo.getState().value() < DownloadState.FINISHED.value()) {
+            try {
+                downloadManager.startDownload(
+                        downloadInfo.getPkgName(),
+                        downloadInfo.getUrl(),
+                        downloadInfo.getLabel(),
+                        downloadInfo.getFileSavePath(), "",
+                        downloadInfo.isAutoResume(),
+                        downloadInfo.isAutoRename(),
+                        holder);
+            } catch (DbException ex) {
+                Toast.makeText(x.app(), "添加下载失败", Toast.LENGTH_LONG).show();
+            }
+        }
+        return view;
+    }
+
+    class DownloadItemViewHolder extends DownloadViewHolder implements View.OnClickListener {
+
+        private android.widget.ImageView ImageView;
+        private TextView tv_game_name;
+        private ImageView iv_state;
+        private ImageView iv_remove;
+        private SProgress pb_download;
+        private TextView tv_prorgess;
+        private View ll_install;
+
+        public DownloadItemViewHolder(View view, DownloadInfo downloadInfo) {
+            super(view, downloadInfo);
+            ImageView = (ImageView) view.findViewById(R.id.img_icon);
+            tv_game_name = (TextView) view.findViewById(R.id.tv_game_name);
+            iv_state = (ImageView) view.findViewById(R.id.iv_state);
+            pb_download = (SProgress) view.findViewById(R.id.pb_download);
+            iv_remove = (ImageView) view.findViewById(R.id.iv_remove);
+            tv_prorgess = (TextView) view.findViewById(R.id.tv_prorgess);
+            ll_install = view.findViewById(R.id.ll_install);
+            Glide.with(mContext)
+                    .load(downloadInfo.getIcon())
+                    .placeholder(R.drawable.icon)
+                    .dontAnimate()
+                    .into(ImageView);
+            iv_state.setOnClickListener(this);
+            iv_remove.setOnClickListener(this);
+            tv_prorgess.setOnClickListener(this);
+            ll_install.setOnClickListener(this);
+        }
+
+        @Override
+        public void update(DownloadInfo downloadInfo) {
+            super.update(downloadInfo);
+            Glide.with(mContext)
+                    .load(downloadInfo.getIcon())
+                    .placeholder(R.drawable.icon)
+                    .dontAnimate()
+                    .into(ImageView);
+        }
+
+        @Override
+        public void onWaiting() {
+            refresh();
+        }
+
+        @Override
+        public void onStarted() {
+            refresh();
+        }
+
+        @Override
+        public void onLoading(long total, long current) {
+            refresh();
+        }
+
+        @Override
+        public void onSuccess(File result) {
+            refresh();
+        }
+
+        @Override
+        public void onError(Throwable ex, boolean isOnCallback) {
+            refresh();
+        }
+
+        @Override
+        public void onCancelled(Callback.CancelledException cex) {
+            refresh();
+        }
+
+        public void refresh() {
+            tv_game_name.setText(downloadInfo.getLabel());
+            pb_download.setProgress(downloadInfo.getProgress());
+            tv_prorgess.setText(downloadInfo.getProgress() + "%");
+            DownloadState state = downloadInfo.getState();
+            switch (state) {
+                case WAITING:
+                case STARTED:
+                    iv_state.setImageResource(R.drawable.icon_stop);
+                    break;
+                case ERROR:
+                case STOPPED:
+                    iv_state.setImageResource(R.drawable.icon_begin);
+                    break;
+                case FINISHED:
+                    iv_state.setVisibility(View.GONE);
+                    if (PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
+                        tv_prorgess.setText("已安装");
+                    } else {
+                        tv_prorgess.setText("安 装");
+                        PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
+                    }
+                    break;
+                default:
+                    iv_state.setImageResource(R.drawable.icon_begin);
+                    break;
+            }
+        }
+
+        public void refreshkem() {
+            tv_game_name.setText(downloadInfo.getLabel());
+            pb_download.setProgress(downloadInfo.getProgress());
+            tv_prorgess.setText(downloadInfo.getProgress() + "%");
+            DownloadState state = downloadInfo.getState();
+            switch (state) {
+                case WAITING:
+                case STARTED:
+                    iv_state.setImageResource(R.drawable.icon_stop);
+                    break;
+                case ERROR:
+                case STOPPED:
+                    iv_state.setImageResource(R.drawable.icon_begin);
+                    break;
+                case FINISHED:
+                    iv_state.setVisibility(View.GONE);
+                    if (PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
+                        tv_prorgess.setText("已安装");
+                    } else {
+                        tv_prorgess.setText("安 装");
+                    }
+                    break;
+                default:
+                    iv_state.setImageResource(R.drawable.icon_begin);
+                    break;
+            }
+        }
+
+        @Override
+        public void onClick(View view) {
+            switch (view.getId()) {
+                case R.id.iv_state:
+                    DownloadState state = downloadInfo.getState();
+                    switch (state) {
+                        case WAITING:
+                        case STARTED:
+                            downloadManager.stopDownload(downloadInfo);
+                            break;
+                        case ERROR:
+                        case STOPPED:
+                            try {
+                                downloadManager.startDownload(
+                                        downloadInfo.getPkgName(),
+                                        downloadInfo.getUrl(),
+                                        downloadInfo.getLabel(),
+                                        downloadInfo.getFileSavePath(), "",
+                                        downloadInfo.isAutoResume(),
+                                        downloadInfo.isAutoRename(),
+                                        this);
+                            } catch (DbException ex) {
+                                Toast.makeText(x.app(), "添加下载失败", Toast.LENGTH_LONG).show();
+                            }
+                            break;
+                        case FINISHED:
+                            Toast.makeText(x.app(), "已经下载完成", Toast.LENGTH_LONG).show();
+                            if(PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())){
+                                PackageUtil.startApp(SheepApp.mContext, getDownloadInfo().getPkgName());
+                            }else{
+                                PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
+                            }
+
+                            break;
+                        default:
+                            break;
+                    }
+                    break;
+                case R.id.iv_remove:
+                    try {
+                        downloadManager.removeDownload(downloadInfo);
+                        File file = new File(downloadInfo.getFileSavePath());
+                        if (file.exists()) {
+                            file.delete();
+                        }
+                        notifyDataSetChanged();
+                        refresh();
+                    } catch (DbException e) {
+                        Toast.makeText(x.app(), "移除任务失败", Toast.LENGTH_LONG).show();
+                    }
+                    break;
+
+                case R.id.tv_prorgess:
+                case R.id.ll_install:
+                    DownloadState states = downloadInfo.getState();
+                    switch (states) {
+                        case FINISHED:
+                            if (!PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
+                                PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
+                            }else{
+                                PackageUtil.startApp(SheepApp.mContext, getDownloadInfo().getPkgName());
+                            }
+                            break;
+                    }
+                    break;
+
+            }
+        }
+    }
+}

app/src/main/java/com/sheep/gamegroup/view/adapter/TaskStateAdapter.java

@@ -65,7 +65,7 @@ public class TaskStateAdapter extends BaseAdapter {
             holder.name_tv.setTextColor(R.color.yellow2_end);
         }else {
 
-            holder.point_iv.setImageResource(R.mipmap.tast_state_piont_ok_img);
+            holder.point_iv.setImageResource(R.mipmap.tast_state_piont_no_img);
             holder.line_view.setBackgroundColor(R.color.txt_black_9e9c9c);
             holder.name_tv.setTextColor(R.color.black);
         }

app/src/main/res/layout/download_item_dialog.xml

@@ -122,7 +122,21 @@
                         android:minWidth="151dp"
                         android:text="开始任务"
                         android:textSize="18sp"
-                        android:textColor="@color/txt_black"/>
+                        android:textColor="@color/txt_black"
+                        android:visibility="gone"/>
+                    <com.sheep.gamegroup.util.MyListview
+                        android:id="@+id/listview_down"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:scrollbars="none"
+                        android:divider="@null"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginLeft="@dimen/content_padding_40"
+                        android:layout_marginRight="@dimen/content_padding_40"
+                        android:layout_marginTop="@dimen/content_padding_small"
+                        android:gravity="center"
+                        android:minHeight="36dp"
+                        android:minWidth="151dp"></com.sheep.gamegroup.util.MyListview>
                 </LinearLayout>
 
                 <TextView

app/src/main/res/values/strings.xml

@@ -14,6 +14,6 @@
     <integer name="size_phone_number">11</integer>
     <string name="toast_warning_phone_number_size">手机号码为11位</string>
     <string name="toast_warning_phone_number_error">手机号码为纯数字</string>
-    <string name="bind_weixin_notice_text">请用需要绑定的微信号关注微信公众号"好玩",在公众号中点击"微信验证码"获取验证码并填入下方</string>
+    <string name="bind_weixin_notice_text">请用需要绑定的微信号关注微信公众号"好玩服务号",在公众号中输入"验证码"获取验证码并填入下方</string>
     <string name="bind_weixin_withdrawal_notice_text">你的每次收入提现，我们都会通过微信的企业商户入账功能将收入实时入账到绑定微信号的微信零钱上</string>
 </resources>