任务列表增加截止时间

app/src/main/java/com/kfzs/duanduan/utils/GameStatusScanner.java

@@ -391,7 +391,7 @@ public abstract class GameStatusScanner {
         task.setMPackageName(packageName);
         task.setMVersionCode(versionCode);
         task.setMGameID(gameId);
-        task.setMApkPath(ClassFileHelper.DIR+gameName + ClassFileHelper.FILE_SUFFIX);
+        task.setMApkPath(ClassFileHelper.DIR+ File.separator +packageName + ClassFileHelper.FILE_SUFFIX);
         downloadTaskService.addDownloadTask(task);
         return task;
     }

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

@@ -120,8 +120,8 @@ public class CommonUtil {
         task.setMTotalSize(Double.valueOf(size));
         task.setMGameID(gameId);
         task.setWhereFrom(whereFrom);
-        task.setMApkPath(ClassFileHelper.DIR + File.separator + gameName + ClassFileHelper.FILE_SUFFIX);
-        mDownloadTaskService.addDownloadTask(task);
+        task.setMApkPath(ClassFileHelper.DIR + File.separator + packageName + ClassFileHelper.FILE_SUFFIX);
+//        mDownloadTaskService.addDownloadTask(task);
         return task;
     }
 }

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

@@ -479,7 +479,9 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
 
                 @Override
                 public void downloadFail(String url) {
-
+                    downLoadInfo.setMDownloadTaskId(null);
+                    downLoadInfo.setMStatus(1);
+                    mDownloadTaskService.addDownloadTask(downLoadInfo);
                     handler.sendEmptyMessage(5);
                 }
 

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

@@ -159,7 +159,13 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View,
         try{
             BaseMessage baseMessage = (BaseMessage) o;
             List<TaskAcceptedEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
-            etyList.addAll(releaseEtyList);
+            for (TaskAcceptedEty ety: releaseEtyList){
+                if(!etyList.contains(ety)){
+                    etyList.add(ety);
+                }
+
+            }
+//            etyList.addAll(releaseEtyList);
             adp.notifyDataSetChanged();
         }catch (Exception e){
             e.printStackTrace();

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

@@ -62,7 +62,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             super.handleMessage(msg);
 
             tryMakeMoneyAdp.notifyItemInserted(tryMakeMoneyAdp.getItemCount());
-//            recyclerview.smoothScrollToPosition(0);//滚动到底部
+            recyclerview.smoothScrollToPosition(0);//滚动到底部
             tryMakeMoneyAdp.notifyDataSetChanged();
         }
     };

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

@@ -121,8 +121,13 @@ public class WithdrawalListAct extends BaseActivity implements WithdrawalListCon
         try{
             BaseMessage baseMessage = (BaseMessage) o;
             List<WithdrawalEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), WithdrawalEty.class);
-            etyList.clear();
-            etyList.addAll(releaseEtyList);
+            for (WithdrawalEty ety: releaseEtyList){
+                if(!etyList.contains(ety)){
+                    etyList.add(ety);
+                }
+
+            }
+//            etyList.addAll(releaseEtyList);
             adp.notifyDataSetChanged();
         }catch (Exception e){
             e.printStackTrace();

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

@@ -32,6 +32,7 @@ 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.Jump2View;
+import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
@@ -150,6 +151,8 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getName()+"");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ etyList.get(i).getLast_num()+"份");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getBonus() +"元");
+                ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                        "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getDeadline()))+"");
                 ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -206,6 +209,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
         TextView item_money = holder.getView(R.id.item_money);
         TextView cancel_task_tv = holder.getView(R.id.cancel_task_tv);
         TextView detail_task_tv = holder.getView(R.id.detail_task_tv);
+        TextView item_date_tv = holder.getView(R.id.item_date_tv);
         cancel_task_tv.setVisibility(View.VISIBLE);
         Glide.with(context)
                 .load(acceptedEty.getRelease_task().getTask().getIcon()+"")
@@ -214,6 +218,8 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
         item_anem_tv.setText(acceptedEty.getRelease_task().getName()+"");
         item_num_tv.setText("剩余"+ acceptedEty.getRelease_task().getLast_num()+"份");
         item_money.setText("+"+ acceptedEty.getRelease_task().getBonus() +"元");
