Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/kfzs/duanduan/ActGameDetails.java

@@ -17,6 +17,9 @@ import android.widget.TextView;
 
 import com.android.volleyplus.Response;
 import com.android.volleyplus.VolleyError;
+import com.arialyy.annotations.Download;
+import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.download.DownloadTask;
 import com.bumptech.glide.Glide;
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
 import com.kfzs.duanduan.adp.AdpViewPagerDetail;
@@ -137,6 +140,7 @@ public class ActGameDetails extends BaseCompatActivity {
         selectType = getIntent().getIntExtra(EXTRA_PAGE_NUM, 0);
         initView();
         initData();
+        Aria.download(this).register();
     }
 
     private void initData() {
@@ -473,4 +477,27 @@ public class ActGameDetails extends BaseCompatActivity {
         }
         return false;
     }
+
+    @Download.onTaskStop void stopDownload(DownloadTask task){
+        if(task.getKey().equals(respGame.getDownloadUrl())){
+            mBtnDown.setText("暂停");
+        }
+    }
+    @Download.onTaskStart void startDownload(DownloadTask task){
+        if(task.getKey().equals(respGame.getDownloadUrl())){
+            mBtnDown.setText("下载");
+        }
+    }
+
+    @Download.onTaskComplete void completeDownload(DownloadTask task){
+        if(task.getKey().equals(respGame.getDownloadUrl())){
+            mBtnDown.setText("安装");
+        }
+    }
+
+    @Download.onTaskRunning void runDownload(DownloadTask task){
+        if(task.getKey().equals(respGame.getDownloadUrl())){
+            mBtnDown.setText("下载中");
+        }
+    }
 }

app/src/main/java/com/kfzs/duanduan/ActSearch.java

@@ -23,6 +23,9 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.arialyy.annotations.Download;
+import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.download.DownloadTask;
 import com.kf.utils.ToastBuilder;
 import com.kfzs.android.view.tag.FlowLayout;
 import com.kfzs.android.view.tag.TagAdapter;
