修改部分

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

@@ -197,7 +197,7 @@ public class Jump2View {
      * @param context
      * @param o
      */
-    public void goDialogActivityView(Context context, TaskEty o){
+    public synchronized void goDialogActivityView(Context context, TaskEty o){
         Intent intent = new Intent(context, DialogActivity.class);
         intent.putExtra("task_entity", o);
         context.startActivity(intent);}

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

@@ -13,7 +13,9 @@ import android.webkit.WebChromeClient;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.ArrayAdapter;
 import android.widget.ImageView;
+import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -35,6 +37,7 @@ 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.utils.ClassFileHelper;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 
@@ -70,6 +73,8 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     WebView webview;
     @BindView(R.id.start_task_tv)
     TextView start_task_tv;
+    @BindView(R.id.listview)
+    ListView listview;
     private TaskEty task_entity;
 
     private DownloadManager downloadManager;
@@ -153,6 +158,9 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
             }
         });
 
+//        listview.setAdapter(new ArrayAdapter<Object>(){
+//
+//        });
     }
 
     @OnClick({R.id.doalog_item_get_rewards_tv, R.id.dialog_item_x, R.id.start_task_tv, R.id.start_stask_sprogress})
@@ -302,6 +310,8 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     @Override
     public void startTaskFailView(Object o) {
 
+        G.showToast("开启任务失败");
+
     }
 
     @Override

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

@@ -113,6 +113,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
     @Override
     public void initData() {
 
+        tryMakeMoneyAdp.addHaveTask(false);
         presenter.returnTask(null);
         presenter.releaseTask(null);
     }
@@ -171,6 +172,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             TaskAcceptedEty taskAcceptedEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty));
             tryMakeMoneyAdp.addPresenter(presenter);
+            tryMakeMoneyAdp.addHaveTask(true);
             mhandler.sendEmptyMessage(0);
         }catch (Exception e){
             e.printStackTrace();
@@ -206,6 +208,9 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
         try{
             BaseMessage baseMessage = (BaseMessage) o;
             List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
+            for(TaskReleaseEty t: releaseEtyList){
+                presenter.giveUpTask(t.getId());
+            }
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyList));
             mhandler.sendEmptyMessage(0);
         }catch (Exception e){

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

@@ -22,6 +22,7 @@ import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,7 +33,8 @@ import java.util.List;
 
 public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
     private final static int TAG_ID_TEMP = R.id.view_tag_1;
-    TryMakeMoneyPresenter presenter;
+    private TryMakeMoneyPresenter presenter;
+    private boolean isHave;
 
     public TryMakeMoneyAdp(Context context) {
         super(context);
@@ -79,6 +81,14 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
     }
 
     /**
+     * 传入是否有自己运行的任务
+     * @param isHave
+     */
+    public void addHaveTask(boolean isHave){
+        this.isHave = isHave;
+    }
+
+    /**
      * 获取已发布的
      */
     private void bindReleaseTask(ViewHolder holder, List<TaskReleaseEty> etyList){
@@ -93,10 +103,14 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
             @Override
             public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
                 View view = LayoutInflater.from(context)
-                        .inflate(R.layout.try_makemoney_item, viewGroup,false);
+                        .inflate(R.layout.try_makemoney_item_recommend, viewGroup,false);
                 view.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
+                        if(isHave){
+                            G.showToast("请先取消已接受的任务");
+                            return;
+                        }
                         TaskEty taskEty = etyList.get(i).getTask();
                         taskEty.setRunTask(0);
                         taskEty.setRelease_task_id(etyList.get(i).getId());
@@ -130,6 +144,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                         .load(etyList.get(i).getTask().getIcon()+"")
                         .placeholder(R.mipmap.ic_launcher)
                         .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
+
             }
 
             @Override

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

@@ -64,15 +64,26 @@
                     android:layout_centerHorizontal="true"
                     android:layout_marginLeft="@dimen/content_padding_40"
                     android:layout_marginRight="@dimen/content_padding_40"
-                    android:layout_marginTop="@dimen/content_padding_15">`
+                    android:layout_marginTop="@dimen/content_padding_15"
+                    android:visibility="gone">`
 
                 </WebView>
+                <ListView
+                    android:id="@+id/listview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scrollbars="none"
+                    android:layout_below="@+id/dialog_item_icon_iv"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginLeft="@dimen/content_padding_40"
+                    android:layout_marginRight="@dimen/content_padding_40"
+                    android:layout_marginTop="@dimen/content_padding_15"/>
 
                 <LinearLayout
                     android:id="@+id/start_layout"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_below="@+id/webview"
+                    android:layout_below="@+id/listview"
                     android:layout_centerHorizontal="true"
                     android:orientation="vertical">
 

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

@@ -0,0 +1,73 @@
+<?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:orientation="vertical"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+    android:paddingRight="12dp"
+    android:paddingTop="12dp"
+    android:paddingLeft="20dp"
+    android:paddingBottom="12dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/item_title_tv"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="进行中"
+            android:textColor="@color/black"
+            android:textSize="15dp"
+            android:layout_marginBottom="13dp"/>
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <ImageView
+            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"/>
+        <TextView
+            android:id="@+id/item_anem_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:layout_alignTop="@+id/item_icon_iv"
+            android:layout_toEndOf="@+id/item_icon_iv"
+            android:layout_marginTop="6dp"
+            android:layout_marginStart="15dp"
+            android:layout_above="@+id/item_num_tv"
+            style="@style/txt_style_15"/>
+        <TextView
+            android:id="@+id/item_num_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:layout_below="@+id/item_money"
+            android:layout_alignStart="@+id/item_anem_tv"
+            android:layout_marginTop="8dp"
+            android:textColor="@color/txt_black_8e8e8e"
+            android:textSize="@dimen/text_size_12"/>
+        <TextView
+            android:id="@+id/item_money"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textSize="18dp"
+            android:textColor="@color/txt_red"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="true"/>
+    </RelativeLayout>
+    <TextView
+        android:id="@+id/line_tv"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="@color/white_bg_line"
+        android:layout_marginTop="17dp"/>
+</LinearLayout>

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

@@ -18,7 +18,8 @@
         android:id="@+id/release_task_listview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="4dp">
+        android:layout_marginBottom="4dp"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
 
     </android.support.v7.widget.RecyclerView>