+        item_date_tv.setText(TimeUtil.getDate(
+                "截止时间:" + TimeUtil.FORMAT, Long.valueOf(acceptedEty.getRelease_task().getDeadline()))+"");
         holder.itemView.setBackground(mContext.getResources().getDrawable(R.drawable.x_shap_shadow_bg_rectgangle_white));
         holder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
         cancel_task_tv.setOnClickListener(new View.OnClickListener() {

app/src/main/java/com/sheep/jiuyan/samllsheep/page/XDownLoadActivity.java

@@ -63,7 +63,7 @@ public class XDownLoadActivity extends BaseActivity {
         Task task = (Task) intent.getSerializableExtra("task");
         if (task != null) {
             ClassFileHelper.getInstance().createSDDirection();
-            File mApkPath = new File(ClassFileHelper.DIR, task.getTitle() + ClassFileHelper.FILE_SUFFIX);
+            File mApkPath = new File(ClassFileHelper.DIR, task.getPkg() + ClassFileHelper.FILE_SUFFIX);
             if (!mApkPath.exists()) {
                 try {
                     DownloadManager.getInstance().startDownload(task.getPkg(),

app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpMainActivity.java

@@ -93,7 +93,7 @@ public class AdpMainActivity extends AdpCommonRecy<TaskPublish> {
             holder.getView(R.id.btn_task_item, TextView.class).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                  String path=ClassFileHelper.DIR+File.separator+taskPublish.getTask().getTitle()+".apk";
+                  String path=ClassFileHelper.DIR+File.separator+taskPublish.getTask().getPkg()+".apk";
                   PackageUtil.installApk(mContext,path);
                 }
             });

app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageTask.java

@@ -341,7 +341,7 @@ public class FgtMainPageTask extends BaseFragment {
                                 if (PackageUtil.isAppInstalled(SheepApp.mContext, taskPublish.getTask().getPkg())) {
                                     PackageUtil.startApp(SheepApp.mContext, taskPublish.getTask().getPkg());
                                 }else if(ClassFileHelper.getInstance().isInstallFile(taskPublish.getTask().getTitle())){
-                                    String path=ClassFileHelper.DIR+ File.separator+taskPublish.getTask().getTitle()+".apk";
+                                    String path=ClassFileHelper.DIR+ File.separator+taskPublish.getTask().getPkg()+".apk";
                                     PackageUtil.installApk(getActivity(),path);
                                 } else{
                                     Intent intent = new Intent(getActivity(), XDownLoadActivity.class);
@@ -356,8 +356,8 @@ public class FgtMainPageTask extends BaseFragment {
                         public void onClick(View v) {
                             if (PackageUtil.isAppInstalled(SheepApp.mContext, taskPublish.getTask().getPkg())) {
                                 PackageUtil.startApp(SheepApp.mContext, taskPublish.getTask().getPkg());
-                            }else if(ClassFileHelper.getInstance().isInstallFile(taskPublish.getTask().getTitle())){
-                                String path=ClassFileHelper.DIR+ File.separator+taskPublish.getTask().getTitle()+".apk";
+                            }else if(ClassFileHelper.getInstance().isInstallFile(taskPublish.getTask().getPkg())){
+                                String path=ClassFileHelper.DIR+ File.separator+taskPublish.getTask().getPkg()+".apk";
                                 PackageUtil.installApk(getActivity(),path);
                             } else {
                                 Intent intent = new Intent(getActivity(), XDownLoadActivity.class);

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

@@ -44,7 +44,9 @@
             android:id="@+id/item_icon_iv"
             android:layout_width="@dimen/view_size_60"
             android:layout_height="@dimen/view_size_60"
-            android:src="@drawable/icon_lj"/>
+            android:src="@drawable/icon_lj"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
         <TextView
             android:id="@+id/item_money"
             android:layout_width="wrap_content"
@@ -52,6 +54,7 @@
             android:text="+10元"
             android:textSize="18dp"
             android:textColor="@color/txt_red"
+            android:layout_marginTop="@dimen/content_padding_15"
             app:layout_constraintTop_toTopOf="@+id/item_anem_tv"
             app:layout_constraintBottom_toBottomOf="@+id/item_anem_tv"
             app:layout_constraintEnd_toEndOf="parent"/>
@@ -60,8 +63,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text=""
-            android:lines="2"
-            android:gravity="start|center"
+            android:maxLines="2"
+            android:gravity="start"
             android:ellipsize="end"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toEndOf="@+id/item_icon_iv"
@@ -75,10 +78,24 @@
             android:text=""
             app:layout_constraintTop_toBottomOf="@+id/item_anem_tv"
             app:layout_constraintStart_toStartOf="@+id/item_anem_tv"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
             android:textColor="@color/txt_black_8e8e8e"
             android:layout_marginBottom="@dimen/content_padding_10"
             android:textSize="@dimen/text_size_12"/>
         <TextView
+            android:id="@+id/item_date_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            app:layout_constraintTop_toBottomOf="@+id/item_num_tv"
+            app:layout_constraintStart_toStartOf="@+id/item_num_tv"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:textColor="@color/txt_black_8e8e8e"
+            android:layout_marginBottom="@dimen/content_padding_10"
+            android:layout_marginTop="@dimen/content_padding_10"
+            android:textSize="@dimen/text_size_12" />
+        <TextView
             android:id="@+id/detail_task_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -88,9 +105,10 @@
             android:textSize="@dimen/text_size_12"
             android:gravity="center"
             android:padding="@dimen/content_padding_3"
-            app:layout_constraintBaseline_toBaselineOf="@+id/item_num_tv"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
             android:layout_marginTop="@dimen/content_padding_small"
+            android:layout_marginBottom="@dimen/content_padding_15"
             android:background="@drawable/sp_bg_gradient_rectangle_yellow"/>
     </android.support.constraint.ConstraintLayout>
     <TextView

datashare/src/main/java/com/kfzs/duanduan/datashare/provider/download/DownLoadInfo.java

@@ -1,5 +1,7 @@
 package com.kfzs.duanduan.datashare.provider.download;
 
+import android.text.TextUtils;
+
 import org.greenrobot.greendao.annotation.Entity;
 import org.greenrobot.greendao.annotation.Id;
 import org.greenrobot.greendao.annotation.NotNull;
@@ -142,7 +144,7 @@ public class DownLoadInfo {
     }
 
     public String getMPackageName() {
-        return this.mPackageName;
+        return TextUtils.isEmpty(this.mPackageName)?"":this.mPackageName;
     }
 
     public void setMPackageName(String mPackageName) {