@@ -108,6 +111,8 @@ public class ActSearch extends BaseCompatActivity {
 
     private boolean mIsAutoShowTxt = true;//是否自动提示输入，不然在点搜索历史的时候，也会自动提示
 
+    private boolean isDownLoad = true;//是否显示有下载
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -115,6 +120,7 @@ public class ActSearch extends BaseCompatActivity {
 
         ButterKnife.bind(this);
         EventBus.getDefault().register(this);
+        Aria.download(this).register();
 
         mAdpSearchViewPager = new AdpSearchViewPager(this);
         mAdpSearchRecord = new AdpSearchRecord(this, new AdapterView.OnItemClickListener() {
@@ -476,4 +482,27 @@ public class ActSearch extends BaseCompatActivity {
         EventBus.getDefault().unregister(this);
     }
 
+
+    @Download.onTaskStop void stopDownload(DownloadTask task){
+        if(!isDownLoad){
+            mAdpSearchGame.notifyDataSetChanged();
+        }
+    }
+    @Download.onTaskStart void startDownload(DownloadTask task){
+        if(!isDownLoad){
+            mAdpSearchGame.notifyDataSetChanged();
+        }
+    }
+
+    @Download.onTaskComplete void completeDownload(DownloadTask task){
+        if(!isDownLoad){
+            mAdpSearchGame.notifyDataSetChanged();
+        }
+    }
+
+    @Download.onTaskRunning void runDownload(DownloadTask task){
+        if(!isDownLoad){
+            mAdpSearchGame.notifyDataSetChanged();
+        }
+    }
 }

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -533,7 +533,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         ArrayList<Drawable> imgURL = new ArrayList<>();
         imgURL.add(getResources().getDrawable(R.mipmap.couple_red_packets));
         imgURL.add(getResources().getDrawable(R.mipmap.home_credit_img));
-        imgURL.add(getResources().getDrawable(R.mipmap.home_sheep_img));
+//        imgURL.add(getResources().getDrawable(R.mipmap.home_sheep_img));
         if (mImageGlarry != null) {
             mImageGlarry.init(imgURL.toArray(new Drawable[]{}), ImageView.ScaleType.CENTER_CROP);
             return;

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -1,8 +1,12 @@
 package com.sheep.gamegroup.util;
 
+import android.content.Context;
 import android.text.TextUtils;
 import android.widget.Toast;
 
+import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.download.DownloadTarget;
+import com.arialyy.aria.core.inf.IEntity;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.kfzs.duanduan.services.DownloadTaskService;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
@@ -131,4 +135,21 @@ public class CommonUtil {
         task.setMApkPath(ClassFileHelper.DIR + File.separator + packageName + ClassFileHelper.FILE_SUFFIX);
         return task;
     }
+
+    /**
+     * 暂停下载
+     */
+    public void stopDownloadTask(Context context, String downloadUrl){
+        if(TextUtils.isEmpty(downloadUrl)){
+            return;
+        }
+        try {
+            DownloadTarget task = Aria.download(context).load(downloadUrl);
+            if(task != null && task.getTaskState() == IEntity.STATE_RUNNING){
+                task.stop();
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -223,6 +223,9 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                                         .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                                             @Override
                                             public void onNext(BaseMessage baseMessage) {
+
+                                                //暂停下载
+                                                CommonUtil.getInstance().stopDownloadTask(activity, task_accepted_entity.getRelease_task().getTask().getDownload_link());
                                                 if(BuildConfig.DEBUG)
                                                     System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                                                 acceptedTask();

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

@@ -349,7 +349,7 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
     @Override
     public void taskStatusFaile(BaseMessage baseMessage) {
         updateError("失败");
-        G.showToast(baseMessage+"");
+        G.showToast(baseMessage.getMsg()+"");
 
     }
 

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

@@ -132,14 +132,17 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     public void initData() {
 
         try {
-            userEntity = MyDbManager.getInstance().dbFindUser();
+            if (userEntity == null)
+                userEntity = MyDbManager.getInstance().dbFindUser();
             if(userEntity != null){
                 weixin_name_tv.setText(userEntity.getWx_nickname() +"");
+            }else {
+                weixin_name_tv.setText(SpUtils.getWeixin(activity)+"");
             }
-        } catch (DbException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        weixin_name_tv.setText(SpUtils.getWeixin(activity));
+
         String sr = "可提现金额<font color='#ff2d4b'><small>" + balanceAmount + "</small></font>元";
         withdrawal_click_bindname_tv.setText(Html.fromHtml(sr));
     }

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

@@ -37,6 +37,7 @@ import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -261,6 +262,8 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                     @Override
                     public void onClick(View v) {
                         presenter.giveUpTask(etyList.get(i).getId());
+                        //暂停下载
+                        CommonUtil.getInstance().stopDownloadTask(mContext, etyList.get(i).getRelease_task().getTask().getDownload_link());
 //                        UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DETAIL);
                     }
                 });

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

@@ -42,7 +42,10 @@
                     android:layout_marginTop="6dp"
                     android:textSize="@dimen/text_size_3"
                     android:textColor="@color/txt_black_404040"
-                    android:layout_marginStart="36dp"/>
+                    android:layout_marginStart="36dp"
+                    android:lines="1"
+                    android:ellipsize="end"
+                    android:maxWidth="@dimen/content_padding_120"/>
                 <TextView
                     android:id="@+id/withdrawal_change_tv"
                     android:layout_width="wrap_content"

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

@@ -87,6 +87,7 @@
     <dimen name="content_padding_65">65dp</dimen>
     <dimen name="content_padding_80">80dp</dimen>
     <dimen name="content_padding_100">100dp</dimen>
+    <dimen name="content_padding_120">120dp</dimen>
     <dimen name="content_padding_140">140dp</dimen>